FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify version check in dw2_symtab_iter_next

Browse source 
This simplifies the index versio check in dw2_symtab_iter_next, by
passing a reference to the index object to this function.  This avoids
an indirection via the per_bfd object.
This commit is contained in:
Tom Tromey 2021-11-22 16:50:46 -07:00
parent 6606799fc4
commit c1a56932c4
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gdb/dwarf2/read.c
View file

@ -2949,7 +2949,8 @@ dw2_symtab_iter_init (struct dw2_symtab_iterator *iter,
/* Return the next matching CU or NULL if there are no more. */
static struct dwarf2_per_cu_data *
dw2_symtab_iter_next (struct dw2_symtab_iterator *iter)
dw2_symtab_iter_next (struct dw2_symtab_iterator *iter,
mapped_index &index)
{
dwarf2_per_objfile *per_objfile = iter->per_objfile;
@ -2963,8 +2964,7 @@ dw2_symtab_iter_next (struct dw2_symtab_iterator *iter)
Indices prior to version 7 don't record them,
and indices >= 7 may elide them for certain symbols
(gold does this). */
int attrs_valid =
(per_objfile->per_bfd->index_table->version >= 7
int attrs_valid = (index.version >= 7
&& symbol_kind != GDB_INDEX_SYMBOL_KIND_NONE);
/* Don't crash on bad data. */
@ -3141,7 +3141,7 @@ dwarf2_gdb_index::expand_matching_symbols
struct dwarf2_per_cu_data *per_cu;
dw2_symtab_iter_init (&iter, per_objfile, block_kind, domain, namei);
while ((per_cu = dw2_symtab_iter_next (&iter)) != NULL)
while ((per_cu = dw2_symtab_iter_next (&iter, index)) != NULL)
dw2_expand_symtabs_matching_one (per_cu, per_objfile, nullptr,
nullptr);
return true;