fixup! don't check specification DIE

Author: Michael137

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

@@ -251,10 +251,9 @@ static unsigned GetCXXMethodCVQuals(const DWARFDIE &subprogram,
 }
 
 static std::optional<std::string> MakeLLDBFuncAsmLabel(const DWARFDIE &die) {
-  std::optional<std::string> label;
-  char const *name = die.GetPubname();
-  if (name)
-    label.emplace(name);
+  char const *name = die.GetMangledName(/*substitute_name_allowed*/ false);
+  if (!name)
+    return std::nullopt;
 
   auto module_sp = die.GetModule();
   if (!module_sp)
@@ -268,8 +267,8 @@ static std::optional<std::string> MakeLLDBFuncAsmLabel(const DWARFDIE &die) {
   if (die_id == LLDB_INVALID_UID)
     return std::nullopt;
 
-  return llvm::formatv("{0}:{1}:{2:x}:{3:x}", FunctionCallLabelPrefix,
-                       name ? name : "", module_id, die_id)
+  return llvm::formatv("{0}:{1}:{2:x}:{3:x}", FunctionCallLabelPrefix, name,
+                       module_id, die_id)
       .str();
 }
 

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

@@ -2479,9 +2479,8 @@ llvm::Error SymbolFileDWARF::ResolveFunctionUID(SymbolContextList &sc_list,
   if (!die.IsValid())
     return llvm::createStringError("invalid input DIE");
 
-  // Look up by DW_AT_linkage_name if we can. Otherwise we can use the
-  // DW_AT_name.
-  char const *name = die.GetPubname();
+  // Rely on DW_AT_linkage_name to find us the definition DIE.
+  char const *name = die.GetMangledName(/*substitute_name_allowed=*/false);
   if (!name)
     return llvm::createStringError("input DIE has no name");
 
@@ -2494,14 +2493,14 @@ llvm::Error SymbolFileDWARF::ResolveFunctionUID(SymbolContextList &sc_list,
       if (entry.GetAttributeValueAsUnsigned(llvm::dwarf::DW_AT_declaration, 0))
         return true;
 
-      if (auto spec = entry.GetAttributeValueAsReferenceDIE(
-              llvm::dwarf::DW_AT_specification);
-          spec == die) {
-        die = entry;
-        return false;
-      }
-
-      return true;
+      // We don't check whether the specification DIE for this function
+      // corresponds to the declaration DIE because the declaration might be in
+      // a type-unit but the definition in the compile-unit (and it's
+      // specifcation would point to the declaration in the compile-unit). We
+      // rely on the mangled name within the module to be enough to find us the
+      // unique definition.
+      die = entry;
+      return false;
     });
   }