X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FPassManager.h;h=254cac94d10ea12e7bdbbf9bfcc59400f8df6693;hb=a727d5502c8e23c090da658bf14c5ebc1169a070;hp=2769a4dbf2a4bb66355f4da4b590330b5a11d0ec;hpb=55fd43f90913676682487f89f27c756adb827f66;p=oota-llvm.git

diff --git a/include/llvm/PassManager.h b/include/llvm/PassManager.h
index 2769a4dbf2a..254cac94d10 100644
--- a/include/llvm/PassManager.h
+++ b/include/llvm/PassManager.h
@@ -18,7 +18,6 @@
 #define LLVM_PASSMANAGER_H
 
 #include "llvm/Pass.h"
-#include <vector>
 
 namespace llvm {
 
@@ -26,13 +25,16 @@ class Pass;
 class ModulePass;
 class Module;
 class ModuleProvider;
+
 class ModulePassManager;
-class FunctionPassManagerT;
-class BasicBlockPassManager;
+class PassManagerImpl;
+class FunctionPassManagerImpl;
 
+/// PassManager manages ModulePassManagers
 class PassManager {
-  ModulePassManager *PM;    // This is a straightforward Pimpl class
+
 public:
+
   PassManager();
   ~PassManager();
 
@@ -40,72 +42,51 @@ public:
   /// 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);
-};
 
-class FunctionPass;
-class ImmutablePass;
-class Function;
+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 {
-  FunctionPassManagerT *PM;    // This is a straightforward Pimpl class
-  ModuleProvider *MP;
 public:
-  FunctionPassManager(ModuleProvider *P);
+  explicit FunctionPassManager(ModuleProvider *P);
+  FunctionPassManager();
   ~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);
+  /// ownership of the Pass to the PassManager.  When the
+  /// PassManager_X is destroyed, the pass will be destroyed as well, so
+  /// there is no need to delete the pass. (TODO delete passes.)
+  /// This implies that all passes MUST be allocated with 'new'.
+  void add(Pass *P);
 
-  /// 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);
   
+  /// doInitialization - Run all of the initializers for the function passes.
+  ///
+  bool doInitialization();
+  
   /// doFinalization - Run all of the initializers for the function passes.
   ///
   bool doFinalization();
-};
-
-/// BasicBlockpassManager_New manages BasicBlockPass. It batches all the
-/// pass together and sequence them to process one basic block before
-/// processing next basic block.
-class BasicBlockPassManager_New: public Pass {
-
-public:
-  BasicBlockPassManager_New() { }
-
-  /// Add a pass into a passmanager queue. 
-  bool addPass(Pass *p);
-  
-  /// 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 runOnFunction(Function &F);
-
 private:
-  // Collection of pass that are not yet scheduled
-  std::vector<Pass *> PassVector;
+  
+  FunctionPassManagerImpl *FPM;
+  ModuleProvider *MP;
 };
 
 } // End llvm namespace