diff options
| -rw-r--r-- | include/llvm/PassManager.h | 4 | ||||
| -rw-r--r-- | lib/VMCore/PassManager.cpp | 23 |
2 files changed, 20 insertions, 7 deletions
diff --git a/include/llvm/PassManager.h b/include/llvm/PassManager.h index 23c3086210..075a572fb3 100644 --- a/include/llvm/PassManager.h +++ b/include/llvm/PassManager.h @@ -119,8 +119,8 @@ public: void removeDeadPasses() { /* TODO : Implement */ } private: - // Required set of analysis for the passes managed by this manager - std::vector<AnalysisID> RequiredSet; + // Analysis required by the passes managed by this manager + std::vector<AnalysisID> RequiredAnalysis; }; /// PassManager_New manages ModulePassManagers diff --git a/lib/VMCore/PassManager.cpp b/lib/VMCore/PassManager.cpp index ad5a5dd79b..27a86b65a6 100644 --- a/lib/VMCore/PassManager.cpp +++ b/lib/VMCore/PassManager.cpp @@ -142,9 +142,18 @@ bool CommonPassManagerImpl::manageablePass(Pass *P) { AnalysisUsage AnUsage; P->getAnalysisUsage(AnUsage); - // If this pass is not preserving information that is required by the other passes - // managed by this manager then use new manager - // TODO + // If this pass is not preserving information that is required by the other + // passes managed by this manager then use new manager + if (!AnUsage.getPreservesAll()) { + const std::vector<AnalysisID> &PreservedSet = AnUsage.getPreservedSet(); + for (std::vector<AnalysisID>::iterator I = RequiredAnalysis.begin(), + E = RequiredAnalysis.end(); I != E; ++I) { + if (std::find(PreservedSet.begin(), PreservedSet.end(), *I) == + PreservedSet.end()) + // This analysis is not preserved. Need new manager. + return false; + } + } return true; } @@ -157,8 +166,12 @@ bool CommonPassManagerImpl::analysisCurrentlyAvailable(AnalysisID AID) { /// Augment RequiredSet by adding analysis required by pass P. void CommonPassManagerImpl::noteDownRequiredAnalysis(Pass *P) { + AnalysisUsage AnUsage; + P->getAnalysisUsage(AnUsage); + const std::vector<AnalysisID> &RequiredSet = AnUsage.getRequiredSet(); - // TODO + // FIXME: What about duplicates ? + RequiredAnalysis.insert(RequiredAnalysis.end(), RequiredSet.begin(), RequiredSet.end()); } /// Remove AnalysisID from the RequiredSet @@ -375,7 +388,7 @@ PassManagerImpl_New::add(Pass *P) { bool PassManagerImpl_New::addPass(Pass *P) { - if (!activeManager) { + if (!activeManager || !activeManager->addPass(P)) { activeManager = new ModulePassManager_New(); PassManagers.push_back(activeManager); } |