This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [RFA] Use symbol search name in expand_symtabs_matching_via_partial...
> > --- a/gdb/psymtab.c
> > +++ b/gdb/psymtab.c
> > @@ -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))
>
> It will need the same change for .gdb_index in write_psymbols.
>
> It would also mean .gdb_index version should be increased and backward
> compatibility implemented although IMHO it can be ignored for Ada, not sure if
> Ada users deploy .gdb_index.
Thanks for the quick review, Jan. How about the following.
As explained in the revision history, I ended up not incrementing
the version number, because I don't think we have a compatibility
issue. The only language for which it would have made a difference
(search-name != natural-name) is Ada, and the feature is not supported
for Ada. So...
gdb/ChangeLog:
* psymtab.c (expand_symtabs_matching_via_partial): Match
the partial symbols using their SYMBOL_SEARCH_NAME.
* dwarf2read.c (write_psymbols): Use SYMBOL_SEARCH_NAME instead
of SYMBOL_NATURAL_NAME in index entry.
Still testing, but I do not expect any regression.
Thanks,
--
Joel
commit a46ee1ab51430ba315cb20bb46555f5e76d4171e
Author: Joel Brobecker <brobecker@adacore.com>
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.
gdb/ChangeLog:
* psymtab.c (expand_symtabs_matching_via_partial): Match
the partial symbols using their SYMBOL_SEARCH_NAME.
* dwarf2read.c (write_psymbols): Use SYMBOL_SEARCH_NAME instead
of SYMBOL_NATURAL_NAME in index entry.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index c482c43..7905052 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -16890,7 +16890,7 @@ write_psymbols (struct mapped_symtab *symtab,
if (!*slot)
{
*slot = lookup;
- add_index_entry (symtab, SYMBOL_NATURAL_NAME (*psymp), cu_index);
+ add_index_entry (symtab, SYMBOL_SEARCH_NAME (*psymp), cu_index);
}
}
}
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 74185cc..861b302 100644
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -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))
{
PSYMTAB_TO_SYMTAB (ps);
keep_going = 0;