Reverting r135232. It's causing infinite looping in DbgScope::openInsnRange.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135254 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index b7fc41b..03fb8d1 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -1587,22 +1587,18 @@
}
getOrCreateAbstractScope(Scope);
- DbgScope *WScope = NULL;
- const MDNode *Key = InlinedAt;
- if (const MDNode *Nest = DILocation(InlinedAt).getOrigLocation())
- Key = Nest;
- WScope = DbgScopeMap.lookup(Key);
+ DbgScope *WScope = DbgScopeMap.lookup(InlinedAt);
if (WScope)
return WScope;
WScope = new DbgScope(NULL, DIDescriptor(Scope), InlinedAt);
- DbgScopeMap[Key] = WScope;
+ DbgScopeMap.insert(std::make_pair(InlinedAt, WScope));
DbgScope *Parent =
getOrCreateDbgScope(DebugLoc::getFromDILocation(InlinedAt));
WScope->setParent(Parent);
Parent->addScope(WScope);
- ConcreteScopes[Key] = WScope;
+ ConcreteScopes[InlinedAt] = WScope;
return WScope;
}
@@ -2087,12 +2083,8 @@
DbgScope *Scope = NULL;
LLVMContext &Ctx = Asm->MF->getFunction()->getContext();
- if (const MDNode *IA = DL.getInlinedAt(Ctx)) {
- const MDNode *Key = IA;
- if (const MDNode *Nest = DILocation(IA).getOrigLocation())
- Key = Nest;
- Scope = ConcreteScopes.lookup(Key);
- }
+ if (const MDNode *IA = DL.getInlinedAt(Ctx))
+ Scope = ConcreteScopes.lookup(IA);
if (Scope == 0)
Scope = DbgScopeMap.lookup(DL.getScope(Ctx));