fixup! don't create custom label if declaration is from a type-unit

Author: Michael137

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

@@ -279,6 +279,22 @@ static const char *GetMangledOrStructorName(const DWARFDIE &die) {
 }
 
 static std::optional<std::string> MakeLLDBFuncAsmLabel(const DWARFDIE &die) {
+  const DWARFUnit *cu = die.GetCU();
+  if (!cu)
+    return std::nullopt;
+
+  // FIXME: Workaround for when the declaration DIE for a method is in a
+  // type-unit. The definition DIE's specification points to the declaration DIE
+  // in the compile-unit, so if we encoded the DIE from the type-unit, the DIEs
+  // wouldn't match and the label decoder would error out.
+  if (die.IsMethod() && cu->IsTypeUnit()) {
+    const char *mangled = die.GetMangledName(/*substitute_name_allowed=*/false);
+    if (!mangled)
+      return std::nullopt;
+
+    return mangled;
+  }
+
   const char *name = GetMangledOrStructorName(die);
   if (!name)
     return std::nullopt;

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

@@ -2497,8 +2497,10 @@ llvm::Error SymbolFileDWARF::FindAndResolveFunction(
     if (entry.GetAttributeValueAsUnsigned(llvm::dwarf::DW_AT_declaration, 0))
       return true;
 
-    // TODO: this specification check doesn't work if declaration DIE was in a
-    // type-unit (we should only encode DIEs from .debug_info).
+    // FIXME: this specification check doesn't work if declaration DIE was in a
+    // type-unit. We currently work around this by only creating the
+    // LLDB function call labels when the declaration DIE was *not* in a
+    // type-unit.
     auto spec = entry.GetAttributeValueAsReferenceDIE(DW_AT_specification);
     if (!spec)
       return true;