2 files changed, 17 insertions, 3 deletions

diff --git a/llvm/include/llvm/PassManager.h b/llvm/include/llvm/PassManager.h
index 6d462026e3a..294b8453015 100644
--- a/llvm/include/llvm/PassManager.h
+++ b/llvm/include/llvm/PassManager.h
@@ -29,8 +29,22 @@ class ModuleProvider;
 class PassManagerImpl;
 class FunctionPassManagerImpl;
 
+/// PassManagerBase - An abstract interface to allow code to add passes to
+/// a pass manager without having to hard-code what kind of pass manager
+/// it is.
+class PassManagerBase {
+public:
+  virtual ~PassManagerBase();
+
+  /// add - Add a pass to the queue of passes to run.  This passes ownership of
+  /// the Pass to the PassManager.  When the PassManager is destroyed, the pass
+  /// will be destroyed as well, so there is no need to delete the pass.  This
+  /// implies that all passes MUST be allocated with 'new'.
+  virtual void add(Pass *P) = 0;
+};
+
 /// PassManager manages ModulePassManagers
-class PassManager {
+class PassManager : public PassManagerBase {
 public:
 
   PassManager();
@@ -54,7 +68,7 @@ private:
 };
 
 /// FunctionPassManager manages FunctionPasses and BasicBlockPassManagers.
-class FunctionPassManager {
+class FunctionPassManager : public PassManagerBase {
 public:
   /// FunctionPassManager ctor - This initializes the pass manager.  It needs,
   /// but does not take ownership of, the specified module provider.
diff --git a/llvm/lib/VMCore/PassManager.cpp b/llvm/lib/VMCore/PassManager.cpp
index 16966452e1b..bef1171bd0e 100644
--- a/llvm/lib/VMCore/PassManager.cpp
+++ b/llvm/lib/VMCore/PassManager.cpp
@@ -1531,4 +1531,4 @@ void BasicBlockPass::assignPassManager(PMStack &PMS,
   BBP->add(this);
 }
 
-
+PassManagerBase::~PassManagerBase() {}