This is the mail archive of the
mailing list for the GDB project.
Re: [RFA] Use symbol search name in expand_symtabs_matching_via_partial...
> Please update also the comment for expand_symtabs_matching in symfile.h .
> OK with me, unless Tom has comments.
Here is the latest version. Will wait for Tom's comments...
Author: Joel Brobecker <firstname.lastname@example.org>
Date: Tue Dec 13 15:24:53 2011 -0500
Use symbol search name in expand_symtabs_matching_via_partial...
We are iterating over all symbols in a partial symtab that would
match a given name, so we should match the partial symbols
search name against the given name rather than using the natural
name. In C++, that does not make a difference, but it does in
Ada, because Ada searches using the symbol encoded name...
We also update the generation of the .gdb_index file to match this
change in the search. Although technically an incompatible change,
we do not increment the gdb_index version number, because Ada is
the only language where it would make a difference - except that
this feature is not supported for Ada.
* psymtab.c (expand_symtabs_matching_via_partial): Match
the partial symbols using their SYMBOL_SEARCH_NAME.
* symfile.h (struct quick_symbol_functions): Udate the
documentation of expand_symtabs_matching.
* dwarf2read.c (write_psymbols): Use SYMBOL_SEARCH_NAME instead
of SYMBOL_NATURAL_NAME in index entry.
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 74185cc..861b302 100644
@@ -1305,7 +1305,7 @@ expand_symtabs_matching_via_partial
|| (kind == TYPES_DOMAIN
&& SYMBOL_CLASS (*psym) == LOC_TYPEDEF))
&& (*name_matcher) (current_language,
- SYMBOL_NATURAL_NAME (*psym), data))
+ SYMBOL_SEARCH_NAME (*psym), data))
keep_going = 0;
diff --git a/gdb/symfile.h b/gdb/symfile.h
index 44f0c01..91605a2 100644
@@ -263,10 +263,9 @@ struct quick_symbol_functions
If even KIND matches, then NAME_MATCHER is called for each symbol
defined in the file. The current language, the symbol name and
- DATA are passed to NAME_MATCHER. The symbol "natural" name should
- be passed to NAME_MATCHER for all languages except Ada, where
- the encoded name is passed instead (see la_symbol_name_compare in
- struct language_defn for more details on this).
+ DATA are passed to NAME_MATCHER. The symbol "search" name should
+ be passed to NAME_MATCHER (see la_symbol_name_compare in struct
+ language_defn for more details on this).
If NAME_MATCHER returns zero, then this symbol is skipped.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index c482c43..7905052 100644
@@ -16890,7 +16890,7 @@ write_psymbols (struct mapped_symtab *symtab,
*slot = lookup;
- add_index_entry (symtab, SYMBOL_NATURAL_NAME (*psymp), cu_index);
+ add_index_entry (symtab, SYMBOL_SEARCH_NAME (*psymp), cu_index);