[LLVMSymbolize] Move printing the description of a global into a separate function. NFC.
llvm-svn: 251669
diff --git a/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp b/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
index 65d4cce..fb2873e 100644
--- a/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
+++ b/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
@@ -239,11 +239,11 @@
return PatchedInlinedContext;
}
-bool SymbolizableObjectFile::symbolizeData(uint64_t ModuleOffset,
- std::string &Name, uint64_t &Start,
- uint64_t &Size) const {
- return getNameFromSymbolTable(SymbolRef::ST_Data, ModuleOffset, Name, Start,
- Size);
+DIGlobal SymbolizableObjectFile::symbolizeData(uint64_t ModuleOffset) const {
+ DIGlobal Res;
+ getNameFromSymbolTable(SymbolRef::ST_Data, ModuleOffset, Res.Name, Res.Start,
+ Res.Size);
+ return Res;
}
} // namespace symbolize
diff --git a/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.h b/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.h
index 7c138d3..a90e95c 100644
--- a/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.h
+++ b/llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.h
@@ -33,8 +33,7 @@
DIInliningInfo symbolizeInlinedCode(uint64_t ModuleOffset,
FunctionNameKind FNKind,
bool UseSymbolTable) const override;
- bool symbolizeData(uint64_t ModuleOffset, std::string &Name, uint64_t &Start,
- uint64_t &Size) const override;
+ DIGlobal symbolizeData(uint64_t ModuleOffset) const override;
// Return true if this is a 32-bit x86 PE COFF module.
bool isWin32Module() const override;
diff --git a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
index 2da35f9..87f76ed 100644
--- a/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
+++ b/llvm/lib/DebugInfo/Symbolize/Symbolize.cpp
@@ -56,6 +56,10 @@
}
+// By default, DILineInfo contains "<invalid>" for function/filename it
+// cannot fetch. We replace it to "??" to make our output closer to addr2line.
+static const char kDILineInfoBadString[] = "<invalid>";
+
const char LLVMSymbolizer::kBadString[] = "??";
std::string LLVMSymbolizer::symbolizeCode(const std::string &ModuleName,
@@ -88,9 +92,6 @@
std::string LLVMSymbolizer::symbolizeData(const std::string &ModuleName,
uint64_t ModuleOffset) {
- std::string Name = kBadString;
- uint64_t Start = 0;
- uint64_t Size = 0;
if (Opts.UseSymbolTable) {
if (SymbolizableModule *Info = getOrCreateModuleInfo(ModuleName)) {
// If the user is giving us relative addresses, add the preferred base of
@@ -98,13 +99,11 @@
// expects.
if (Opts.RelativeAddresses)
ModuleOffset += Info->getModulePreferredBase();
- if (Info->symbolizeData(ModuleOffset, Name, Start, Size) && Opts.Demangle)
- Name = DemangleName(Name, Info);
+ DIGlobal Global = Info->symbolizeData(ModuleOffset);
+ return printDIGlobal(Global, Info);
}
}
- std::stringstream ss;
- ss << Name << "\n" << Start << " " << Size << "\n";
- return ss.str();
+ return printDIGlobal(DIGlobal(), nullptr);
}
void LLVMSymbolizer::flush() {
@@ -359,9 +358,6 @@
std::string
LLVMSymbolizer::printDILineInfo(DILineInfo LineInfo,
const SymbolizableModule *ModInfo) const {
- // By default, DILineInfo contains "<invalid>" for function/filename it
- // cannot fetch. We replace it to "??" to make our output closer to addr2line.
- static const std::string kDILineInfoBadString = "<invalid>";
std::stringstream Result;
if (Opts.PrintFunctions != FunctionNameKind::None) {
std::string FunctionName = LineInfo.FunctionName;
@@ -378,6 +374,20 @@
return Result.str();
}
+std::string
+LLVMSymbolizer::printDIGlobal(DIGlobal Global,
+ const SymbolizableModule *ModInfo) const {
+ std::stringstream Result;
+ std::string Name = Global.Name;
+ if (Name == kDILineInfoBadString)
+ Name = kBadString;
+ else if (Opts.Demangle)
+ Name = DemangleName(Name, ModInfo);
+ Result << Name << "\n";
+ Result << Global.Start << " " << Global.Size << "\n";
+ return Result.str();
+}
+
// Undo these various manglings for Win32 extern "C" functions:
// cdecl - _foo
// stdcall - _foo@12
@@ -442,7 +452,7 @@
return (result == 0) ? Name : std::string(DemangledName);
}
#endif
- if (ModInfo->isWin32Module())
+ if (ModInfo && ModInfo->isWin32Module())
return std::string(demanglePE32ExternCFunc(Name));
return Name;
}