nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "DebugInfo: Ensure that all debug location scope chains from instructions within a function, lead to the function itself."

Browse Source 
This reverts commit r212085.

This breaks the sanitizer bot... & I thought I'd tried pretty hard not
to do that. Guess I need to try harder.

llvm-svn: 212089
This commit is contained in:
David Blaikie
2014-07-01 04:11:45 +00:00
parent f1b307bcb0
commit c8caa1702a
4 changed files with 50 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/CodeGen/LexicalScopes.cpp
View File

@@ -137,8 +137,6 @@ LexicalScope *LexicalScopes::findLexicalScope(DebugLoc DL) {
/// getOrCreateLexicalScope - Find lexical scope for the given DebugLoc. If
/// not available then create new lexical scope.
LexicalScope *LexicalScopes::getOrCreateLexicalScope(DebugLoc DL) {
if (DL.isUnknown())
return nullptr;
MDNode *Scope = nullptr;
MDNode *InlinedAt = nullptr;
DL.getScopeAndInlinedAt(Scope, InlinedAt, MF->getFunction()->getContext());
@@ -174,12 +172,9 @@ LexicalScope *LexicalScopes::getOrCreateRegularScope(MDNode *Scope) {
std::make_tuple(Parent, DIDescriptor(Scope),
nullptr, false)).first;
if (!Parent) {
assert(DIDescriptor(Scope).isSubprogram());
assert(DISubprogram(Scope).describes(MF->getFunction()));
assert(!CurrentFnLexicalScope);
if (!Parent && DIDescriptor(Scope).isSubprogram() &&
DISubprogram(Scope).describes(MF->getFunction()))
CurrentFnLexicalScope = &I->second;
}
return &I->second;
}