mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
3693fdb3c8
Trying to print a function local static variable of a const-qualified
method still doesn't work after the previous fixes:
(gdb) p 'S::method() const'::static_var
$1 = {i1 = 1, i2 = 2, i3 = 3}
(gdb) p S::method() const::static_var
No symbol "static_var" in specified context.
The reason is that the expression parser/evaluator loses the "const",
and the above unquoted case is just like trying to print a variable of
the non-const overload, if it exists, even. As if the above unquoted
case had been written as:
(gdb) p S::method()::static_var
No symbol "static_var" in specified context.
We can see the problem without static vars in the picture. With:
struct S
{
void method ();
void method () const;
};
Compare:
(gdb) print 'S::method(void) const'
$1 = {void (const S * const)} 0x400606 <S::method() const>
(gdb) print S::method(void) const
$2 = {void (S * const)} 0x4005d8 <S::method()> # wrong method!
That's what we need to fix. If we fix that, the function local static
case starts working.
The grammar production for function/method types is this one:
exp: exp '(' parameter_typelist ')' const_or_volatile
This results in a TYPE_INSTANCE expression evaluator operator. For
the example above, we get something like this ("set debug expression 1"):
...
0 TYPE_INSTANCE 1 TypeInstance: Type @0x560fda958be0 (void)
5 OP_SCOPE Type @0x560fdaa544d8 (S) Field name: `method'
...
While evaluating TYPE_INSTANCE, we end up in
value_struct_elt_for_reference, trying to find the method named
"method" that has the prototype recorded in TYPE_INSTANCE. In this
case, TYPE_INSTANCE says that we're looking for a method that has
"(void)" as parameters (that's what "1 TypeInstance: Type
@0x560fda958be0 (void)" above means. The trouble is that nowhere in
this mechanism do we communicate to value_struct_elt_for_reference
that we're looking for the _const_ overload.
value_struct_elt_for_reference only compared parameters, and the
non-const "method()" overload has matching parameters, so it's
considered the right match...
Conveniently, the "const_or_volatile" production in the grammar
already records "const" and "volatile" info in the type stack. The
type stack is not used in this code path, but we can borrow the
information. The patch converts the info in the type stack to an
"instance flags" enum, and adds that as another element in
TYPE_INSTANCE operators. This type instance flags is then applied to
the temporary type that is passed to value_struct_elt_for_reference
for matching.
The other side of the problem is that methods in the debug info aren't
marked const/volatile, so with that in place, the matching never finds
const/volatile-qualified methods.
The problem is that in the DWARF, there's no indication at all whether
a method is const/volatile qualified... For example (c++filt applied
to the linkage name for convenience):
<2><d3>: Abbrev Number: 6 (DW_TAG_subprogram)
<d4> DW_AT_external : 1
<d4> DW_AT_name : (indirect string, offset: 0x3df): method
<d8> DW_AT_decl_file : 1
<d9> DW_AT_decl_line : 58
<da> DW_AT_linkage_name: (indirect string, offset: 0x5b2): S::method() const
<de> DW_AT_declaration : 1
<de> DW_AT_object_pointer: <0xe6>
<e2> DW_AT_sibling : <0xec>
I see the same with both GCC and Clang. The patch works around this
by extracting the cv qualification from the "const" and "volatile" in
the demangled name. This will need further tweaking for "&" and
"const &" overloads, but we don't support them in the parser yet,
anyway.
The TYPE_CONST changes were necessary otherwise the comparisons in valops.c:
if (TYPE_CONST (intype) != TYPE_FN_FIELD_CONST (f, j))
continue;
would fail, because when both TYPE_CONST() TYPE_FN_FIELD_CONST() were
true, their values were different.
BTW, I'm recording the const/volatile-ness of methods in the
TYPE_FN_FIELD info because #1 - I'm not sure it's kosher to change the
method's type directly (vs having to call make_cv_type to create a new
type), and #2 it's what stabsread.c does:
...
case 'A': /* Normal functions. */
new_sublist->fn_field.is_const = 0;
new_sublist->fn_field.is_volatile = 0;
(*pp)++;
break;
case 'B': /* `const' member functions. */
new_sublist->fn_field.is_const = 1;
new_sublist->fn_field.is_volatile = 0;
...
After all this, this finally all works:
print S::method(void) const
$1 = {void (const S * const)} 0x400606 <S::method() const>
(gdb) p S::method() const::static_var
$2 = {i1 = 1, i2 = 2, i3 = 3}
gdb/ChangeLog:
2017-09-04 Pedro Alves <palves@redhat.com>
* c-exp.y (function_method, function_method_void): Add current
instance flags to TYPE_INSTANCE.
* dwarf2read.c (check_modifier): New.
(compute_delayed_physnames): Assert that only C++ adds delayed
physnames. Mark fn_fields as const/volatile depending on
physname.
* eval.c (make_params): New type_instance_flags parameter. Use
it as the new type's instance flags.
(evaluate_subexp_standard) <TYPE_INSTANCE>: Extract the instance
flags element and pass it to make_params.
* expprint.c (print_subexp_standard) <TYPE_INSTANCE>: Handle
instance flags element.
(dump_subexp_body_standard) <TYPE_INSTANCE>: Likewise.
* gdbtypes.h: Include "enum-flags.h".
(type_instance_flags): New enum-flags type.
(TYPE_CONST, TYPE_VOLATILE, TYPE_RESTRICT, TYPE_ATOMIC)
(TYPE_CODE_SPACE, TYPE_DATA_SPACE): Return boolean.
* parse.c (operator_length_standard) <TYPE_INSTANCE>: Adjust.
(follow_type_instance_flags): New function.
(operator_check_standard) <TYPE_INSTANCE>: Adjust.
* parser-defs.h (follow_type_instance_flags): Declare.
* valops.c (value_struct_elt_for_reference): const/volatile must
match too.
gdb/testsuite/ChangeLog:
2017-09-04 Pedro Alves <palves@redhat.com>
* gdb.base/func-static.c (S::method const, S::method volatile)
(S::method volatile const): New methods.
(c_s, v_s, cv_s): New instances.
(main): Call method() on them.
* gdb.base/func-static.exp (syntax_re, cannot_resolve_re): New variables.
(cannot_resolve): New procedure.
(cxx_scopes_list): Test cv methods. Add print-scope-quote and
print-quote-unquoted columns.
(do_test): Test printing each scope too.
401 lines
12 KiB
C
401 lines
12 KiB
C
/* Parser definitions for GDB.
|
||
|
||
Copyright (C) 1986-2017 Free Software Foundation, Inc.
|
||
|
||
Modified from expread.y by the Department of Computer Science at the
|
||
State University of New York at Buffalo.
|
||
|
||
This file is part of GDB.
|
||
|
||
This program is free software; you can redistribute it and/or modify
|
||
it under the terms of the GNU General Public License as published by
|
||
the Free Software Foundation; either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
This program is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||
|
||
#if !defined (PARSER_DEFS_H)
|
||
#define PARSER_DEFS_H 1
|
||
|
||
#include "doublest.h"
|
||
#include "vec.h"
|
||
#include "expression.h"
|
||
|
||
struct block;
|
||
struct language_defn;
|
||
struct internalvar;
|
||
|
||
extern int parser_debug;
|
||
|
||
#define parse_gdbarch(ps) ((ps)->expout->gdbarch)
|
||
#define parse_language(ps) ((ps)->expout->language_defn)
|
||
|
||
struct parser_state
|
||
{
|
||
/* The expression related to this parser state. */
|
||
|
||
struct expression *expout;
|
||
|
||
/* The size of the expression above. */
|
||
|
||
size_t expout_size;
|
||
|
||
/* The number of elements already in the expression. This is used
|
||
to know where to put new elements. */
|
||
|
||
size_t expout_ptr;
|
||
};
|
||
|
||
/* If this is nonzero, this block is used as the lexical context
|
||
for symbol names. */
|
||
|
||
extern const struct block *expression_context_block;
|
||
|
||
/* If expression_context_block is non-zero, then this is the PC within
|
||
the block that we want to evaluate expressions at. When debugging
|
||
C or C++ code, we use this to find the exact line we're at, and
|
||
then look up the macro definitions active at that point. */
|
||
extern CORE_ADDR expression_context_pc;
|
||
|
||
/* The innermost context required by the stack and register variables
|
||
we've encountered so far. */
|
||
extern const struct block *innermost_block;
|
||
|
||
/* Number of arguments seen so far in innermost function call. */
|
||
extern int arglist_len;
|
||
|
||
/* A string token, either a char-string or bit-string. Char-strings are
|
||
used, for example, for the names of symbols. */
|
||
|
||
struct stoken
|
||
{
|
||
/* Pointer to first byte of char-string or first bit of bit-string. */
|
||
const char *ptr;
|
||
/* Length of string in bytes for char-string or bits for bit-string. */
|
||
int length;
|
||
};
|
||
|
||
struct typed_stoken
|
||
{
|
||
/* A language-specific type field. */
|
||
int type;
|
||
/* Pointer to first byte of char-string or first bit of bit-string. */
|
||
char *ptr;
|
||
/* Length of string in bytes for char-string or bits for bit-string. */
|
||
int length;
|
||
};
|
||
|
||
struct stoken_vector
|
||
{
|
||
int len;
|
||
struct typed_stoken *tokens;
|
||
};
|
||
|
||
struct ttype
|
||
{
|
||
struct stoken stoken;
|
||
struct type *type;
|
||
};
|
||
|
||
struct symtoken
|
||
{
|
||
struct stoken stoken;
|
||
struct block_symbol sym;
|
||
int is_a_field_of_this;
|
||
};
|
||
|
||
struct objc_class_str
|
||
{
|
||
struct stoken stoken;
|
||
struct type *type;
|
||
int theclass;
|
||
};
|
||
|
||
typedef struct type *type_ptr;
|
||
DEF_VEC_P (type_ptr);
|
||
|
||
/* For parsing of complicated types.
|
||
An array should be preceded in the list by the size of the array. */
|
||
enum type_pieces
|
||
{
|
||
tp_end = -1,
|
||
tp_pointer,
|
||
tp_reference,
|
||
tp_rvalue_reference,
|
||
tp_array,
|
||
tp_function,
|
||
tp_function_with_arguments,
|
||
tp_const,
|
||
tp_volatile,
|
||
tp_space_identifier,
|
||
tp_type_stack
|
||
};
|
||
/* The stack can contain either an enum type_pieces or an int. */
|
||
union type_stack_elt
|
||
{
|
||
enum type_pieces piece;
|
||
int int_val;
|
||
struct type_stack *stack_val;
|
||
VEC (type_ptr) *typelist_val;
|
||
};
|
||
|
||
/* The type stack is an instance of this structure. */
|
||
|
||
struct type_stack
|
||
{
|
||
/* Elements on the stack. */
|
||
union type_stack_elt *elements;
|
||
/* Current stack depth. */
|
||
int depth;
|
||
/* Allocated size of stack. */
|
||
int size;
|
||
};
|
||
|
||
/* Helper function to initialize the expout, expout_size, expout_ptr
|
||
trio inside PS before it is used to store expression elements created
|
||
during the parsing of an expression. INITIAL_SIZE is the initial size of
|
||
the expout array. LANG is the language used to parse the expression.
|
||
And GDBARCH is the gdbarch to use during parsing. */
|
||
|
||
extern void initialize_expout (struct parser_state *ps,
|
||
size_t initial_size,
|
||
const struct language_defn *lang,
|
||
struct gdbarch *gdbarch);
|
||
|
||
/* Helper function that reallocates the EXPOUT inside PS in order to
|
||
eliminate any unused space. It is generally used when the expression
|
||
has just been parsed and created. */
|
||
|
||
extern void reallocate_expout (struct parser_state *ps);
|
||
|
||
/* Reverse an expression from suffix form (in which it is constructed)
|
||
to prefix form (in which we can conveniently print or execute it).
|
||
Ordinarily this always returns -1. However, if EXPOUT_LAST_STRUCT
|
||
is not -1 (i.e., we are trying to complete a field name), it will
|
||
return the index of the subexpression which is the left-hand-side
|
||
of the struct operation at EXPOUT_LAST_STRUCT. */
|
||
|
||
extern int prefixify_expression (struct expression *expr);
|
||
|
||
extern void write_exp_elt_opcode (struct parser_state *, enum exp_opcode);
|
||
|
||
extern void write_exp_elt_sym (struct parser_state *, struct symbol *);
|
||
|
||
extern void write_exp_elt_longcst (struct parser_state *, LONGEST);
|
||
|
||
extern void write_exp_elt_dblcst (struct parser_state *, DOUBLEST);
|
||
|
||
extern void write_exp_elt_decfloatcst (struct parser_state *, gdb_byte *);
|
||
|
||
extern void write_exp_elt_type (struct parser_state *, struct type *);
|
||
|
||
extern void write_exp_elt_intern (struct parser_state *, struct internalvar *);
|
||
|
||
extern void write_exp_string (struct parser_state *, struct stoken);
|
||
|
||
void write_exp_string_vector (struct parser_state *, int type,
|
||
struct stoken_vector *vec);
|
||
|
||
extern void write_exp_bitstring (struct parser_state *, struct stoken);
|
||
|
||
extern void write_exp_elt_block (struct parser_state *, const struct block *);
|
||
|
||
extern void write_exp_elt_objfile (struct parser_state *,
|
||
struct objfile *objfile);
|
||
|
||
extern void write_exp_msymbol (struct parser_state *,
|
||
struct bound_minimal_symbol);
|
||
|
||
extern void write_dollar_variable (struct parser_state *, struct stoken str);
|
||
|
||
extern void mark_struct_expression (struct parser_state *);
|
||
|
||
extern const char *find_template_name_end (const char *);
|
||
|
||
extern void start_arglist (void);
|
||
|
||
extern int end_arglist (void);
|
||
|
||
extern char *copy_name (struct stoken);
|
||
|
||
extern void insert_type (enum type_pieces);
|
||
|
||
extern void push_type (enum type_pieces);
|
||
|
||
extern void push_type_int (int);
|
||
|
||
extern void insert_type_address_space (struct parser_state *, char *);
|
||
|
||
extern enum type_pieces pop_type (void);
|
||
|
||
extern int pop_type_int (void);
|
||
|
||
extern struct type_stack *get_type_stack (void);
|
||
|
||
extern struct type_stack *append_type_stack (struct type_stack *to,
|
||
struct type_stack *from);
|
||
|
||
extern void push_type_stack (struct type_stack *stack);
|
||
|
||
extern void type_stack_cleanup (void *arg);
|
||
|
||
extern void push_typelist (VEC (type_ptr) *typelist);
|
||
|
||
extern int dump_subexp (struct expression *, struct ui_file *, int);
|
||
|
||
extern int dump_subexp_body_standard (struct expression *,
|
||
struct ui_file *, int);
|
||
|
||
extern void operator_length (const struct expression *, int, int *, int *);
|
||
|
||
extern void operator_length_standard (const struct expression *, int, int *,
|
||
int *);
|
||
|
||
extern int operator_check_standard (struct expression *exp, int pos,
|
||
int (*objfile_func)
|
||
(struct objfile *objfile, void *data),
|
||
void *data);
|
||
|
||
extern const char *op_name_standard (enum exp_opcode);
|
||
|
||
extern struct type *follow_types (struct type *);
|
||
|
||
extern type_instance_flags follow_type_instance_flags ();
|
||
|
||
extern void null_post_parser (struct expression **, int);
|
||
|
||
extern int parse_float (const char *p, int len, DOUBLEST *d,
|
||
const char **suffix);
|
||
|
||
extern int parse_c_float (struct gdbarch *gdbarch, const char *p, int len,
|
||
DOUBLEST *d, struct type **t);
|
||
|
||
/* During parsing of a C expression, the pointer to the next character
|
||
is in this variable. */
|
||
|
||
extern const char *lexptr;
|
||
|
||
/* After a token has been recognized, this variable points to it.
|
||
Currently used only for error reporting. */
|
||
extern const char *prev_lexptr;
|
||
|
||
/* Current depth in parentheses within the expression. */
|
||
|
||
extern int paren_depth;
|
||
|
||
/* Nonzero means stop parsing on first comma (if not within parentheses). */
|
||
|
||
extern int comma_terminates;
|
||
|
||
/* These codes indicate operator precedences for expression printing,
|
||
least tightly binding first. */
|
||
/* Adding 1 to a precedence value is done for binary operators,
|
||
on the operand which is more tightly bound, so that operators
|
||
of equal precedence within that operand will get parentheses. */
|
||
/* PREC_HYPER and PREC_ABOVE_COMMA are not the precedence of any operator;
|
||
they are used as the "surrounding precedence" to force
|
||
various kinds of things to be parenthesized. */
|
||
enum precedence
|
||
{
|
||
PREC_NULL, PREC_COMMA, PREC_ABOVE_COMMA, PREC_ASSIGN, PREC_LOGICAL_OR,
|
||
PREC_LOGICAL_AND, PREC_BITWISE_IOR, PREC_BITWISE_AND, PREC_BITWISE_XOR,
|
||
PREC_EQUAL, PREC_ORDER, PREC_SHIFT, PREC_ADD, PREC_MUL, PREC_REPEAT,
|
||
PREC_HYPER, PREC_PREFIX, PREC_SUFFIX, PREC_BUILTIN_FUNCTION
|
||
};
|
||
|
||
/* Table mapping opcodes into strings for printing operators
|
||
and precedences of the operators. */
|
||
|
||
struct op_print
|
||
{
|
||
const char *string;
|
||
enum exp_opcode opcode;
|
||
/* Precedence of operator. These values are used only by comparisons. */
|
||
enum precedence precedence;
|
||
|
||
/* For a binary operator: 1 iff right associate.
|
||
For a unary operator: 1 iff postfix. */
|
||
int right_assoc;
|
||
};
|
||
|
||
/* Information needed to print, prefixify, and evaluate expressions for
|
||
a given language. */
|
||
|
||
struct exp_descriptor
|
||
{
|
||
/* Print subexpression. */
|
||
void (*print_subexp) (struct expression *, int *, struct ui_file *,
|
||
enum precedence);
|
||
|
||
/* Returns number of exp_elements needed to represent an operator and
|
||
the number of subexpressions it takes. */
|
||
void (*operator_length) (const struct expression*, int, int*, int *);
|
||
|
||
/* Call OBJFILE_FUNC for any objfile found being referenced by the
|
||
single operator of EXP at position POS. Operator parameters are
|
||
located at positive (POS + number) offsets in EXP. OBJFILE_FUNC
|
||
should never be called with NULL OBJFILE. OBJFILE_FUNC should
|
||
get passed an arbitrary caller supplied DATA pointer. If it
|
||
returns non-zero value then (any other) non-zero value should be
|
||
immediately returned to the caller. Otherwise zero should be
|
||
returned. */
|
||
int (*operator_check) (struct expression *exp, int pos,
|
||
int (*objfile_func) (struct objfile *objfile,
|
||
void *data),
|
||
void *data);
|
||
|
||
/* Name of this operator for dumping purposes.
|
||
The returned value should never be NULL, even if EXP_OPCODE is
|
||
an unknown opcode (a string containing an image of the numeric
|
||
value of the opcode can be returned, for instance). */
|
||
const char *(*op_name) (enum exp_opcode);
|
||
|
||
/* Dump the rest of this (prefix) expression after the operator
|
||
itself has been printed. See dump_subexp_body_standard in
|
||
(expprint.c). */
|
||
int (*dump_subexp_body) (struct expression *, struct ui_file *, int);
|
||
|
||
/* Evaluate an expression. */
|
||
struct value *(*evaluate_exp) (struct type *, struct expression *,
|
||
int *, enum noside);
|
||
};
|
||
|
||
|
||
/* Default descriptor containing standard definitions of all
|
||
elements. */
|
||
extern const struct exp_descriptor exp_descriptor_standard;
|
||
|
||
/* Functions used by language-specific extended operators to (recursively)
|
||
print/dump subexpressions. */
|
||
|
||
extern void print_subexp (struct expression *, int *, struct ui_file *,
|
||
enum precedence);
|
||
|
||
extern void print_subexp_standard (struct expression *, int *,
|
||
struct ui_file *, enum precedence);
|
||
|
||
/* Function used to avoid direct calls to fprintf
|
||
in the code generated by the bison parser. */
|
||
|
||
extern void parser_fprintf (FILE *, const char *, ...) ATTRIBUTE_PRINTF (2, 3);
|
||
|
||
extern int exp_uses_objfile (struct expression *exp, struct objfile *objfile);
|
||
|
||
extern void mark_completion_tag (enum type_code, const char *ptr,
|
||
int length);
|
||
|
||
/* Reallocate the `expout' pointer inside PS so that it can accommodate
|
||
at least LENELT expression elements. This function does nothing if
|
||
there is enough room for the elements. */
|
||
|
||
extern void increase_expout_size (struct parser_state *ps, size_t lenelt);
|
||
|
||
#endif /* PARSER_DEFS_H */
|
||
|