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

Work around gold/15646.

Browse source 
* dwarf2read.c (read_index_from_section): Update comment.
	(struct dw2_symtab_iterator): New member global_seen.
	(dw2_symtab_iter_init): Initialize it.
	(dw2_symtab_iter_next): Skip duplicate global symbols.
	(dw2_expand_symtabs_matching): Ditto.
This commit is contained in:
Doug Evans 2013-11-12 09:43:17 -08:00
parent 6adcee1866
commit 8943b87476
2 changed files with 45 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gdb/ChangeLog
View file

@ -1,3 +1,12 @@
2013-11-12 Doug Evans <dje@google.com>
Work around gold/15646.
* dwarf2read.c (read_index_from_section): Update comment.
(struct dw2_symtab_iterator): New member global_seen.
(dw2_symtab_iter_init): Initialize it.
(dw2_symtab_iter_next): Skip duplicate global symbols.
(dw2_expand_symtabs_matching): Ditto.
2013-11-12 Joel Brobecker <brobecker@adacore.com> 2013-11-12 Joel Brobecker <brobecker@adacore.com>
* mi/mi-cmds.h (mi_cmd_info_ada_exceptions): Add declaration. * mi/mi-cmds.h (mi_cmd_info_ada_exceptions): Add declaration.

43
gdb/dwarf2read.c
View file

@ -3034,9 +3034,12 @@ to use the section anyway."),
return 0; return 0;
} }
/* Version 7 indices generated by gold refer to the CU for a symbol instead /* Version 7 indices generated by gold refer to the CU for a symbol instead
of the TU (for symbols coming from TUs). It's just a performance bug, and of the TU (for symbols coming from TUs),
we can't distinguish gdb-generated indices from gold-generated ones, so http://sourceware.org/bugzilla/show_bug.cgi?id=15021.
nothing to do here. */ Plus gold-generated indices can have duplicate entries for global symbols,
http://sourceware.org/bugzilla/show_bug.cgi?id=15646.
These are just performance bugs, and we can't distinguish gdb-generated
indices from gold-generated ones, so issue no warning here. */
/* Indexes with higher version than the one supported by GDB may be no /* Indexes with higher version than the one supported by GDB may be no
longer backward compatible. */ longer backward compatible. */
@ -3448,6 +3451,11 @@ struct dw2_symtab_iterator
int next; int next;
/* The number of elements in VEC, or zero if there is no match. */ /* The number of elements in VEC, or zero if there is no match. */
int length; int length;
/* Have we seen a global version of the symbol?
If so we can ignore all further global instances.
This is to work around gold/15646, inefficient gold-generated
indices. */
int global_seen;
}; };
/* Initialize the index symtab iterator ITER. /* Initialize the index symtab iterator ITER.
@ -3467,6 +3475,7 @@ dw2_symtab_iter_init (struct dw2_symtab_iterator *iter,
iter->block_index = block_index; iter->block_index = block_index;
iter->domain = domain; iter->domain = domain;
iter->next = 0; iter->next = 0;
iter->global_seen = 0;
if (find_slot_in_mapped_hash (index, name, &iter->vec)) if (find_slot_in_mapped_hash (index, name, &iter->vec))
iter->length = MAYBE_SWAP (*iter->vec); iter->length = MAYBE_SWAP (*iter->vec);
@ -3518,10 +3527,18 @@ dw2_symtab_iter_next (struct dw2_symtab_iterator *iter)
if (per_cu->v.quick->symtab) if (per_cu->v.quick->symtab)
continue; continue;
if (attrs_valid /* Check static vs global. */
&& iter->want_specific_block if (attrs_valid)
&& want_static != is_static) {
continue; if (iter->want_specific_block
&& want_static != is_static)
continue;
/* Work around gold/15646. */
if (!is_static && iter->global_seen)
continue;
if (!is_static)
iter->global_seen = 1;
}
/* Only check the symbol's kind if it has one. */ /* Only check the symbol's kind if it has one. */
if (attrs_valid) if (attrs_valid)
@ -3849,6 +3866,7 @@ dw2_expand_symtabs_matching
offset_type idx = 2 * iter; offset_type idx = 2 * iter;
const char *name; const char *name;
offset_type *vec, vec_len, vec_idx; offset_type *vec, vec_len, vec_idx;
int global_seen = 0;
if (index->symbol_table[idx] == 0 && index->symbol_table[idx + 1] == 0) if (index->symbol_table[idx] == 0 && index->symbol_table[idx + 1] == 0)
continue; continue;
@ -3867,6 +3885,8 @@ dw2_expand_symtabs_matching
{ {
struct dwarf2_per_cu_data *per_cu; struct dwarf2_per_cu_data *per_cu;
offset_type cu_index_and_attrs = MAYBE_SWAP (vec[vec_idx + 1]); offset_type cu_index_and_attrs = MAYBE_SWAP (vec[vec_idx + 1]);
/* This value is only valid for index versions >= 7. */
int is_static = GDB_INDEX_SYMBOL_STATIC_VALUE (cu_index_and_attrs);
gdb_index_symbol_kind symbol_kind = gdb_index_symbol_kind symbol_kind =
GDB_INDEX_SYMBOL_KIND_VALUE (cu_index_and_attrs); GDB_INDEX_SYMBOL_KIND_VALUE (cu_index_and_attrs);
int cu_index = GDB_INDEX_CU_VALUE (cu_index_and_attrs); int cu_index = GDB_INDEX_CU_VALUE (cu_index_and_attrs);
@ -3878,6 +3898,15 @@ dw2_expand_symtabs_matching
(index->version >= 7 (index->version >= 7
&& symbol_kind != GDB_INDEX_SYMBOL_KIND_NONE); && symbol_kind != GDB_INDEX_SYMBOL_KIND_NONE);
/* Work around gold/15646. */
if (attrs_valid)
{
if (!is_static && global_seen)
continue;
if (!is_static)
global_seen = 1;
}
/* Only check the symbol's kind if it has one. */ /* Only check the symbol's kind if it has one. */
if (attrs_valid) if (attrs_valid)
{ {