diff options
| author | Tom Tromey <tromey@adacore.com> | 2022-04-21 09:37:24 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2022-04-22 06:40:49 -0600 |
| commit | 6acc36f71dfc60e357496174672103f133f85e97 (patch) | |
| tree | 60950c261198aaefca12869e7baf0a643a15c047 /gdb/dwarf2 | |
| parent | 77e99ad92f1a5855a2a3c1a8b9f484b6beb5bdd3 (diff) | |
| download | gdb-6acc36f71dfc60e357496174672103f133f85e97.zip gdb-6acc36f71dfc60e357496174672103f133f85e97.tar.gz gdb-6acc36f71dfc60e357496174672103f133f85e97.tar.bz2 | |
Fix method naming bug in new DWARF indexer
Pedro pointed out that gdb-add-index is much slower with the new DWARF
indexer. He also noticed that, in some cases, the generated
.gdb_index would have the wrong fully-qualified name for a method.
I tracked this down to a bug in the indexer. If a type could have
methods but was marked as a declaration, the indexer was ignoring it.
However, this meant that the internal map to find the qualified name
was not updated for this container.
Diffstat (limited to 'gdb/dwarf2')
| -rw-r--r-- | gdb/dwarf2/abbrev.c | 11 | ||||
| -rw-r--r-- | gdb/dwarf2/read.c | 7 |
2 files changed, 16 insertions, 2 deletions
diff --git a/gdb/dwarf2/abbrev.c b/gdb/dwarf2/abbrev.c index 2db5ea1..4ca27ea 100644 --- a/gdb/dwarf2/abbrev.c +++ b/gdb/dwarf2/abbrev.c @@ -280,6 +280,17 @@ abbrev_table::read (struct dwarf2_section_info *section, = (cur_abbrev->tag == DW_TAG_namespace || cur_abbrev->tag == DW_TAG_enumeration_type); } + else if ((cur_abbrev->tag == DW_TAG_structure_type + || cur_abbrev->tag == DW_TAG_class_type + || cur_abbrev->tag == DW_TAG_union_type) + && cur_abbrev->has_children) + { + /* We have to record this as interesting, regardless of how + DW_AT_declaration is set, so that any subsequent + DW_AT_specification pointing at a child of this will get + the correct scope. */ + cur_abbrev->interesting = true; + } else if (has_hardcoded_declaration && (cur_abbrev->tag != DW_TAG_variable || !has_external)) cur_abbrev->interesting = false; diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index d6fccf8..37e9587 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -18091,8 +18091,11 @@ cooked_indexer::scan_attributes (dwarf2_per_cu_data *scanning_per_cu, that is ok. Similarly, we allow an external variable without a location; those are resolved via minimal symbols. */ if (is_declaration && !for_specification - && (abbrev->tag != DW_TAG_variable - || (*flags & IS_STATIC) != 0)) + && !(abbrev->tag == DW_TAG_variable && (*flags & IS_STATIC) == 0) + && !((abbrev->tag == DW_TAG_class_type + || abbrev->tag == DW_TAG_structure_type + || abbrev->tag == DW_TAG_union_type) + && abbrev->has_children)) { *linkage_name = nullptr; *name = nullptr; |