Rename loop preheaders pass to loop simplify

[oota-llvm.git] / include / llvm / PassSupport.h

diff --git a/include/llvm/PassSupport.h b/include/llvm/PassSupport.h
index 62fdf265eb08f22975f3495256e7a78396fc9ae0..71bbbbd5226fc760675e1731f7347000ba1a1329 100644 (file)
--- a/include/llvm/PassSupport.h
+++ b/include/llvm/PassSupport.h
@@ -16,7 +16,6 @@
 
 // No need to include Pass.h, we are being included by it!
 
-class TargetData;
 class TargetMachine;
 
 //===---------------------------------------------------------------------------
@@ -33,7 +32,6 @@ class PassInfo {
   std::vector<const PassInfo*> ItfImpl;// Interfaces implemented by this pass
 
   Pass *(*NormalCtor)();               // No argument ctor
-  Pass *(*DataCtor)(const TargetData&);// Ctor taking const TargetData object...
   Pass *(*TargetCtor)(TargetMachine&);   // Ctor taking TargetMachine object...
 
 public:
@@ -50,10 +48,9 @@ public:
   /// through RegisterPass.
   PassInfo(const char *name, const char *arg, const std::type_info &ti, 
            unsigned pt, Pass *(*normal)() = 0,
-           Pass *(*datactor)(const TargetData &) = 0,
            Pass *(*targetctor)(TargetMachine &) = 0)
     : PassName(name), PassArgument(arg), TypeInfo(ti), PassType(pt),
-      NormalCtor(normal), DataCtor(datactor), TargetCtor(targetctor)  {
+      NormalCtor(normal), TargetCtor(targetctor)  {
   }
 
   /// getPassName - Return the friendly name for the pass, never returns null
@@ -97,14 +94,6 @@ public:
     return NormalCtor();
   }
 
-  /// getDataCtor - Return a pointer to a function that creates an instance of
-  /// the pass and returns it.  This returns a constructor for a version of the
-  /// pass that takes a TargetData object as a parameter.
-  ///
-  Pass *(*getDataCtor() const)(const TargetData &) {
-    return DataCtor;
-  }
-
   /// getTargetCtor - Return a pointer to a function that creates an instance of
   /// the pass and returns it.  This returns a constructor for a version of the
   /// pass that takes a TargetMachine object as a parameter.
@@ -163,10 +152,10 @@ protected:
   void registerPass(PassInfo *);
   void unregisterPass(PassInfo *);
 
-  /// setPreservesCFG - Notice that this pass only depends on the CFG, so
+  /// setOnlyUsesCFG - Notice that this pass only depends on the CFG, so
   /// transformations that do not modify the CFG do not invalidate this pass.
   ///
-  void setPreservesCFG();
+  void setOnlyUsesCFG();
 };
 
 template<typename PassName>
@@ -187,18 +176,11 @@ struct RegisterPass : public RegisterPassBase {
     registerPass(new PassInfo(Name, PassArg, typeid(PassName), PassTy, ctor));
   }
 
-  // Register Pass using TargetData constructor...
-  RegisterPass(const char *PassArg, const char *Name, unsigned PassTy,
-               Pass *(*datactor)(const TargetData &)) {
-    registerPass(new PassInfo(Name, PassArg, typeid(PassName), PassTy,
-                              0, datactor));
-  }
-
   // Register Pass using TargetMachine constructor...
   RegisterPass(const char *PassArg, const char *Name, unsigned PassTy,
                Pass *(*targetctor)(TargetMachine &)) {
     registerPass(new PassInfo(Name, PassArg, typeid(PassName), PassTy,
-                              0, 0, targetctor));
+                              0, targetctor));
   }
 
   // Generic constructor version that has an unknown ctor type...
@@ -214,33 +196,29 @@ struct RegisterPass : public RegisterPassBase {
 ///
 template<typename PassName>
 struct RegisterOpt : public RegisterPassBase {
-  RegisterOpt(const char *PassArg, const char *Name) {
+  RegisterOpt(const char *PassArg, const char *Name, bool CFGOnly = false) {
     registerPass(new PassInfo(Name, PassArg, typeid(PassName),
                               PassInfo::Optimization,
                               callDefaultCtor<PassName>));
+    if (CFGOnly) setOnlyUsesCFG();
   }
 
   /// Register Pass using default constructor explicitly...
   ///
-  RegisterOpt(const char *PassArg, const char *Name, Pass *(*ctor)()) {
+  RegisterOpt(const char *PassArg, const char *Name, Pass *(*ctor)(),
+              bool CFGOnly = false) {
     registerPass(new PassInfo(Name, PassArg, typeid(PassName),
                               PassInfo::Optimization, ctor));
-  }
-
-  /// Register Pass using TargetData constructor...
-  ///
-  RegisterOpt(const char *PassArg, const char *Name,
-               Pass *(*datactor)(const TargetData &)) {
-    registerPass(new PassInfo(Name, PassArg, typeid(PassName),
-                              PassInfo::Optimization, 0, datactor));
+    if (CFGOnly) setOnlyUsesCFG();
   }
 
   /// Register Pass using TargetMachine constructor...
   ///
   RegisterOpt(const char *PassArg, const char *Name,
-               Pass *(*targetctor)(TargetMachine &)) {
+               Pass *(*targetctor)(TargetMachine &), bool CFGOnly = false) {
     registerPass(new PassInfo(Name, PassArg, typeid(PassName),
-                              PassInfo::Optimization, 0, 0, targetctor));
+                              PassInfo::Optimization, 0, targetctor));
+    if (CFGOnly) setOnlyUsesCFG();
   }
 };
 
@@ -257,8 +235,7 @@ struct RegisterAnalysis : public RegisterPassBase {
     registerPass(new PassInfo(Name, PassArg, typeid(PassName),
                               PassInfo::Analysis,
                               callDefaultCtor<PassName>));
-    if (CFGOnly)
-      setPreservesCFG();
+    if (CFGOnly) setOnlyUsesCFG();
   }
 };
 
@@ -280,14 +257,6 @@ struct RegisterLLC : public RegisterPassBase {
                               PassInfo::LLC, ctor));
   }
 
-  /// Register Pass using TargetData constructor...
-  ///
-  RegisterLLC(const char *PassArg, const char *Name,
-               Pass *(*datactor)(const TargetData &)) {
-    registerPass(new PassInfo(Name, PassArg, typeid(PassName),
-                              PassInfo::LLC, 0, datactor));
-  }
-
   /// Register Pass using TargetMachine constructor...
   ///
   RegisterLLC(const char *PassArg, const char *Name,