diff options
author | Tom de Vries <tdevries@suse.de> | 2020-05-20 11:48:39 +0200 |
---|---|---|
committer | Tom de Vries <tdevries@suse.de> | 2020-05-20 11:48:39 +0200 |
commit | 9a0bacfb08eb87938919023915ecc0ca2ba21223 (patch) | |
tree | 2d5e055ca530385b3a022cf9b6b7902bce000c76 /gdb/dwarf2/read.c | |
parent | 7b958a48e1322880f23cdb0a1c35643dd27d3ddb (diff) | |
download | gdb-9a0bacfb08eb87938919023915ecc0ca2ba21223.zip gdb-9a0bacfb08eb87938919023915ecc0ca2ba21223.tar.gz gdb-9a0bacfb08eb87938919023915ecc0ca2ba21223.tar.bz2 |
[gdb/symtab] Handle .gdb_index in ada language mode
When running test-case gdb.base/with.exp with target board cc-with-gdb-index,
we have:
...
(gdb) PASS: gdb.base/with.exp: basics: show language
with language ada -- print g_s^M
'g_s' has unknown type; cast it to its declared type^M
(gdb) FAIL: gdb.base/with.exp: basics: with language ada -- print g_s
...
This is due to this bit in dw2_map_matching_symbols:
...
if (dwarf2_per_objfile->index_table != nullptr)
{
/* Ada currently doesn't support .gdb_index (see PR24713). We can get
here though if the current language is Ada for a non-Ada objfile
using GNU index. As Ada does not look for non-Ada symbols this
function should just return. */
return;
}
...
While the reasoning in the comment may be sound from language perspective, it
does introduce an inconsistency in gdb behaviour between:
- having a .gdb_index section, and
- having a .gdb_names section, or a partial symtab, or -readnow.
Fix the inconsistency by completing implementation of
dw2_map_matching_symbols.
Tested on x86_64-linux, both with native and target board
cc-with-debug-index.
gdb/ChangeLog:
2020-05-20 Tom de Vries <tdevries@suse.de>
PR symtab/25833
* dwarf2/read.c (dw2_map_matching_symbols): Handle .gdb_index.
gdb/testsuite/ChangeLog:
2020-05-20 Tom de Vries <tdevries@suse.de>
PR symtab/25833
* gdb.base/with-mf-inc.c: New test.
* gdb.base/with-mf-main.c: New test.
* gdb.base/with-mf.exp: New file.
Diffstat (limited to 'gdb/dwarf2/read.c')
-rw-r--r-- | gdb/dwarf2/read.c | 52 |
1 files changed, 44 insertions, 8 deletions
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 2ab7c5c..ded71f5 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -3650,6 +3650,20 @@ dw2_expand_symtabs_with_fullname (struct objfile *objfile, } static void +dw2_expand_symtabs_matching_symbol + (mapped_index_base &index, + const lookup_name_info &lookup_name_in, + gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher, + enum search_domain kind, + gdb::function_view<bool (offset_type)> match_callback); + +static void +dw2_expand_symtabs_matching_one + (struct dwarf2_per_cu_data *per_cu, + gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher, + gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify); + +static void dw2_map_matching_symbols (struct objfile *objfile, const lookup_name_info &name, domain_enum domain, @@ -3661,19 +3675,41 @@ dw2_map_matching_symbols struct dwarf2_per_objfile *dwarf2_per_objfile = get_dwarf2_per_objfile (objfile); + const block_enum block_kind = global ? GLOBAL_BLOCK : STATIC_BLOCK; + if (dwarf2_per_objfile->index_table != nullptr) { /* Ada currently doesn't support .gdb_index (see PR24713). We can get here though if the current language is Ada for a non-Ada objfile - using GNU index. As Ada does not look for non-Ada symbols this - function should just return. */ - return; - } + using GNU index. */ + mapped_index &index = *dwarf2_per_objfile->index_table; + + const char *match_name = name.ada ().lookup_name ().c_str (); + auto matcher = [&] (const char *symname) + { + if (ordered_compare == nullptr) + return true; + return ordered_compare (symname, match_name) == 0; + }; + + dw2_expand_symtabs_matching_symbol (index, name, matcher, ALL_DOMAIN, + [&] (offset_type namei) + { + struct dw2_symtab_iterator iter; + struct dwarf2_per_cu_data *per_cu; - /* We have -readnow: no .gdb_index, but no partial symtabs either. So, - inline psym_map_matching_symbols here, assuming all partial symtabs have - been read in. */ - const int block_kind = global ? GLOBAL_BLOCK : STATIC_BLOCK; + dw2_symtab_iter_init (&iter, dwarf2_per_objfile, block_kind, domain, + match_name); + while ((per_cu = dw2_symtab_iter_next (&iter)) != NULL) + dw2_expand_symtabs_matching_one (per_cu, nullptr, nullptr); + return true; + }); + } + else + { + /* We have -readnow: no .gdb_index, but no partial symtabs either. So, + proceed assuming all symtabs have been read in. */ + } for (compunit_symtab *cust : objfile->compunits ()) { |