From 9c79936b3df018166d53869f7f2bb2909f129e51 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 8 Mar 2021 07:27:57 -0700 Subject: [PATCH] Use bound_minimal_symbol in var_msym_value_operation This changes var_msym_value_operation to use a bound_minimal_symbol rather than separate minsym and objfile parameters. The main benefit of this is removing the possibly-confusing check_objfile overload for a plain minimal symbol. gdb/ChangeLog 2021-03-08 Tom Tromey * parse.c (parser_state::push_symbol, parser_state::push_dollar): Update. * p-exp.y (variable): Update. * go-exp.y (variable): Update. * expprint.c (dump_for_expression): Use bound_minimal_symbol. Remove overload for objfile. * expop.h (eval_op_var_msym_value): Use bound_minimal_symbol parameter. (check_objfile): Likewise. (dump_for_expression): Likewise. Remove overload for objfile. (class var_msym_value_operation): Use bound_minimal_symbol. * eval.c (eval_op_var_msym_value): Use bound_minimal_symbol parameter. (var_msym_value_operation::evaluate_for_address) (var_msym_value_operation::evaluate_for_sizeof) (var_msym_value_operation::evaluate_for_cast): Update. * d-exp.y (PrimaryExpression): Update. * c-exp.y (variable): Update. * ax-gdb.c (var_msym_value_operation::do_generate_ax): Update. * ada-lang.c (ada_var_msym_value_operation::evaluate_for_cast): Update. * ada-exp.y (write_var_or_type): Update. --- gdb/ChangeLog | 25 +++++++++++++++++++++++++ gdb/ada-exp.y | 3 +-- gdb/ada-lang.c | 5 ++--- gdb/ax-gdb.c | 6 +++--- gdb/c-exp.y | 4 ++-- gdb/d-exp.y | 3 +-- gdb/eval.c | 25 +++++++++++-------------- gdb/expop.h | 28 ++++++++-------------------- gdb/expprint.c | 14 ++++---------- gdb/go-exp.y | 2 +- gdb/p-exp.y | 2 +- gdb/parse.c | 5 ++--- 12 files changed, 61 insertions(+), 61 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index edbba7fd8bf..d1cf966d213 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,28 @@ +2021-03-08 Tom Tromey + + * parse.c (parser_state::push_symbol, parser_state::push_dollar): + Update. + * p-exp.y (variable): Update. + * go-exp.y (variable): Update. + * expprint.c (dump_for_expression): Use bound_minimal_symbol. + Remove overload for objfile. + * expop.h (eval_op_var_msym_value): Use bound_minimal_symbol + parameter. + (check_objfile): Likewise. + (dump_for_expression): Likewise. Remove overload for objfile. + (class var_msym_value_operation): Use bound_minimal_symbol. + * eval.c (eval_op_var_msym_value): Use bound_minimal_symbol + parameter. + (var_msym_value_operation::evaluate_for_address) + (var_msym_value_operation::evaluate_for_sizeof) + (var_msym_value_operation::evaluate_for_cast): Update. + * d-exp.y (PrimaryExpression): Update. + * c-exp.y (variable): Update. + * ax-gdb.c (var_msym_value_operation::do_generate_ax): Update. + * ada-lang.c (ada_var_msym_value_operation::evaluate_for_cast): + Update. + * ada-exp.y (write_var_or_type): Update. + 2021-03-08 Tom Tromey * parser-defs.h (exp_uses_objfile): Return bool. diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index de88c863cff..222fec536f3 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -1550,8 +1550,7 @@ write_var_or_type (struct parser_state *par_state, = ada_lookup_simple_minsym (encoded_name); if (msym.minsym != NULL) { - par_state->push_new - (msym.minsym, msym.objfile); + par_state->push_new (msym); /* Maybe cause error here rather than later? FIXME? */ write_selectors (par_state, encoded_name + tail_index); return NULL; diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 323168e1b30..8330cbcc0b9 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10241,9 +10241,8 @@ ada_var_msym_value_operation::evaluate_for_cast (struct type *expect_type, if (noside == EVAL_AVOID_SIDE_EFFECTS) return value_zero (expect_type, not_lval); - value *val = evaluate_var_msym_value (noside, - std::get<1> (m_storage), - std::get<0> (m_storage)); + const bound_minimal_symbol &b = std::get<0> (m_storage); + value *val = evaluate_var_msym_value (noside, b.objfile, b.minsym); val = ada_value_cast (expect_type, val); diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index 788be528d1b..33fc5383764 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -1631,13 +1631,13 @@ var_msym_value_operation::do_generate_ax (struct expression *exp, struct axs_value *value, struct type *cast_type) { - gen_msym_var_ref (ax, value, std::get<0> (m_storage), - std::get<1> (m_storage)); + const bound_minimal_symbol &b = std::get<0> (m_storage); + gen_msym_var_ref (ax, value, b.minsym, b.objfile); if (value->type->code () == TYPE_CODE_ERROR) { if (cast_type == nullptr) - error_unknown_type (std::get<0> (m_storage)->linkage_name ()); + error_unknown_type (b.minsym->linkage_name ()); value->type = cast_type; } } diff --git a/gdb/c-exp.y b/gdb/c-exp.y index 8bc7a97e0ac..c0e4b494f3d 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -1195,7 +1195,7 @@ variable: name_not_typename = find_gnu_ifunc (sym.symbol); if (resolver.minsym != NULL) pstate->push_new - (resolver.minsym, resolver.objfile); + (resolver); else pstate->push_new (sym.symbol, sym.block); @@ -1243,7 +1243,7 @@ variable: name_not_typename (alias_target, SYMBOL_BLOCK_VALUE (alias_target)); else pstate->push_new - (msymbol.minsym, msymbol.objfile); + (msymbol); } } ; diff --git a/gdb/d-exp.y b/gdb/d-exp.y index d74fb8711a0..90c342e0e21 100644 --- a/gdb/d-exp.y +++ b/gdb/d-exp.y @@ -470,8 +470,7 @@ PrimaryExpression: /* Lookup foreign name in global static symbols. */ msymbol = lookup_bound_minimal_symbol (copy.c_str ()); if (msymbol.minsym != NULL) - pstate->push_new - (msymbol.minsym, msymbol.objfile); + pstate->push_new (msymbol); else if (!have_full_symbols () && !have_partial_symbols ()) error (_("No symbol table is loaded. Use the \"file\" command")); else diff --git a/gdb/eval.c b/gdb/eval.c index 9510eee962a..5af728a9bbd 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1005,14 +1005,15 @@ eval_op_var_entry_value (struct type *expect_type, struct expression *exp, struct value * eval_op_var_msym_value (struct type *expect_type, struct expression *exp, enum noside noside, bool outermost_p, - minimal_symbol *msymbol, struct objfile *objfile) + bound_minimal_symbol msymbol) { - value *val = evaluate_var_msym_value (noside, objfile, msymbol); + value *val = evaluate_var_msym_value (noside, msymbol.objfile, + msymbol.minsym); struct type *type = value_type (val); if (type->code () == TYPE_CODE_ERROR && (noside != EVAL_AVOID_SIDE_EFFECTS || !outermost_p)) - error_unknown_type (msymbol->print_name ()); + error_unknown_type (msymbol.minsym->print_name ()); return val; } @@ -2529,9 +2530,8 @@ value * var_msym_value_operation::evaluate_for_address (struct expression *exp, enum noside noside) { - value *val = evaluate_var_msym_value (noside, - std::get<1> (m_storage), - std::get<0> (m_storage)); + const bound_minimal_symbol &b = std::get<0> (m_storage); + value *val = evaluate_var_msym_value (noside, b.objfile, b.minsym); if (noside == EVAL_AVOID_SIDE_EFFECTS) { struct type *type = lookup_pointer_type (value_type (val)); @@ -2637,14 +2637,12 @@ var_msym_value_operation::evaluate_for_sizeof (struct expression *exp, enum noside noside) { - minimal_symbol *msymbol = std::get<0> (m_storage); - value *mval = evaluate_var_msym_value (noside, - std::get<1> (m_storage), - msymbol); + const bound_minimal_symbol &b = std::get<0> (m_storage); + value *mval = evaluate_var_msym_value (noside, b.objfile, b.minsym); struct type *type = value_type (mval); if (type->code () == TYPE_CODE_ERROR) - error_unknown_type (msymbol->print_name ()); + error_unknown_type (b.minsym->print_name ()); /* FIXME: This should be size_t. */ struct type *size_type = builtin_type (exp->gdbarch)->builtin_int; @@ -2750,9 +2748,8 @@ var_msym_value_operation::evaluate_for_cast (struct type *to_type, if (noside == EVAL_AVOID_SIDE_EFFECTS) return value_zero (to_type, not_lval); - value *val = evaluate_var_msym_value (noside, - std::get<1> (m_storage), - std::get<0> (m_storage)); + const bound_minimal_symbol &b = std::get<0> (m_storage); + value *val = evaluate_var_msym_value (noside, b.objfile, b.minsym); val = value_cast (to_type, val); diff --git a/gdb/expop.h b/gdb/expop.h index c12a55e8db3..cc8d9ca6741 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -53,8 +53,7 @@ extern struct value *eval_op_var_msym_value (struct type *expect_type, struct expression *exp, enum noside noside, bool outermost_p, - minimal_symbol *msymbol, - struct objfile *objfile); + bound_minimal_symbol msymbol); extern struct value *eval_op_var_entry_value (struct type *expect_type, struct expression *exp, enum noside noside, symbol *sym); @@ -244,11 +243,9 @@ check_objfile (const struct block *block, struct objfile *objfile) } static inline bool -check_objfile (minimal_symbol *minsym, struct objfile *objfile) +check_objfile (bound_minimal_symbol minsym, struct objfile *objfile) { - /* This may seem strange but minsyms are only used with an objfile - as well. */ - return false; + return check_objfile (minsym.objfile, objfile); } static inline bool @@ -331,7 +328,7 @@ extern void dump_for_expression (struct ui_file *stream, int depth, extern void dump_for_expression (struct ui_file *stream, int depth, symbol *sym); extern void dump_for_expression (struct ui_file *stream, int depth, - minimal_symbol *msym); + bound_minimal_symbol msym); extern void dump_for_expression (struct ui_file *stream, int depth, const block *bl); extern void dump_for_expression (struct ui_file *stream, int depth, @@ -340,8 +337,6 @@ extern void dump_for_expression (struct ui_file *stream, int depth, enum c_string_type_values flags); extern void dump_for_expression (struct ui_file *stream, int depth, enum range_flag flags); -extern void dump_for_expression (struct ui_file *stream, int depth, - objfile *objf); extern void dump_for_expression (struct ui_file *stream, int depth, const std::unique_ptr &comp); @@ -446,7 +441,7 @@ check_constant (const operation_up &item) } static inline bool -check_constant (struct minimal_symbol *msym) +check_constant (bound_minimal_symbol msym) { return false; } @@ -469,12 +464,6 @@ check_constant (const std::string &str) return true; } -static inline bool -check_constant (struct objfile *objfile) -{ - return true; -} - static inline bool check_constant (ULONGEST cst) { @@ -700,7 +689,7 @@ protected: }; class var_msym_value_operation - : public maybe_constant_operation + : public maybe_constant_operation { public: @@ -711,8 +700,7 @@ public: enum noside noside) override { return eval_op_var_msym_value (expect_type, exp, noside, m_outermost, - std::get<0> (m_storage), - std::get<1> (m_storage)); + std::get<0> (m_storage)); } value *evaluate_for_sizeof (struct expression *exp, enum noside noside) @@ -730,7 +718,7 @@ public: enum noside noside, const std::vector &args) override { - const char *name = std::get<0> (m_storage)->print_name (); + const char *name = std::get<0> (m_storage).minsym->print_name (); return operation::evaluate_funcall (expect_type, exp, noside, name, args); } diff --git a/gdb/expprint.c b/gdb/expprint.c index 49919e815fe..e228beb83a5 100644 --- a/gdb/expprint.c +++ b/gdb/expprint.c @@ -110,10 +110,11 @@ dump_for_expression (struct ui_file *stream, int depth, symbol *sym) } void -dump_for_expression (struct ui_file *stream, int depth, minimal_symbol *msym) +dump_for_expression (struct ui_file *stream, int depth, + bound_minimal_symbol msym) { - fprintf_filtered (stream, _("%*sMinsym: %s\n"), depth, "", - msym->print_name ()); + fprintf_filtered (stream, _("%*sMinsym %s in objfile %s\n"), depth, "", + msym.minsym->print_name (), objfile_name (msym.objfile)); } void @@ -162,13 +163,6 @@ dump_for_expression (struct ui_file *stream, int depth, fputs_unfiltered ("\n", stream); } -void -dump_for_expression (struct ui_file *stream, int depth, objfile *objf) -{ - fprintf_filtered (stream, _("%*sObjfile: %s\n"), depth, "", - objfile_name (objf)); -} - void dump_for_expression (struct ui_file *stream, int depth, enum range_flag flags) diff --git a/gdb/go-exp.y b/gdb/go-exp.y index d096cc8b7c9..05822d142db 100644 --- a/gdb/go-exp.y +++ b/gdb/go-exp.y @@ -581,7 +581,7 @@ variable: name_not_typename lookup_bound_minimal_symbol (arg.c_str ()); if (msymbol.minsym != NULL) pstate->push_new - (msymbol.minsym, msymbol.objfile); + (msymbol); else if (!have_full_symbols () && !have_partial_symbols ()) error (_("No symbol table is loaded. " diff --git a/gdb/p-exp.y b/gdb/p-exp.y index 963e8989bf1..02ad6bddc4f 100644 --- a/gdb/p-exp.y +++ b/gdb/p-exp.y @@ -728,7 +728,7 @@ variable: name_not_typename lookup_bound_minimal_symbol (arg.c_str ()); if (msymbol.minsym != NULL) pstate->push_new - (msymbol.minsym, msymbol.objfile); + (msymbol); else if (!have_full_symbols () && !have_partial_symbols ()) error (_("No symbol table is loaded. " diff --git a/gdb/parse.c b/gdb/parse.c index 966b27e5643..692d38d363d 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -230,8 +230,7 @@ parser_state::push_symbol (const char *name, block_symbol sym) { struct bound_minimal_symbol msymbol = lookup_bound_minimal_symbol (name); if (msymbol.minsym != NULL) - push_new (msymbol.minsym, - msymbol.objfile); + push_new (msymbol); else if (!have_full_symbols () && !have_partial_symbols ()) error (_("No symbol table is loaded. Use the \"file\" command.")); else @@ -308,7 +307,7 @@ parser_state::push_dollar (struct stoken str) msym = lookup_bound_minimal_symbol (copy.c_str ()); if (msym.minsym) { - push_new (msym.minsym, msym.objfile); + push_new (msym); return; } -- 2.30.2