X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FPassManager.h;h=a6703fd5867a88457d4a91b8dc67e22ec6126903;hb=fb2bbbe78674a34e5ec2ec6f8c566ac5cbb26154;hp=21ef01698f41eff4a813a3846f8eb1c726be4bf7;hpb=5f4ddf517f29cfc91c327c33f6d3c0f157bc5bb5;p=oota-llvm.git

diff --git a/include/llvm/PassManager.h b/include/llvm/PassManager.h
index 21ef01698f4..a6703fd5867 100644
--- a/include/llvm/PassManager.h
+++ b/include/llvm/PassManager.h
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -26,79 +26,25 @@ class ModulePass;
 class Module;
 class ModuleProvider;
 
-#ifdef USE_OLD_PASSMANAGER
-
-class ModulePassManager;
-class FunctionPassManagerT;
-class BasicBlockPassManager;
+class PassManagerImpl;
+class FunctionPassManagerImpl;
 
-class PassManager {
-  ModulePassManager *PM;    // This is a straightforward Pimpl class
+/// 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:
-  PassManager();
-  ~PassManager();
+  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'.
-  ///
-  void add(Pass *P);
-
-  /// run - Execute all of the passes scheduled for execution.  Keep track of
-  /// whether any of the passes modifies the module, and if so, return true.
-  ///
-  bool run(Module &M);
+  virtual void add(Pass *P) = 0;
 };
 
-class FunctionPass;
-class ImmutablePass;
-class Function;
-
-class FunctionPassManager {
-  FunctionPassManagerT *PM;    // This is a straightforward Pimpl class
-  ModuleProvider *MP;
-public:
-  FunctionPassManager(ModuleProvider *P);
-  ~FunctionPassManager();
-
-  /// add - Add a pass to the queue of passes to run.  This passes
-  /// ownership of the FunctionPass 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'.
-  ///
-  void add(FunctionPass *P);
-
-  /// add - ImmutablePasses are not FunctionPasses, so we have a
-  /// special hack to get them into a FunctionPassManager.
-  ///
-  void add(ImmutablePass *IP);
-
-  /// doInitialization - Run all of the initializers for the function passes.
-  ///
-  bool doInitialization();
-  
-  /// run - Execute all of the passes scheduled for execution.  Keep
-  /// track of whether any of the passes modifies the function, and if
-  /// so, return true.
-  ///
-  bool run(Function &F);
-  
-  /// doFinalization - Run all of the initializers for the function passes.
-  ///
-  bool doFinalization();
-};
-
-#else
-
-class ModulePassManager;
-class PassManagerImpl;
-class FunctionPassManagerImpl;
-
 /// PassManager manages ModulePassManagers
-class PassManager {
-
+class PassManager : public PassManagerBase {
 public:
 
   PassManager();
@@ -119,14 +65,14 @@ private:
   /// PassManagerImpl_New is the actual class. PassManager is just the 
   /// wraper to publish simple pass manager interface
   PassManagerImpl *PM;
-
 };
 
 /// FunctionPassManager manages FunctionPasses and BasicBlockPassManagers.
-class FunctionPassManager {
+class FunctionPassManager : public PassManagerBase {
 public:
-  FunctionPassManager(ModuleProvider *P);
-  FunctionPassManager();
+  /// FunctionPassManager ctor - This initializes the pass manager.  It needs,
+  /// but does not take ownership of, the specified module provider.
+  explicit FunctionPassManager(ModuleProvider *P);
   ~FunctionPassManager();
  
   /// add - Add a pass to the queue of passes to run.  This passes
@@ -146,17 +92,21 @@ public:
   ///
   bool doInitialization();
   
-  /// doFinalization - Run all of the initializers for the function passes.
+  /// doFinalization - Run all of the finalizers for the function passes.
   ///
   bool doFinalization();
-private:
   
+  /// getModuleProvider - Return the module provider that this passmanager is
+  /// currently using.  This is the module provider that it uses when a function
+  /// is optimized that is non-resident in the module.
+  ModuleProvider *getModuleProvider() const { return MP; }
+  void setModuleProvider(ModuleProvider *NewMP) { MP = NewMP; }
+
+private:
   FunctionPassManagerImpl *FPM;
   ModuleProvider *MP;
 };
 
-#endif
-
 } // End llvm namespace
 
 #endif