6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix a (legacy) PassManager crash that occurs when a ModulePass

Browse Source 
indirectly requires a function analysis.

This bug was reported by Jason Kim. He included a test case here:
http://reviews.llvm.org/D3312

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205753 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Andrew Trick
2014-04-08 03:40:34 +00:00
parent 2424511b6f
commit 3c1f2eb75d
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/IR/LegacyPassManager.cpp
View File

@@ -1657,6 +1657,8 @@ void MPPassManager::addLowerLevelRequiredPass(Pass *P, Pass *RequiredPass) {
assert((P->getPotentialPassManagerType() < assert((P->getPotentialPassManagerType() <
RequiredPass->getPotentialPassManagerType()) && RequiredPass->getPotentialPassManagerType()) &&
"Unable to handle Pass that requires lower level Analysis pass"); "Unable to handle Pass that requires lower level Analysis pass");
if (!RequiredPass)
return;
FunctionPassManagerImpl *FPP = OnTheFlyManagers[P]; FunctionPassManagerImpl *FPP = OnTheFlyManagers[P];
if (!FPP) { if (!FPP) {
@@ -1666,14 +1668,24 @@ void MPPassManager::addLowerLevelRequiredPass(Pass *P, Pass *RequiredPass) {
OnTheFlyManagers[P] = FPP; OnTheFlyManagers[P] = FPP;
} }
FPP->add(RequiredPass); const PassInfo * RequiredPassPI =
PassRegistry::getPassRegistry()->getPassInfo(RequiredPass->getPassID());
// Register P as the last user of RequiredPass. Pass *FoundPass = NULL;
if (RequiredPass) { if (RequiredPassPI && RequiredPassPI->isAnalysis()) {
SmallVector<Pass *, 1> LU; FoundPass =
LU.push_back(RequiredPass); ((PMTopLevelManager*)FPP)->findAnalysisPass(RequiredPass->getPassID());
FPP->setLastUser(LU, P);
} }
if (!FoundPass) {
FoundPass = RequiredPass;
// This should be guaranteed to add RequiredPass to the passmanager given
// that we checked for an avaiable analysis above.
FPP->add(RequiredPass);
}
// Register P as the last user of FoundPass or RequiredPass.
SmallVector<Pass *, 1> LU;
LU.push_back(FoundPass);
FPP->setLastUser(LU, P);
} }
/// Return function pass corresponding to PassInfo PI, that is /// Return function pass corresponding to PassInfo PI, that is