Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-05 15:15:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ada_add_block_renamings for compiler changes

Browse Source 
With the hierarchical name patches to GNAT, ada_add_block_renamings
must now be updated as well -- the comment there about the supported
forms of DW_TAG_imported_declaration is no longer correct, and now
full names must sometimes be constructed during the lookup process.
This commit is contained in:
Tom Tromey
2024-10-23 11:17:51 -06:00
parent aa24bf2c05
commit f83d71e9c7
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gdb/ada-lang.c
View File

@@ -5426,17 +5426,9 @@ ada_add_block_renamings (std::vector<struct block_symbol> &result,
const char *r_name; const char *r_name;
/* Avoid infinite recursions: skip this renaming if we are actually /* Avoid infinite recursions: skip this renaming if we are actually
already traversing it. already traversing it. */
if (renaming->searched)
Currently, symbol lookup in Ada don't use the namespace machinery from
C++/Fortran support: skip namespace imports that use them. */
if (renaming->searched
|| (renaming->import_src != NULL
&& renaming->import_src[0] != '\0')
|| (renaming->import_dest != NULL
&& renaming->import_dest[0] != '\0'))
continue; continue;
renaming->searched = 1;
/* TODO: here, we perform another name-based symbol lookup, which can /* TODO: here, we perform another name-based symbol lookup, which can
pull its own multiple overloads. In theory, we should be able to do pull its own multiple overloads. In theory, we should be able to do
@@ -5448,14 +5440,33 @@ ada_add_block_renamings (std::vector<struct block_symbol> &result,
r_name = (renaming->alias != NULL r_name = (renaming->alias != NULL
? renaming->alias ? renaming->alias
: renaming->declaration); : renaming->declaration);
if (r_name == nullptr)
continue;
scoped_restore reset_searched
= make_scoped_restore (&renaming->searched, 1);
std::string storage;
if (renaming->import_src != nullptr && renaming->import_src[0] != '\0')
{
storage = std::string (renaming->import_src) + "__" + r_name;
r_name = storage.c_str ();
}
if (name_match (r_name, lookup_name, NULL)) if (name_match (r_name, lookup_name, NULL))
{ {
lookup_name_info decl_lookup_name (renaming->declaration, r_name = renaming->declaration;
if (renaming->import_dest != nullptr
&& renaming->import_dest[0] != '\0')
{
storage = std::string (renaming->import_dest) + "__" + r_name;
r_name = storage.c_str ();
}
lookup_name_info decl_lookup_name (r_name,
lookup_name.match_type ()); lookup_name.match_type ());
ada_add_all_symbols (result, block, decl_lookup_name, domain, ada_add_all_symbols (result, block, decl_lookup_name, domain,
1, NULL); 1, NULL);
} }
renaming->searched = 0;
} }
return result.size () != defns_mark; return result.size () != defns_mark;
} }