Add #ifdef switch toggle between old and new pass manager. However,
continue to use old pass manager at the moment. To use new manager
remove #define USE_OLD_PASSMANAGER 1 from Pass.h
llvm-svn: 32525
diff --git a/llvm/lib/VMCore/Pass.cpp b/llvm/lib/VMCore/Pass.cpp
index 9283d40..8c5a2f7 100644
--- a/llvm/lib/VMCore/Pass.cpp
+++ b/llvm/lib/VMCore/Pass.cpp
@@ -14,7 +14,9 @@
//===----------------------------------------------------------------------===//
#include "llvm/PassManager.h"
+#ifdef USE_OLD_PASSMANAGER
#include "PassManagerT.h" // PassManagerT implementation
+#endif
#include "llvm/Module.h"
#include "llvm/ModuleProvider.h"
#include "llvm/ADT/STLExtras.h"
@@ -34,6 +36,7 @@
P->Resolver = AR;
}
+#ifdef USE_OLD_PASSMANAGER
//===----------------------------------------------------------------------===//
// PassManager implementation - The PassManager class is a simple Pimpl class
// that wraps the PassManagerT template.
@@ -158,17 +161,24 @@
cerr << "\n";
}
}
+#endif
//===----------------------------------------------------------------------===//
// Pass Implementation
//
+#ifdef USE_OLD_PASSMANAGER
void ModulePass::addToPassManager(ModulePassManager *PM, AnalysisUsage &AU) {
PM->addPass(this, AU);
}
+#endif
bool Pass::mustPreserveAnalysisID(const PassInfo *AnalysisID) const {
+#ifdef USE_OLD_PASSMANAGER
return Resolver->getAnalysisToUpdate(AnalysisID) != 0;
+#else
+ return Resolver_New->getAnalysisToUpdate(AnalysisID, true) != 0;
+#endif
}
// dumpPassStructure - Implement the -debug-passes=Structure option
@@ -200,11 +210,12 @@
//===----------------------------------------------------------------------===//
// ImmutablePass Implementation
//
+#ifdef USE_OLD_PASSMANAGER
void ImmutablePass::addToPassManager(ModulePassManager *PM,
AnalysisUsage &AU) {
PM->addPass(this, AU);
}
-
+#endif
//===----------------------------------------------------------------------===//
// FunctionPass Implementation
@@ -233,6 +244,7 @@
return Changed | doFinalization(*F.getParent());
}
+#ifdef USE_OLD_PASSMANAGER
void FunctionPass::addToPassManager(ModulePassManager *PM,
AnalysisUsage &AU) {
PM->addPass(this, AU);
@@ -242,6 +254,7 @@
AnalysisUsage &AU) {
PM->addPass(this, AU);
}
+#endif
//===----------------------------------------------------------------------===//
// BasicBlockPass Implementation
@@ -271,6 +284,7 @@
return Changed;
}
+#ifdef USE_OLD_PASSMANAGER
void BasicBlockPass::addToPassManager(FunctionPassManagerT *PM,
AnalysisUsage &AU) {
PM->addPass(this, AU);
@@ -280,7 +294,7 @@
AnalysisUsage &AU) {
PM->addPass(this, AU);
}
-
+#endif
//===----------------------------------------------------------------------===//
// Pass Registration mechanism