RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-01-02 01:38:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify and delay extracting DebugLoc elements, scope and InlinedAt, as much as possible.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135124 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Devang Patel 2011-07-14 01:14:57 +00:00
parent 7332e6ee25
commit d77ec6208c
4 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/Support/DebugLoc.h
View File

@ -61,7 +61,10 @@ namespace llvm {
/// getFromDILocation - Translate the DILocation quad into a DebugLoc.
static DebugLoc getFromDILocation(MDNode *N);
/// getFromDILexicalBlock - Translate the DILexicalBlock into a DebugLoc.
static DebugLoc getFromDILexicalBlock(MDNode *N);
/// isUnknown - Return true if this is an unknown location.
bool isUnknown() const { return ScopeIdx == 0; }

30
lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@ -1566,8 +1566,11 @@ void DwarfDebug::endInstruction(const MachineInstr *MI) {
}
/// getOrCreateDbgScope - Create DbgScope for the scope.
DbgScope *DwarfDebug::getOrCreateDbgScope(const MDNode *Scope,
const MDNode *InlinedAt) {
DbgScope *DwarfDebug::getOrCreateDbgScope(DebugLoc DL, LLVMContext &Ctx) {
MDNode *Scope = NULL;
MDNode *InlinedAt = NULL;
DL.getScopeAndInlinedAt(Scope, InlinedAt, Ctx);
if (!InlinedAt) {
DbgScope *WScope = DbgScopeMap.lookup(Scope);
if (WScope)
@ -1576,7 +1579,7 @@ DbgScope *DwarfDebug::getOrCreateDbgScope(const MDNode *Scope,
DbgScopeMap.insert(std::make_pair(Scope, WScope));
if (DIDescriptor(Scope).isLexicalBlock()) {
DbgScope *Parent =
getOrCreateDbgScope(DILexicalBlock(Scope).getContext(), NULL);
getOrCreateDbgScope(DebugLoc::getFromDILexicalBlock(Scope), Ctx);
WScope->setParent(Parent);
Parent->addScope(WScope);
}
@ -1603,9 +1606,8 @@ DbgScope *DwarfDebug::getOrCreateDbgScope(const MDNode *Scope,
WScope = new DbgScope(NULL, DIDescriptor(Scope), InlinedAt);
DbgScopeMap.insert(std::make_pair(InlinedAt, WScope));
DILocation DL(InlinedAt);
DbgScope *Parent =
getOrCreateDbgScope(DL.getScope(), DL.getOrigLocation());
getOrCreateDbgScope(DebugLoc::getFromDILocation(InlinedAt), Ctx);
WScope->setParent(Parent);
Parent->addScope(WScope);
@ -1693,8 +1695,7 @@ bool DwarfDebug::extractScopeInformation() {
LLVMContext &Ctx = Asm->MF->getFunction()->getContext();
SmallVector<DbgRange, 4> MIRanges;
DenseMap<const MachineInstr *, DbgScope *> MI2ScopeMap;
const MDNode *PrevScope = NULL;
const MDNode *PrevInlinedAt = NULL;
DebugLoc PrevDL;
const MachineInstr *RangeBeginMI = NULL;
const MachineInstr *PrevMI = NULL;
for (MachineFunction::const_iterator I = Asm->MF->begin(), E = Asm->MF->end();
@ -1702,8 +1703,6 @@ bool DwarfDebug::extractScopeInformation() {
for (MachineBasicBlock::const_iterator II = I->begin(), IE = I->end();
II != IE; ++II) {
const MachineInstr *MInsn = II;
MDNode *Scope = NULL;
MDNode *InlinedAt = NULL;
// Check if instruction has valid location information.
const DebugLoc MIDL = MInsn->getDebugLoc();
@ -1711,10 +1710,9 @@ bool DwarfDebug::extractScopeInformation() {
PrevMI = MInsn;
continue;
}
MIDL.getScopeAndInlinedAt(Scope, InlinedAt, Ctx);
// If scope has not changed then skip this instruction.
if (Scope == PrevScope && PrevInlinedAt == InlinedAt) {
if (MIDL == PrevDL) {
PrevMI = MInsn;
continue;
}
@ -1733,8 +1731,7 @@ bool DwarfDebug::extractScopeInformation() {
DEBUG(dbgs() << "Next Range starting at " << *MInsn);
DEBUG(dbgs() << "------------------------\n");
DbgRange R(RangeBeginMI, PrevMI);
MI2ScopeMap[RangeBeginMI] = getOrCreateDbgScope(PrevScope,
PrevInlinedAt);
MI2ScopeMap[RangeBeginMI] = getOrCreateDbgScope(PrevDL, Ctx);
MIRanges.push_back(R);
}
@ -1743,16 +1740,15 @@ bool DwarfDebug::extractScopeInformation() {
// Reset previous markers.
PrevMI = MInsn;
PrevScope = Scope;
PrevInlinedAt = InlinedAt;
PrevDL = MIDL;
}
}
// Create last instruction range.
if (RangeBeginMI && PrevMI && PrevScope) {
if (RangeBeginMI && PrevMI && !PrevDL.isUnknown()) {
DbgRange R(RangeBeginMI, PrevMI);
MIRanges.push_back(R);
MI2ScopeMap[RangeBeginMI] = getOrCreateDbgScope(PrevScope, PrevInlinedAt);
MI2ScopeMap[RangeBeginMI] = getOrCreateDbgScope(PrevDL, Ctx);
}
if (!CurrentFnDbgScope)

2
lib/CodeGen/AsmPrinter/DwarfDebug.h
View File

@ -319,7 +319,7 @@ private:
void assignAbbrevNumber(DIEAbbrev &Abbrev);
/// getOrCreateDbgScope - Create DbgScope for the scope.
DbgScope *getOrCreateDbgScope(const MDNode *Scope, const MDNode *InlinedAt);
DbgScope *getOrCreateDbgScope(DebugLoc DL, LLVMContext &Ctx);
DbgScope *getOrCreateAbstractScope(const MDNode *N);

16
lib/VMCore/DebugLoc.cpp
View File

@ -128,6 +128,22 @@ DebugLoc DebugLoc::getFromDILocation(MDNode *N) {
return get(LineNo, ColNo, Scope, dyn_cast_or_null<MDNode>(N->getOperand(3)));
}
/// getFromDILexicalBlock - Translate the DILexicalBlock into a DebugLoc.
DebugLoc DebugLoc::getFromDILexicalBlock(MDNode *N) {
if (N == 0 || N->getNumOperands() < 3) return DebugLoc();
MDNode *Scope = dyn_cast_or_null<MDNode>(N->getOperand(1));
if (Scope == 0) return DebugLoc();
unsigned LineNo = 0, ColNo = 0;
if (ConstantInt *Line = dyn_cast_or_null<ConstantInt>(N->getOperand(2)))
LineNo = Line->getZExtValue();
if (ConstantInt *Col = dyn_cast_or_null<ConstantInt>(N->getOperand(3)))
ColNo = Col->getZExtValue();
return get(LineNo, ColNo, Scope, NULL);
}
//===----------------------------------------------------------------------===//
// DenseMap specialization
//===----------------------------------------------------------------------===//