aprantl updated this revision to Diff 224197.
aprantl added a comment.

Added a `if (!has_qualified_name_hash)`.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D68678/new/

https://reviews.llvm.org/D68678

Files:
  lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp


Index: lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp
@@ -117,8 +117,9 @@
   // searching for the parent type ("vector<int>") first we can avoid
   // extracting type DIEs from object files that would fail the filter
   // anyway.
-  if (context.GetSize() > 1 && (context[1].tag == DW_TAG_class_type ||
-                                context[1].tag == DW_TAG_structure_type)) {
+  if (!has_qualified_name_hash && (context.GetSize() > 1) &&
+      (context[1].tag == DW_TAG_class_type ||
+       context[1].tag == DW_TAG_structure_type)) {
     DIEArray class_matches;
     m_apple_types_up->FindByName(context[1].name, class_matches);
     if (class_matches.empty())


Index: lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp
+++ lldb/source/Plugins/SymbolFile/DWARF/AppleDWARFIndex.cpp
@@ -117,8 +117,9 @@
   // searching for the parent type ("vector<int>") first we can avoid
   // extracting type DIEs from object files that would fail the filter
   // anyway.
-  if (context.GetSize() > 1 && (context[1].tag == DW_TAG_class_type ||
-                                context[1].tag == DW_TAG_structure_type)) {
+  if (!has_qualified_name_hash && (context.GetSize() > 1) &&
+      (context[1].tag == DW_TAG_class_type ||
+       context[1].tag == DW_TAG_structure_type)) {
     DIEArray class_matches;
     m_apple_types_up->FindByName(context[1].name, class_matches);
     if (class_matches.empty())
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to