Revert r167759. Ben is right this isn't likely to help much.

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

diff --git a/include/llvm/PassManagers.h b/include/llvm/PassManagers.h
index 3acbf0e2c07484ec7c0b25ae64cfa1b085204be7..0af58533805ee278a5bfbc3cf93606dd65d183c1 100644 (file)
--- a/include/llvm/PassManagers.h
+++ b/include/llvm/PassManagers.h
@@ -263,7 +263,7 @@ private:
 class PMDataManager {
 public:
 
-  explicit PMDataManager() : TPM(NULL), PassVectorSize(0), Depth(0) {
+  explicit PMDataManager() : TPM(NULL), Depth(0) {
     initializeAnalysisInfo();
   }
 
@@ -344,7 +344,7 @@ public:
   void dumpPreservedSet(const Pass *P) const;
 
   virtual unsigned getNumContainedPasses() const {
-    return PassVectorSize;
+    return (unsigned)PassVector.size();
   }
 
   virtual PassManagerType getPassManagerType() const {
@@ -369,16 +369,14 @@ protected:
   // Top level manager.
   PMTopLevelManager *TPM;
 
+  // Collection of pass that are managed by this manager
+  SmallVector<Pass *, 16> PassVector;
+
   // Collection of Analysis provided by Parent pass manager and
   // used by current pass manager. At at time there can not be more
   // then PMT_Last active pass mangers.
   std::map<AnalysisID, Pass *> *InheritedAnalysis[PMT_Last];
 
-  // Collection of pass that are managed by this manager
-  SmallVector<Pass *, 16> PassVector;
-
-  // Cache the size of PassVector
-  unsigned PassVectorSize;
 
   /// isPassDebuggingExecutionsOrMore - Return true if -debug-pass=Executions
   /// or higher is specified.
@@ -446,7 +444,7 @@ public:
   }
 
   FunctionPass *getContainedPass(unsigned N) {
-    assert ( N < PassVectorSize && "Pass number out of range!");
+    assert ( N < PassVector.size() && "Pass number out of range!");
     FunctionPass *FP = static_cast<FunctionPass *>(PassVector[N]);
     return FP;
   }

diff --git a/lib/VMCore/PassManager.cpp b/lib/VMCore/PassManager.cpp
index 5c209e24d81951655cf327d44a46730f36256de0..53f11499e4b975ded1f1cd243083d8cf9e3bd429 100644 (file)
--- a/lib/VMCore/PassManager.cpp
+++ b/lib/VMCore/PassManager.cpp
@@ -195,7 +195,7 @@ public:
   }
 
   BasicBlockPass *getContainedPass(unsigned N) {
-    assert(N < PassVectorSize && "Pass number out of range!");
+    assert(N < PassVector.size() && "Pass number out of range!");
     BasicBlockPass *BP = static_cast<BasicBlockPass *>(PassVector[N]);
     return BP;
   }
@@ -346,7 +346,7 @@ public:
   }
 
   ModulePass *getContainedPass(unsigned N) {
-    assert(N < PassVectorSize && "Pass number out of range!");
+    assert(N < PassVector.size() && "Pass number out of range!");
     return static_cast<ModulePass *>(PassVector[N]);
   }
 
@@ -963,7 +963,6 @@ void PMDataManager::add(Pass *P, bool ProcessAnalysis) {
   if (!ProcessAnalysis) {
     // Add pass
     PassVector.push_back(P);
-    ++PassVectorSize;
     return;
   }
 
@@ -1025,7 +1024,6 @@ void PMDataManager::add(Pass *P, bool ProcessAnalysis) {
 
   // Add pass
   PassVector.push_back(P);
-  ++PassVectorSize;
 }