Skip to content

Commit fa922cf

Browse files
[lldb][SymbolFileDWARF] Use DWARFIndex::GetFullyQualifiedType query
1 parent 7b077b1 commit fa922cf

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3095,7 +3095,7 @@ SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(const DWARFDIE &die) {
30953095
}
30963096

30973097
const DWARFDeclContext die_dwarf_decl_ctx = GetDWARFDeclContext(die);
3098-
m_index->GetTypes(die_dwarf_decl_ctx, [&](DWARFDIE type_die) {
3098+
m_index->GetFullyQualifiedType(die_dwarf_decl_ctx, [&](DWARFDIE type_die) {
30993099
// Make sure type_die's language matches the type system we are
31003100
// looking for. We don't want to find a "Foo" type from Java if we
31013101
// are looking for a "Foo" type for C, C++, ObjC, or ObjC++.
@@ -3122,9 +3122,8 @@ SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(const DWARFDIE &die) {
31223122
return true;
31233123
}
31243124

3125-
DWARFDeclContext type_dwarf_decl_ctx = GetDWARFDeclContext(type_die);
3126-
31273125
if (log) {
3126+
DWARFDeclContext type_dwarf_decl_ctx = GetDWARFDeclContext(type_die);
31283127
GetObjectFile()->GetModule()->LogMessage(
31293128
log,
31303129
"SymbolFileDWARF::"
@@ -3134,10 +3133,6 @@ SymbolFileDWARF::FindDefinitionTypeForDWARFDeclContext(const DWARFDIE &die) {
31343133
type_dwarf_decl_ctx.GetQualifiedName());
31353134
}
31363135

3137-
// Make sure the decl contexts match all the way up
3138-
if (die_dwarf_decl_ctx != type_dwarf_decl_ctx)
3139-
return true;
3140-
31413136
Type *resolved_type = ResolveType(type_die, false);
31423137
if (!resolved_type || resolved_type == DIE_IS_BEING_PARSED)
31433138
return true;

0 commit comments

Comments
 (0)