Start removing the use of an ad-hoc 'never inline' set and instead

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

diff --git a/include/llvm/DefaultPasses.h b/include/llvm/DefaultPasses.h
index 8a87bc54144d52853ea9c05e5ad6a5ef4f17520c..929569d543d9aab4e288e3350356d623c08c20d0 100644 (file)
--- a/include/llvm/DefaultPasses.h
+++ b/include/llvm/DefaultPasses.h
@@ -14,6 +14,8 @@
 #ifndef LLVM_DEFAULT_PASS_SUPPORT_H
 #define LLVM_DEFAULT_PASS_SUPPORT_H
 
+#include <llvm/PassSupport.h>
+
 namespace llvm {
 
 class PassManagerBase;
@@ -29,7 +31,6 @@ extern unsigned char ConstantMergeID;
 extern unsigned char CorrelatedValuePropagationID;
 extern unsigned char DeadArgEliminationID;
 extern unsigned char DeadStoreEliminationID;
-extern unsigned char DeadTypeEliminationID;
 extern unsigned char EarlyCSEID;
 extern unsigned char FunctionAttrsID;
 extern unsigned char FunctionInliningID;
@@ -106,10 +107,12 @@ class StandardPass {
   };
   /// Returns the optimisation level from a set of flags.
   static unsigned OptimizationLevel(unsigned flags) {
-      return flags & OptimizationLevelMask ; };
+      return flags & OptimizationLevelMask;
+  }
   /// Returns the maximum optimization level for this set of flags
   static unsigned MaxOptimizationLevel(unsigned flags) {
-      return (flags & MaxOptimizationLevelMask) >> 4; };
+      return (flags & MaxOptimizationLevelMask) >> 4;
+  }
   /// Constructs a set of flags from the specified minimum and maximum
   /// optimisation level
   static unsigned OptimzationFlags(unsigned minLevel=0, unsigned maxLevel=0xf,
@@ -117,13 +120,16 @@ class StandardPass {
     return ((minLevel & OptimizationLevelMask) |
             ((maxLevel<<MaxOptimizationLevelShift) & MaxOptimizationLevelMask)
             | ((requiredFlags<<RequiredFlagShift) & RequiredFlagMask)
-            | ((disallowedFlags<<DisallowedFlagShift) & DisallowedFlagMask)); }
+            | ((disallowedFlags<<DisallowedFlagShift) & DisallowedFlagMask));
+  }
   /// Returns the flags that must be set for this to match
   static unsigned RequiredFlags(unsigned flags) {
-      return (flags & RequiredFlagMask) >> RequiredFlagShift; };
+      return (flags & RequiredFlagMask) >> RequiredFlagShift;
+  }
   /// Returns the flags that must not be set for this to match
   static unsigned DisallowedFlags(unsigned flags) {
-      return (flags & DisallowedFlagMask) >> DisallowedFlagShift; };
+      return (flags & DisallowedFlagMask) >> DisallowedFlagShift;
+  }
   /// Register a standard pass in the specified set.  If flags is non-zero,
   /// then the pass will only be returned when the specified flags are set.
   template<typename passName>
@@ -134,7 +140,7 @@ class StandardPass {
       // Use the pass's ID if one is not specified
       RegisterDefaultPass(PassInfo::NormalCtor_t(callDefaultCtor<passName>),
                ID ? ID : (unsigned char*)&passName::ID, runBefore, set, flags);
-    };
+    }
   };
   /// Adds the passes from the specified set to the provided pass manager
   static void AddPassesFromSet(PassManagerBase *PM,