Make current pass info available _after_ removing info that is not

preserved.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32329 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/VMCore/PassManager.cpp b/lib/VMCore/PassManager.cpp
index 83246310fa8baf79ce24dd7cbc968d9e9f473d14..29d0ec1b7319085df25e7dd7adf8aacf35d6e983 100644 (file)
--- a/lib/VMCore/PassManager.cpp
+++ b/lib/VMCore/PassManager.cpp
@@ -533,12 +533,11 @@ void PMDataManager::addPassToManager(Pass *P,
                                      bool ProcessAnalysis) {
 
   if (ProcessAnalysis) {
-    // Take a note of analysis required and made available by this pass
-    initializeAnalysisImpl(P);
-    recordAvailableAnalysis(P);
-
+    // Take a note of analysis required and made available by this pass.
     // Remove the analysis not preserved by this pass
+    initializeAnalysisImpl(P);
     removeNotPreservedAnalysis(P);
+    recordAvailableAnalysis(P);
   }
 
   // Add pass
@@ -600,10 +599,10 @@ BasicBlockPassManager_New::runOnFunction(Function &F) {
            e = passVectorEnd(); itr != e; ++itr) {
       Pass *P = *itr;
       
-      recordAvailableAnalysis(P);
       BasicBlockPass *BP = dynamic_cast<BasicBlockPass*>(P);
       Changed |= BP->runOnBasicBlock(*I);
       removeNotPreservedAnalysis(P);
+      recordAvailableAnalysis(P);
       removeDeadPasses(P);
     }
   return Changed;
@@ -718,10 +717,10 @@ bool FunctionPassManagerImpl_New::runOnModule(Module &M) {
            e = passVectorEnd(); itr != e; ++itr) {
       Pass *P = *itr;
       
-      recordAvailableAnalysis(P);
       FunctionPass *FP = dynamic_cast<FunctionPass*>(P);
       Changed |= FP->runOnFunction(*I);
       removeNotPreservedAnalysis(P);
+      recordAvailableAnalysis(P);
       removeDeadPasses(P);
     }
   return Changed;
@@ -739,10 +738,10 @@ bool FunctionPassManagerImpl_New::runOnFunction(Function &F) {
          e = passVectorEnd(); itr != e; ++itr) {
     Pass *P = *itr;
     
-    recordAvailableAnalysis(P);
     FunctionPass *FP = dynamic_cast<FunctionPass*>(P);
     Changed |= FP->runOnFunction(F);
     removeNotPreservedAnalysis(P);
+    recordAvailableAnalysis(P);
     removeDeadPasses(P);
   }
   return Changed;
@@ -848,10 +847,10 @@ ModulePassManager_New::runOnModule(Module &M) {
          e = passVectorEnd(); itr != e; ++itr) {
     Pass *P = *itr;
 
-    recordAvailableAnalysis(P);
     ModulePass *MP = dynamic_cast<ModulePass*>(P);
     Changed |= MP->runOnModule(M);
     removeNotPreservedAnalysis(P);
+    recordAvailableAnalysis(P);
     removeDeadPasses(P);
   }
   return Changed;