1 files changed, 44 insertions, 85 deletions

diff --git a/llvm/lib/IR/PassManager.cpp b/llvm/lib/IR/PassManager.cpp
index 966af7de..b53a2b9 100644
--- a/llvm/lib/IR/PassManager.cpp
+++ b/llvm/lib/IR/PassManager.cpp
@@ -12,27 +12,14 @@
 
 using namespace llvm;
 
-void ModulePassManager::run() {
+void ModulePassManager::run(Module *M) {
   for (unsigned Idx = 0, Size = Passes.size(); Idx != Size; ++Idx)
     if (Passes[Idx]->run(M))
-      if (AM) AM->invalidateAll(M);
+      if (AM)
+        AM->invalidateAll(M);
 }
 
-bool FunctionPassManager::run(Module *M) {
-  bool Changed = false;
-  for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
-    for (unsigned Idx = 0, Size = Passes.size(); Idx != Size; ++Idx)
-      if (Passes[Idx]->run(I)) {
-        Changed = true;
-        if (AM) AM->invalidateAll(I);
-      }
-  return Changed;
-}
-
-void AnalysisManager::invalidateAll(Function *F) {
-  assert(F->getParent() == M && "Invalidating a function from another module!");
-
-  // First invalidate any module results we still have laying about.
+void ModuleAnalysisManager::invalidateAll(Module *M) {
   // FIXME: This is a total hack based on the fact that erasure doesn't
   // invalidate iteration for DenseMap.
   for (ModuleAnalysisResultMapT::iterator I = ModuleAnalysisResults.begin(),
@@ -40,67 +27,14 @@ void AnalysisManager::invalidateAll(Function *F) {
        I != E; ++I)
     if (I->second->invalidate(M))
       ModuleAnalysisResults.erase(I);
-
-  // Now clear all the invalidated results associated specifically with this
-  // function.
-  SmallVector<void *, 8> InvalidatedPassIDs;
-  FunctionAnalysisResultListT &ResultsList = FunctionAnalysisResultLists[F];
-  for (FunctionAnalysisResultListT::iterator I = ResultsList.begin(),
-                                             E = ResultsList.end();
-       I != E;)
-    if (I->second->invalidate(F)) {
-      InvalidatedPassIDs.push_back(I->first);
-      I = ResultsList.erase(I);
-    } else {
-      ++I;
-    }
-  while (!InvalidatedPassIDs.empty())
-    FunctionAnalysisResults.erase(
-        std::make_pair(InvalidatedPassIDs.pop_back_val(), F));
 }
 
-void AnalysisManager::invalidateAll(Module *M) {
-  // First invalidate any module results we still have laying about.
-  // FIXME: This is a total hack based on the fact that erasure doesn't
-  // invalidate iteration for DenseMap.
-  for (ModuleAnalysisResultMapT::iterator I = ModuleAnalysisResults.begin(),
-                                          E = ModuleAnalysisResults.end();
-       I != E; ++I)
-    if (I->second->invalidate(M))
-      ModuleAnalysisResults.erase(I);
-
-  // Now walk all of the functions for which there are cached results, and
-  // attempt to invalidate each of those as the entire module may have changed.
-  // FIXME: How do we handle functions which have been deleted or RAUWed?
-  SmallVector<void *, 8> InvalidatedPassIDs;
-  for (FunctionAnalysisResultListMapT::iterator
-           FI = FunctionAnalysisResultLists.begin(),
-           FE = FunctionAnalysisResultLists.end();
-       FI != FE; ++FI) {
-    Function *F = FI->first;
-    FunctionAnalysisResultListT &ResultsList = FI->second;
-    for (FunctionAnalysisResultListT::iterator I = ResultsList.begin(),
-                                               E = ResultsList.end();
-         I != E;)
-      if (I->second->invalidate(F)) {
-        InvalidatedPassIDs.push_back(I->first);
-        I = ResultsList.erase(I);
-      } else {
-        ++I;
-      }
-    while (!InvalidatedPassIDs.empty())
-      FunctionAnalysisResults.erase(
-          std::make_pair(InvalidatedPassIDs.pop_back_val(), F));
-  }
-}
-
-const AnalysisManager::AnalysisResultConcept<Module> &
-AnalysisManager::getResultImpl(void *PassID, Module *M) {
-  assert(M == this->M && "Wrong module used when querying the AnalysisManager");
+const detail::AnalysisResultConcept<Module> &
+ModuleAnalysisManager::getResultImpl(void *PassID, Module *M) {
   ModuleAnalysisResultMapT::iterator RI;
   bool Inserted;
   llvm::tie(RI, Inserted) = ModuleAnalysisResults.insert(std::make_pair(
-      PassID, polymorphic_ptr<AnalysisResultConcept<Module> >()));
+      PassID, polymorphic_ptr<detail::AnalysisResultConcept<Module> >()));
 
   if (Inserted) {
     // We don't have a cached result for this result. Look up the pass and run
@@ -115,10 +49,43 @@ AnalysisManager::getResultImpl(void *PassID, Module *M) {
   return *RI->second;
 }
 
-const AnalysisManager::AnalysisResultConcept<Function> &
-AnalysisManager::getResultImpl(void *PassID, Function *F) {
-  assert(F->getParent() == M && "Analyzing a function from another module!");
+void ModuleAnalysisManager::invalidateImpl(void *PassID, Module *M) {
+  ModuleAnalysisResults.erase(PassID);
+}
+
+bool FunctionPassManager::run(Module *M) {
+  bool Changed = false;
+  for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I)
+    for (unsigned Idx = 0, Size = Passes.size(); Idx != Size; ++Idx)
+      if (Passes[Idx]->run(I)) {
+        Changed = true;
+        if (AM)
+          AM->invalidateAll(I);
+      }
+  return Changed;
+}
+
+void FunctionAnalysisManager::invalidateAll(Function *F) {
+  // Clear all the invalidated results associated specifically with this
+  // function.
+  SmallVector<void *, 8> InvalidatedPassIDs;
+  FunctionAnalysisResultListT &ResultsList = FunctionAnalysisResultLists[F];
+  for (FunctionAnalysisResultListT::iterator I = ResultsList.begin(),
+                                             E = ResultsList.end();
+       I != E;)
+    if (I->second->invalidate(F)) {
+      InvalidatedPassIDs.push_back(I->first);
+      I = ResultsList.erase(I);
+    } else {
+      ++I;
+    }
+  while (!InvalidatedPassIDs.empty())
+    FunctionAnalysisResults.erase(
+        std::make_pair(InvalidatedPassIDs.pop_back_val(), F));
+}
 
+const detail::AnalysisResultConcept<Function> &
+FunctionAnalysisManager::getResultImpl(void *PassID, Function *F) {
   FunctionAnalysisResultMapT::iterator RI;
   bool Inserted;
   llvm::tie(RI, Inserted) = FunctionAnalysisResults.insert(std::make_pair(
@@ -139,15 +106,7 @@ AnalysisManager::getResultImpl(void *PassID, Function *F) {
   return *RI->second->second;
 }
 
-void AnalysisManager::invalidateImpl(void *PassID, Module *M) {
-  assert(M == this->M && "Invalidating a pass over a different module!");
-  ModuleAnalysisResults.erase(PassID);
-}
-
-void AnalysisManager::invalidateImpl(void *PassID, Function *F) {
-  assert(F->getParent() == M &&
-         "Invalidating a pass over a function from another module!");
-
+void FunctionAnalysisManager::invalidateImpl(void *PassID, Function *F) {
   FunctionAnalysisResultMapT::iterator RI =
       FunctionAnalysisResults.find(std::make_pair(PassID, F));
   if (RI == FunctionAnalysisResults.end())