RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-13 23:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix stuff... again.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@219693 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2014-10-14 17:11:59 +00:00
parent 2993617e41
commit 8a61781323
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/CodeGen/LexicalScopes.cpp
View File

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

28
lib/IR/DebugInfo.cpp
View File

@ -568,6 +568,34 @@ bool DISubprogram::Verify() const {
if (isLValueReference() && isRValueReference()) if (isLValueReference() && isRValueReference())
return false; return false;
// If a DISubprogram has an llvm::Function*, then scope chains from all
// instructions within the function should lead to this DISubprogram.
if (auto *F = getFunction()) {
LLVMContext &Ctxt = F->getContext();
for (auto &BB : *F) {
for (auto &I : BB) {
DebugLoc DL = I.getDebugLoc();
if (DL.isUnknown())
continue;
MDNode *Scope = nullptr;
MDNode *IA = nullptr;
// walk the inlined-at scopes
while (DL.getScopeAndInlinedAt(Scope, IA, F->getContext()), IA)
DL = DebugLoc::getFromDILocation(IA);
DL.getScopeAndInlinedAt(Scope, IA, Ctxt);
assert(!IA);
while (!DIDescriptor(Scope).isSubprogram()) {
DILexicalBlockFile D(Scope);
Scope = D.isLexicalBlockFile()
? D.getScope()
: DebugLoc::getFromDILexicalBlock(Scope).getScope(Ctxt);
}
if (!DISubprogram(Scope).describes(F))
return false;
}
}
}
return DbgNode->getNumOperands() == 9 && getNumHeaderFields() == 12; return DbgNode->getNumOperands() == 9 && getNumHeaderFields() == 12;
} }