Identify Analysis pass.

Do not run analysis pass again if analysis info is still available.
This fixes PR1441.

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

diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h
index ce305d5875e0c38b1e3d193f9cdc449def53c5b6..8c1a3ed6ea170b6f7dfca4f6c7405062f1e72abf 100644 (file)
--- a/include/llvm/Analysis/Dominators.h
+++ b/include/llvm/Analysis/Dominators.h
@@ -300,6 +300,9 @@ public:
   // FIXME: Should remove this
   virtual bool runOnFunction(Function &F) { return false; }
 
+  /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+  virtual bool isAnalysis() const { return true; }
+
   virtual void releaseMemory() { reset(); }
 
   /// getNode - return the (Post)DominatorTree node for the specified basic
@@ -691,6 +694,9 @@ public:
     return DT->getRootNode();
   }
   
+  /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+  virtual bool isAnalysis() const { return true; }
+
   virtual bool runOnFunction(Function &F);
   
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -910,6 +916,9 @@ public:
     return Roots[0];
   }
 
+  /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+  virtual bool isAnalysis() const { return true; }
+
   virtual bool runOnFunction(Function &) {
     Frontiers.clear();
     DominatorTree &DT = getAnalysis<DominatorTree>();

diff --git a/include/llvm/Analysis/FindUsedTypes.h b/include/llvm/Analysis/FindUsedTypes.h
index b0d38c509c1f17e27a7cc3c5d7cb7dab289dbcb3..605cc07b0a23fce20e525046d54b1118923a32fe 100644 (file)
--- a/include/llvm/Analysis/FindUsedTypes.h
+++ b/include/llvm/Analysis/FindUsedTypes.h
@@ -50,6 +50,10 @@ private:
   void IncorporateValue(const Value *V);
 
 public:
+
+  /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+  virtual bool isAnalysis() const { return true; }
+
   /// run - This incorporates all types used by the specified module
   bool runOnModule(Module &M);
 

diff --git a/include/llvm/Analysis/IntervalPartition.h b/include/llvm/Analysis/IntervalPartition.h
index 8b85e7c08b12c43eede7d1e37bc8464e363b80a4..855e3a44c462054b999d1008d6920d03017c67d6 100644 (file)
--- a/include/llvm/Analysis/IntervalPartition.h
+++ b/include/llvm/Analysis/IntervalPartition.h
@@ -49,6 +49,9 @@ public:
 
   IntervalPartition() : FunctionPass((intptr_t)&ID), RootInterval(0) {}
 
+  /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+  virtual bool isAnalysis() const { return true; }
+
   // run - Calculate the interval partition for this function
   virtual bool runOnFunction(Function &F);
 

diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h
index 29781b2185db08e6762db8a3de1e981827a9a5d2..afefbf16b4193686391592c6586e2014cf8d1763 100644 (file)
--- a/include/llvm/Analysis/LoopInfo.h
+++ b/include/llvm/Analysis/LoopInfo.h
@@ -580,6 +580,9 @@ public:
   LoopInfoBase() { }
   ~LoopInfoBase() { releaseMemory(); }
   
+  /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+  virtual bool isAnalysis() const { return true; }
+
   void releaseMemory() {
     for (typename std::vector<LoopBase<BlockT>* >::iterator I =
          TopLevelLoops.begin(), E = TopLevelLoops.end(); I != E; ++I)

diff --git a/include/llvm/Analysis/MemoryDependenceAnalysis.h b/include/llvm/Analysis/MemoryDependenceAnalysis.h
index c6ef41ff24046de932a30586bcf7ad6dc0e23dcd..d16295b87d0b6464a64c671fb3e441ce3acf4bda 100644 (file)
--- a/include/llvm/Analysis/MemoryDependenceAnalysis.h
+++ b/include/llvm/Analysis/MemoryDependenceAnalysis.h
@@ -68,6 +68,9 @@ class MemoryDependenceAnalysis : public FunctionPass {
     static char ID; // Class identification, replacement for typeinfo
     MemoryDependenceAnalysis() : FunctionPass((intptr_t)&ID) {}
 
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     /// Pass Implementation stuff.  This doesn't do any analysis.
     ///
     bool runOnFunction(Function &) {return false; }

diff --git a/include/llvm/Analysis/PostDominators.h b/include/llvm/Analysis/PostDominators.h
index 07910e9538c7cb6c013322bab035755916787d3b..c55022b7637dfe35892a8862a36018fccb106606 100644 (file)
--- a/include/llvm/Analysis/PostDominators.h
+++ b/include/llvm/Analysis/PostDominators.h
@@ -29,6 +29,9 @@ struct PostDominatorTree : public FunctionPass {
     DT = new DominatorTreeBase<BasicBlock>(true);
   }
 
+  /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+  virtual bool isAnalysis() const { return true; }
+
   virtual bool runOnFunction(Function &F);
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -69,6 +72,9 @@ struct PostDominanceFrontier : public DominanceFrontierBase {
   PostDominanceFrontier() 
     : DominanceFrontierBase((intptr_t) &ID, true) {}
 
+  /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+  virtual bool isAnalysis() const { return true; }
+
   virtual bool runOnFunction(Function &) {
     Frontiers.clear();
     PostDominatorTree &DT = getAnalysis<PostDominatorTree>();

diff --git a/include/llvm/Analysis/ScalarEvolution.h b/include/llvm/Analysis/ScalarEvolution.h
index 4d9d5e5fc044c7aad59ad93bd91b17cfa14de1af..d97abe470681cbf8a6c5182c4a13736e35f72e3a 100644 (file)
--- a/include/llvm/Analysis/ScalarEvolution.h
+++ b/include/llvm/Analysis/ScalarEvolution.h
@@ -291,6 +291,9 @@ namespace llvm {
     /// that no dangling references are left around.
     void deleteValueFromRecords(Value *V) const;
 
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     virtual bool runOnFunction(Function &F);
     virtual void releaseMemory();
     virtual void getAnalysisUsage(AnalysisUsage &AU) const;

diff --git a/include/llvm/Pass.h b/include/llvm/Pass.h
index 5948922f669c991cdf283936c6a872f9beb38aa9..58bdfc010afaba73bd0e3ea45bf1224e02c66fff 100644 (file)
--- a/include/llvm/Pass.h
+++ b/include/llvm/Pass.h
@@ -130,6 +130,11 @@ public:
     return Resolver; 
   }
 
+  /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+  virtual bool isAnalysis() const {
+    return false;
+  }
+
   /// getAnalysisUsage - This function should be overriden by passes that need
   /// analysis information to do their job.  If a pass specifies that it uses a
   /// particular analysis result to this function, it can then use the

diff --git a/lib/Analysis/AliasAnalysisCounter.cpp b/lib/Analysis/AliasAnalysisCounter.cpp
index 374625311f501123c69eace74431e9ed054803ed..8b35ea8370c564b2541d78adce5904bece3f1c24 100644 (file)
--- a/lib/Analysis/AliasAnalysisCounter.cpp
+++ b/lib/Analysis/AliasAnalysisCounter.cpp
@@ -72,6 +72,9 @@ namespace {
       }
     }
 
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     bool runOnModule(Module &M) {
       this->M = &M;
       InitializeAliasAnalysis(this);

diff --git a/lib/Analysis/AliasAnalysisEvaluator.cpp b/lib/Analysis/AliasAnalysisEvaluator.cpp
index 1ed06805fa62b2dfa206b37a6116a1df787d8a88..51fdec494325f57cd7a446052627838c9cf582ec 100644 (file)
--- a/lib/Analysis/AliasAnalysisEvaluator.cpp
+++ b/lib/Analysis/AliasAnalysisEvaluator.cpp
@@ -70,6 +70,9 @@ namespace {
       return false;
     }
 
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     bool runOnFunction(Function &F);
     bool doFinalization(Module &M);
   };

diff --git a/lib/Analysis/AliasDebugger.cpp b/lib/Analysis/AliasDebugger.cpp
index dd766e90d796bd0392ec0dc97f4201344ba253c9..6b534e94be17d7ae46695d031d2b5a5f4ada1598 100644 (file)
--- a/lib/Analysis/AliasDebugger.cpp
+++ b/lib/Analysis/AliasDebugger.cpp
@@ -43,6 +43,9 @@ namespace {
     static char ID; // Class identification, replacement for typeinfo
     AliasDebugger() : ModulePass((intptr_t)&ID) {}
 
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     bool runOnModule(Module &M) {
       InitializeAliasAnalysis(this);                 // set up super class
 

diff --git a/lib/Analysis/AliasSetTracker.cpp b/lib/Analysis/AliasSetTracker.cpp
index d5038ea6d1dfe94ca76e6940613f0bf20726f1a5..69cf4b309b7d362ade53df041b2016c4a401b1d0 100644 (file)
--- a/lib/Analysis/AliasSetTracker.cpp
+++ b/lib/Analysis/AliasSetTracker.cpp
@@ -558,6 +558,9 @@ namespace {
       AU.addRequired<AliasAnalysis>();
     }
 
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     virtual bool runOnFunction(Function &F) {
       Tracker = new AliasSetTracker(getAnalysis<AliasAnalysis>());
 

diff --git a/lib/Analysis/CFGPrinter.cpp b/lib/Analysis/CFGPrinter.cpp
index a96e9d066ee6c9abbdc288d3ed7353c4076bc036..7b61ff8ebfe872dd84a303b0c117da5c18c6ab76 100644 (file)
--- a/lib/Analysis/CFGPrinter.cpp
+++ b/lib/Analysis/CFGPrinter.cpp
@@ -94,6 +94,9 @@ namespace {
     static char ID; // Pass identifcation, replacement for typeid
     CFGViewer() : FunctionPass((intptr_t)&ID) {}
 
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     virtual bool runOnFunction(Function &F) {
       F.viewCFG();
       return false;
@@ -114,6 +117,9 @@ namespace {
     static char ID; // Pass identifcation, replacement for typeid
     CFGOnlyViewer() : FunctionPass((intptr_t)&ID) {}
 
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     virtual bool runOnFunction(Function &F) {
       CFGOnly = true;
       F.viewCFG();
@@ -137,6 +143,9 @@ namespace {
     CFGPrinter() : FunctionPass((intptr_t)&ID) {}
     explicit CFGPrinter(intptr_t pid) : FunctionPass(pid) {}
 
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     virtual bool runOnFunction(Function &F) {
       std::string Filename = "cfg." + F.getName() + ".dot";
       cerr << "Writing '" << Filename << "'...";
@@ -164,6 +173,10 @@ namespace {
   struct VISIBILITY_HIDDEN CFGOnlyPrinter : public CFGPrinter {
     static char ID; // Pass identification, replacement for typeid
     CFGOnlyPrinter() : CFGPrinter((intptr_t)&ID) {}
+
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     virtual bool runOnFunction(Function &F) {
       bool OldCFGOnly = CFGOnly;
       CFGOnly = true;

diff --git a/lib/Analysis/IPA/Andersens.cpp b/lib/Analysis/IPA/Andersens.cpp
index 5557c0193261ca54363c4c431573dc0a5d46ea18..8650fb1334c97675c60e51d322204300d04e6358 100644 (file)
--- a/lib/Analysis/IPA/Andersens.cpp
+++ b/lib/Analysis/IPA/Andersens.cpp
@@ -432,6 +432,9 @@ namespace {
     static char ID;
     Andersens() : ModulePass((intptr_t)&ID) {}
 
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     bool runOnModule(Module &M) {
       InitializeAliasAnalysis(this);
       IdentifyObjects(M);

diff --git a/lib/Analysis/IPA/GlobalsModRef.cpp b/lib/Analysis/IPA/GlobalsModRef.cpp
index 9aafe375b42eb22fadc6eb41cb8b69e1e814bcda..9f0159edb24631354da7702cba9b8cfec653cabb 100644 (file)
--- a/lib/Analysis/IPA/GlobalsModRef.cpp
+++ b/lib/Analysis/IPA/GlobalsModRef.cpp
@@ -86,6 +86,9 @@ namespace {
     static char ID;
     GlobalsModRef() : ModulePass((intptr_t)&ID) {}
 
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     bool runOnModule(Module &M) {
       InitializeAliasAnalysis(this);                 // set up super class
       AnalyzeGlobals(M);                          // find non-addr taken globals

diff --git a/lib/Analysis/InstCount.cpp b/lib/Analysis/InstCount.cpp
index 78c4a377b03d2bc15bd09a0fb407b41c6790f30e..08a27a66b3287a19cf145a20c879153a91f170fd 100644 (file)
--- a/lib/Analysis/InstCount.cpp
+++ b/lib/Analysis/InstCount.cpp
@@ -51,6 +51,10 @@ namespace {
       abort();
     }
   public:
+
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     static char ID; // Pass identification, replacement for typeid
     InstCount() : FunctionPass((intptr_t)&ID) {}
 

diff --git a/lib/Analysis/LoadValueNumbering.cpp b/lib/Analysis/LoadValueNumbering.cpp
index 0a2f36be47f06c79fe6d9dcc657be39ddb0b1d0e..6dd55a4a35fba1d48ff087991ced8e80283ed3be 100644 (file)
--- a/lib/Analysis/LoadValueNumbering.cpp
+++ b/lib/Analysis/LoadValueNumbering.cpp
@@ -43,6 +43,9 @@ namespace {
     static char ID; // Class identification, replacement for typeinfo
     LoadVN() : FunctionPass((intptr_t)&ID) {}
 
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     /// Pass Implementation stuff.  This doesn't do any analysis.
     ///
     bool runOnFunction(Function &) { return false; }

diff --git a/lib/Analysis/ProfileInfoLoaderPass.cpp b/lib/Analysis/ProfileInfoLoaderPass.cpp
index 9df1e9182e9718576714359c10e1e64b55139fb2..e18625f8e76514ee814b2299ecdec06363f44dd0 100644 (file)
--- a/lib/Analysis/ProfileInfoLoaderPass.cpp
+++ b/lib/Analysis/ProfileInfoLoaderPass.cpp
@@ -46,6 +46,9 @@ namespace {
       return "Profiling information loader";
     }
 
+    /// isAnalysis - Return true if this pass is  implementing an analysis pass.
+    virtual bool isAnalysis() const { return true; }
+
     /// run - Load the profile information from the specified file.
     virtual bool runOnModule(Module &M);
   };

diff --git a/lib/VMCore/PassManager.cpp b/lib/VMCore/PassManager.cpp
index e7d7c5bc7288d171602b34d0ee7925ec400811fe..b0afaef1317233f47c801a91865cb125b93bd0d3 100644 (file)
--- a/lib/VMCore/PassManager.cpp
+++ b/lib/VMCore/PassManager.cpp
@@ -426,6 +426,12 @@ void PMTopLevelManager::schedulePass(Pass *P) {
   // Give pass a chance to prepare the stage.
   P->preparePassManager(activeStack);
 
+  // If P is an analysis pass and it is available then do not
+  // generate the analysis again. Stale analysis info should not be
+  // available at this point.
+  if (P->isAnalysis() && findAnalysisPass(P->getPassInfo()))
+      return;
+
   AnalysisUsage AnUsage;
   P->getAnalysisUsage(AnUsage);
   const std::vector<AnalysisID> &RequiredSet = AnUsage.getRequiredSet();