replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[LLVMSymbolize] Simplify SymbolizableObjectFile::symbolizeInlinedCode(). NFC. 

llvm-svn: 251672
This commit is contained in:
Alexey Samsonov 2015-10-30 00:02:55 +00:00
parent 14323e02e6
commit e46bd74147
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/DebugInfo/DIContext.h
View File

@ -57,6 +57,10 @@ class DIInliningInfo {
assert(Index < Frames.size());
return Frames[Index];
}
DILineInfo *getMutableFrame(unsigned Index) {
assert(Index < Frames.size());
return &Frames[Index];
}
uint32_t getNumberOfFrames() const {
return Frames.size();
}

26
llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp
View File

@ -217,26 +217,18 @@ DIInliningInfo SymbolizableObjectFile::symbolizeInlinedCode(
if (InlinedContext.getNumberOfFrames() == 0)
InlinedContext.addFrame(DILineInfo());
if (FNKind != FunctionNameKind::LinkageName || !UseSymbolTable)
return InlinedContext;
// Override the function name in lower frame with name from symbol table.
// We can't directly change the last element of DIInliningInfo, so copy
// all frames into new context, replacing function name in the last one.
DIInliningInfo PatchedInlinedContext;
for (uint32_t i = 0, n = InlinedContext.getNumberOfFrames(); i < n; i++) {
DILineInfo LineInfo = InlinedContext.getFrame(i);
if (i == n - 1) {
std::string FunctionName;
uint64_t Start, Size;
if (getNameFromSymbolTable(SymbolRef::ST_Function, ModuleOffset,
FunctionName, Start, Size)) {
LineInfo.FunctionName = FunctionName;
}
if (FNKind == FunctionNameKind::LinkageName && UseSymbolTable) {
std::string FunctionName;
uint64_t Start, Size;
if (getNameFromSymbolTable(SymbolRef::ST_Function, ModuleOffset,
FunctionName, Start, Size)) {
InlinedContext.getMutableFrame(InlinedContext.getNumberOfFrames() - 1)
->FunctionName = FunctionName;
}
PatchedInlinedContext.addFrame(LineInfo);
}
return PatchedInlinedContext;
return InlinedContext;
}
DIGlobal SymbolizableObjectFile::symbolizeData(uint64_t ModuleOffset) const {