From: Tom Tromey Date: Sat, 16 Apr 2022 18:33:56 +0000 (-0600) Subject: Add accessors for symbol's artificial field X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=496feb16f855347dbd30fa171a8dc1d97654ae8e;p=binutils-gdb.git Add accessors for symbol's artificial field For a series I'm experimenting with, it was handy to hide a symbol's "artificial" field behind accessors. This patch is the result. --- diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 7623d0eb48d..96494538a60 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -3854,7 +3854,7 @@ ada_resolve_variable (struct symbol *sym, const struct block *block, candidates.end (), [] (block_symbol &bsym) { - return bsym.symbol->artificial; + return bsym.symbol->is_artificial (); }), candidates.end ()); @@ -13456,9 +13456,9 @@ public: } /* See language.h. */ - virtual bool symbol_printing_suppressed (struct symbol *symbol) const override + bool symbol_printing_suppressed (struct symbol *symbol) const override { - return symbol->artificial; + return symbol->is_artificial (); } /* See language.h. */ diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index bb5b636e916..b7b372fcd73 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -20634,7 +20634,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu, /* Handle DW_AT_artificial. */ attr = dwarf2_attr (die, DW_AT_artificial, cu); if (attr != nullptr) - sym->artificial = attr->as_boolean (); + sym->set_is_artificial (attr->as_boolean ()); /* Default assumptions. Use the passed type or decode it from the die. */ diff --git a/gdb/symtab.h b/gdb/symtab.h index 4a33c7a119f..41c8654a5ef 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1203,7 +1203,7 @@ struct symbol : public general_symbol_info, public allocate_on_obstack m_is_inlined (0), maybe_copied (0), subclass (SYMBOL_NONE), - artificial (false) + m_artificial (false) { /* We can't use an initializer list for members of a base class, and general_symbol_info needs to stay a POD type. */ @@ -1369,6 +1369,18 @@ struct symbol : public general_symbol_info, public allocate_on_obstack m_value.chain = sym; } + /* Return true if this symbol was marked as artificial. */ + bool is_artificial () const + { + return m_artificial; + } + + /* Set the 'artificial' flag on this symbol. */ + void set_is_artificial (bool artificial) + { + m_artificial = artificial; + } + /* Data type of value */ struct type *m_type = nullptr; @@ -1423,7 +1435,7 @@ struct symbol : public general_symbol_info, public allocate_on_obstack /* Whether this symbol is artificial. */ - bool artificial : 1; + bool m_artificial : 1; /* Line number of this symbol's definition, except for inlined functions. For an inlined function (class LOC_BLOCK and