DIE-to-consumer (string, in this case) matching, with quick exit on f…

…ailure
llvm · Jun 7, 2024 · 334301a · 334301a
1 parent 5da641c
commit 334301a
Show file tree

Hide file tree

Showing 4 changed files with 288 additions and 222 deletions.
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.cpp
@@ -564,3 +564,10 @@ std::optional<DWARFFormValue> DWARFDIE::find(const dw_attr_t attr) const {
     return form_value;
   return std::nullopt;
 }
+
+std::optional<uint64_t> llvm::getLanguage(lldb_private::plugin::dwarf::DWARFDIE D) {
+  if (auto I = D.GetCU()->GetDWARFLanguageType())
+    return I;
+  return std::nullopt;
+}
+
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDIE.h
@@ -156,4 +156,8 @@ class DWARFDIE::child_iterator
 } // namespace dwarf
 } // namespace lldb_private::plugin
 
+namespace llvm {
+std::optional<uint64_t> getLanguage(lldb_private::plugin::dwarf::DWARFDIE D);
+}
+
 #endif // LLDB_SOURCE_PLUGINS_SYMBOLFILE_DWARF_DWARFDIE_H
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -2793,6 +2793,7 @@ void SymbolFileDWARF::FindTypes(const TypeQuery &query, TypeResults &results) {
         llvm::StringRef remaining = Context.front().name;
         auto Visitor = [&](llvm::StringRef S) {
           Success &= remaining.consume_front(S);
+          return Success;
         };
         llvm::DWARFTypePrinter<DWARFDIE, decltype(Visitor)> p(Visitor);
         p.appendQualifiedName(die);