mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-02-11 13:02:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refine search in cp_search_static_and_baseclasses

Browse Source 
This changes cp_search_static_and_baseclasses to only search for
types, functions, and modules.  The latter two cases were discovered
by regression testing.  I found it somewhat surprising the Fortran
name lookup ends up in this code, but did not attempt to change this.
This commit is contained in:
Tom Tromey 2023-09-19 17:51:36 -06:00
parent 6cd92f3b86
commit 415ea5e3e5
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gdb/cp-namespace.c
View File

@ -268,14 +268,19 @@ cp_search_static_and_baseclasses (const char *name,
const char *nested = name + prefix_len + 2;
/* Lookup the scope symbol. If none is found, there is nothing more
that can be done. SCOPE could be a namespace, so always look in
VAR_DOMAIN. This works for classes too because of
symbol_matches_domain (which should be replaced with something
else, but it's what we have today). */
block_symbol scope_sym = lookup_symbol_in_static_block (scope.c_str (),
block, SEARCH_VFT);
that can be done. SCOPE could be a namespace, a class, or even a
function. This code is also used by Fortran, so modules are
included in the search as well. */
block_symbol scope_sym
= lookup_symbol_in_static_block (scope.c_str (), block,
SEARCH_TYPE_DOMAIN
| SEARCH_FUNCTION_DOMAIN
| SEARCH_MODULE_DOMAIN);
if (scope_sym.symbol == NULL)
scope_sym = lookup_global_symbol (scope.c_str (), block, SEARCH_VFT);
scope_sym = lookup_global_symbol (scope.c_str (), block,
SEARCH_TYPE_DOMAIN
| SEARCH_FUNCTION_DOMAIN
| SEARCH_MODULE_DOMAIN);
if (scope_sym.symbol == NULL)
return {};