Skip to content

Commit e99f9db

Browse files
committed
[gdb/symtab] Fix symbol loading performance regression
The commit "[gdb/symtab] Fix language of duplicate static minimal symbol" introduces a performance regression, when loading a cc1 executable build with -O0 -g and gcc 7.4.0. The performance regression, measured in 'real' time is about 175%. The slower execution comes from the fact that the fix in symbol_set_names makes the call to symbol_find_demangled_name unconditional. Fix this by reverting the commit, and redoing the fix as follows. Recapturing the original problem, the first time symbol_set_names is called with gsymbol.language == lang_auto and linkage_name == "_ZL3foov", the name is not present in the per_bfd->demangled_names_hash hash table, so symbol_find_demangled_name is called to demangle the name, after which the mangled/demangled pair is added to the hashtable. The call to symbol_find_demangled_name also sets gsymbol.language to lang_cplus. The second time symbol_set_names is called with gsymbol.language == lang_auto and linkage_name == "_ZL3foov", the name is present in the hash table, so the demangled name from the hash table is used. However, the language of the symbol remains lang_auto. Fix this by adding a field language in struct demangled_name_entry, and using the field in symbol_set_names to set the language of gsymbol, if necessary. Tested on x86_64-linux. gdb/ChangeLog: 2019-06-10 Tom de Vries <[email protected]> PR symtab/24545 * symtab.c (struct demangled_name_entry): Add language field. (symbol_set_names): Revert "[gdb/symtab] Fix language of duplicate static minimal symbol". Set and use language field.
1 parent c6a636c commit e99f9db

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

gdb/ChangeLog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2019-06-10 Tom de Vries <[email protected]>
2+
3+
PR symtab/24545
4+
* symtab.c (struct demangled_name_entry): Add language field.
5+
(symbol_set_names): Revert "[gdb/symtab] Fix language of duplicate
6+
static minimal symbol". Set and use language field.
7+
18
2019-06-10 Tom Tromey <[email protected]>
29

310
* ada-lang.c (_initialize_ada_language): Update help text.

gdb/symtab.c

+9-6
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,7 @@ symbol_set_language (struct general_symbol_info *gsymbol,
713713
struct demangled_name_entry
714714
{
715715
const char *mangled;
716+
ENUM_BITFIELD(language) language : LANGUAGE_BITS;
716717
char demangled[1];
717718
};
718719

@@ -853,11 +854,6 @@ symbol_set_names (struct general_symbol_info *gsymbol,
853854
else
854855
linkage_name_copy = linkage_name;
855856

856-
/* Set the symbol language. */
857-
char *demangled_name_ptr
858-
= symbol_find_demangled_name (gsymbol, linkage_name_copy);
859-
gdb::unique_xmalloc_ptr<char> demangled_name (demangled_name_ptr);
860-
861857
entry.mangled = linkage_name_copy;
862858
slot = ((struct demangled_name_entry **)
863859
htab_find_slot (per_bfd->demangled_names_hash.get (),
@@ -870,6 +866,9 @@ symbol_set_names (struct general_symbol_info *gsymbol,
870866
|| (gsymbol->language == language_go
871867
&& (*slot)->demangled[0] == '\0'))
872868
{
869+
char *demangled_name_ptr
870+
= symbol_find_demangled_name (gsymbol, linkage_name_copy);
871+
gdb::unique_xmalloc_ptr<char> demangled_name (demangled_name_ptr);
873872
int demangled_len = demangled_name ? strlen (demangled_name.get ()) : 0;
874873

875874
/* Suppose we have demangled_name==NULL, copy_name==0, and
@@ -906,12 +905,16 @@ symbol_set_names (struct general_symbol_info *gsymbol,
906905
strcpy (mangled_ptr, linkage_name_copy);
907906
(*slot)->mangled = mangled_ptr;
908907
}
908+
(*slot)->language = gsymbol->language;
909909

910910
if (demangled_name != NULL)
911-
strcpy ((*slot)->demangled, demangled_name.get());
911+
strcpy ((*slot)->demangled, demangled_name.get ());
912912
else
913913
(*slot)->demangled[0] = '\0';
914914
}
915+
else if (gsymbol->language == language_unknown
916+
|| gsymbol->language == language_auto)
917+
gsymbol->language = (*slot)->language;
915918

916919
gsymbol->name = (*slot)->mangled;
917920
if ((*slot)->demangled[0] != '\0')

0 commit comments

Comments
 (0)