[llvm-commits] CVS: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp LCSSA.cpp LoopSimplify.cpp LowerAllocations.cpp LowerInvoke.cpp LowerSelect.cpp LowerSwitch.cpp Mem2Reg.cpp UnifyFunctionExitNodes.

2007-05-02 Thread Devang Patel


Changes in directory llvm/lib/Transforms/Utils:

BreakCriticalEdges.cpp updated: 1.46 -> 1.47
LCSSA.cpp updated: 1.40 -> 1.41
LoopSimplify.cpp updated: 1.94 -> 1.95
LowerAllocations.cpp updated: 1.75 -> 1.76
LowerInvoke.cpp updated: 1.61 -> 1.62
LowerSelect.cpp updated: 1.14 -> 1.15
LowerSwitch.cpp updated: 1.40 -> 1.41
Mem2Reg.cpp updated: 1.28 -> 1.29
UnifyFunctionExitNodes.cpp updated: 1.38 -> 1.39
---
Log message:

Drop 'const'


---
Diffs of the changes:  (+17 -17)

 BreakCriticalEdges.cpp |4 ++--
 LCSSA.cpp  |4 ++--
 LoopSimplify.cpp   |4 ++--
 LowerAllocations.cpp   |4 ++--
 LowerInvoke.cpp|4 ++--
 LowerSelect.cpp|4 ++--
 LowerSwitch.cpp|4 ++--
 Mem2Reg.cpp|4 ++--
 UnifyFunctionExitNodes.cpp |2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)


Index: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
diff -u llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.46 
llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.47
--- llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.46   Wed May  2 
16:39:19 2007
+++ llvm/lib/Transforms/Utils/BreakCriticalEdges.cppWed May  2 20:11:54 2007
@@ -34,7 +34,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN BreakCriticalEdges : public FunctionPass {
-static const char ID; // Pass identifcation, replacement for typeid
+static char ID; // Pass identifcation, replacement for typeid
 BreakCriticalEdges() : FunctionPass((intptr_t)&ID) {}
 
 virtual bool runOnFunction(Function &F);
@@ -50,7 +50,7 @@
 }
   };
 
-  const char BreakCriticalEdges::ID = 0;
+  char BreakCriticalEdges::ID = 0;
   RegisterPass X("break-crit-edges",
 "Break critical edges in CFG");
 }


Index: llvm/lib/Transforms/Utils/LCSSA.cpp
diff -u llvm/lib/Transforms/Utils/LCSSA.cpp:1.40 
llvm/lib/Transforms/Utils/LCSSA.cpp:1.41
--- llvm/lib/Transforms/Utils/LCSSA.cpp:1.40Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Utils/LCSSA.cpp Wed May  2 20:11:54 2007
@@ -47,7 +47,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN LCSSA : public FunctionPass {
-static const char ID; // Pass identifcation, replacement for typeid
+static char ID; // Pass identifcation, replacement for typeid
 LCSSA() : FunctionPass((intptr_t)&ID) {}
 
 // Cached analysis information for the current function.
@@ -84,7 +84,7 @@
 }
   };
   
-  const char LCSSA::ID = 0;
+  char LCSSA::ID = 0;
   RegisterPass X("lcssa", "Loop-Closed SSA Form Pass");
 }
 


Index: llvm/lib/Transforms/Utils/LoopSimplify.cpp
diff -u llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.94 
llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.95
--- llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.94 Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Utils/LoopSimplify.cpp  Wed May  2 20:11:54 2007
@@ -54,7 +54,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN LoopSimplify : public FunctionPass {
-static const char ID; // Pass identifcation, replacement for typeid
+static char ID; // Pass identifcation, replacement for typeid
 LoopSimplify() : FunctionPass((intptr_t)&ID) {}
 
 // AA - If we have an alias analysis object to update, this is it, 
otherwise
@@ -92,7 +92,7 @@
  std::vector &PredBlocks);
   };
 
-  const char LoopSimplify::ID = 0;
+  char LoopSimplify::ID = 0;
   RegisterPass
   X("loopsimplify", "Canonicalize natural loops", true);
 }


Index: llvm/lib/Transforms/Utils/LowerAllocations.cpp
diff -u llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.75 
llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.76
--- llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.75 Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Utils/LowerAllocations.cpp  Wed May  2 20:11:54 2007
@@ -36,7 +36,7 @@
 Constant *FreeFunc; // Initialized by doInitialization
 bool LowerMallocArgToInteger;
   public:
-static const char ID; // Pass ID, replacement for typeid
+static char ID; // Pass ID, replacement for typeid
 LowerAllocations(bool LowerToInt = false)
   : BasicBlockPass((intptr_t)&ID), MallocFunc(0), FreeFunc(0), 
 LowerMallocArgToInteger(LowerToInt) {}
@@ -68,7 +68,7 @@
 bool runOnBasicBlock(BasicBlock &BB);
   };
 
-  const char LowerAllocations::ID = 0;
+  char LowerAllocations::ID = 0;
   RegisterPass
   X("lowerallocs", "Lower allocations from instructions to calls");
 }


Index: llvm/lib/Transforms/Utils/LowerInvoke.cpp
diff -u llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.61 
llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.62
--- llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.61  Wed May  2 16:39:19 2007
+++ llvm/lib/Transforms/Utils/LowerInvoke.cpp   Wed May  2 20:11:54 2007
@@ -75,7 +75,7 @@
 const TargetLowering *TLI;
 
   public:
-static const char ID; // Pass identifcation, replacement for typeid
+static char ID; // Pass identifcation, replacement for typeid
 LowerInvoke(c

[llvm-commits] CVS: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp LCSSA.cpp LoopSimplify.cpp LowerAllocations.cpp LowerInvoke.cpp LowerSelect.cpp LowerSwitch.cpp Mem2Reg.cpp UnifyFunctionExitNodes.

2007-05-02 Thread Devang Patel


Changes in directory llvm/lib/Transforms/Utils:

BreakCriticalEdges.cpp updated: 1.45 -> 1.46
LCSSA.cpp updated: 1.39 -> 1.40
LoopSimplify.cpp updated: 1.93 -> 1.94
LowerAllocations.cpp updated: 1.74 -> 1.75
LowerInvoke.cpp updated: 1.60 -> 1.61
LowerSelect.cpp updated: 1.13 -> 1.14
LowerSwitch.cpp updated: 1.39 -> 1.40
Mem2Reg.cpp updated: 1.27 -> 1.28
UnifyFunctionExitNodes.cpp updated: 1.37 -> 1.38
---
Log message:

Use 'static const char' instead of 'static const int'.
Due to darwin gcc bug, one version of darwin linker coalesces 
static const int, which defauts PassID based pass identification.


---
Diffs of the changes:  (+17 -17)

 BreakCriticalEdges.cpp |4 ++--
 LCSSA.cpp  |4 ++--
 LoopSimplify.cpp   |4 ++--
 LowerAllocations.cpp   |4 ++--
 LowerInvoke.cpp|4 ++--
 LowerSelect.cpp|4 ++--
 LowerSwitch.cpp|4 ++--
 Mem2Reg.cpp|4 ++--
 UnifyFunctionExitNodes.cpp |2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)


Index: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
diff -u llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.45 
llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.46
--- llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.45   Tue May  1 
16:15:47 2007
+++ llvm/lib/Transforms/Utils/BreakCriticalEdges.cppWed May  2 16:39:19 2007
@@ -34,7 +34,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN BreakCriticalEdges : public FunctionPass {
-static const int ID; // Pass identifcation, replacement for typeid
+static const char ID; // Pass identifcation, replacement for typeid
 BreakCriticalEdges() : FunctionPass((intptr_t)&ID) {}
 
 virtual bool runOnFunction(Function &F);
@@ -50,7 +50,7 @@
 }
   };
 
-  const int BreakCriticalEdges::ID = 0;
+  const char BreakCriticalEdges::ID = 0;
   RegisterPass X("break-crit-edges",
 "Break critical edges in CFG");
 }


Index: llvm/lib/Transforms/Utils/LCSSA.cpp
diff -u llvm/lib/Transforms/Utils/LCSSA.cpp:1.39 
llvm/lib/Transforms/Utils/LCSSA.cpp:1.40
--- llvm/lib/Transforms/Utils/LCSSA.cpp:1.39Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Utils/LCSSA.cpp Wed May  2 16:39:19 2007
@@ -47,7 +47,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN LCSSA : public FunctionPass {
-static const int ID; // Pass identifcation, replacement for typeid
+static const char ID; // Pass identifcation, replacement for typeid
 LCSSA() : FunctionPass((intptr_t)&ID) {}
 
 // Cached analysis information for the current function.
@@ -84,7 +84,7 @@
 }
   };
   
-  const int LCSSA::ID = 0;
+  const char LCSSA::ID = 0;
   RegisterPass X("lcssa", "Loop-Closed SSA Form Pass");
 }
 


Index: llvm/lib/Transforms/Utils/LoopSimplify.cpp
diff -u llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.93 
llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.94
--- llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.93 Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Utils/LoopSimplify.cpp  Wed May  2 16:39:19 2007
@@ -54,7 +54,7 @@
 
 namespace {
   struct VISIBILITY_HIDDEN LoopSimplify : public FunctionPass {
-static const int ID; // Pass identifcation, replacement for typeid
+static const char ID; // Pass identifcation, replacement for typeid
 LoopSimplify() : FunctionPass((intptr_t)&ID) {}
 
 // AA - If we have an alias analysis object to update, this is it, 
otherwise
@@ -92,7 +92,7 @@
  std::vector &PredBlocks);
   };
 
-  const int LoopSimplify::ID = 0;
+  const char LoopSimplify::ID = 0;
   RegisterPass
   X("loopsimplify", "Canonicalize natural loops", true);
 }


Index: llvm/lib/Transforms/Utils/LowerAllocations.cpp
diff -u llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.74 
llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.75
--- llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.74 Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Utils/LowerAllocations.cpp  Wed May  2 16:39:19 2007
@@ -36,7 +36,7 @@
 Constant *FreeFunc; // Initialized by doInitialization
 bool LowerMallocArgToInteger;
   public:
-static const int ID; // Pass ID, replacement for typeid
+static const char ID; // Pass ID, replacement for typeid
 LowerAllocations(bool LowerToInt = false)
   : BasicBlockPass((intptr_t)&ID), MallocFunc(0), FreeFunc(0), 
 LowerMallocArgToInteger(LowerToInt) {}
@@ -68,7 +68,7 @@
 bool runOnBasicBlock(BasicBlock &BB);
   };
 
-  const int LowerAllocations::ID = 0;
+  const char LowerAllocations::ID = 0;
   RegisterPass
   X("lowerallocs", "Lower allocations from instructions to calls");
 }


Index: llvm/lib/Transforms/Utils/LowerInvoke.cpp
diff -u llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.60 
llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.61
--- llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.60  Tue May  1 16:15:47 2007
+++ llvm/lib/Transforms/Utils/LowerInvoke.cpp   Wed May  2 16:39:19 2007
@@ -75,7 +75,7

[llvm-commits] CVS: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp LCSSA.cpp LoopSimplify.cpp LowerAllocations.cpp LowerInvoke.cpp LowerSelect.cpp LowerSwitch.cpp Mem2Reg.cpp UnifyFunctionExitNodes.

2007-05-01 Thread Devang Patel


Changes in directory llvm/lib/Transforms/Utils:

BreakCriticalEdges.cpp updated: 1.44 -> 1.45
LCSSA.cpp updated: 1.38 -> 1.39
LoopSimplify.cpp updated: 1.92 -> 1.93
LowerAllocations.cpp updated: 1.73 -> 1.74
LowerInvoke.cpp updated: 1.59 -> 1.60
LowerSelect.cpp updated: 1.12 -> 1.13
LowerSwitch.cpp updated: 1.38 -> 1.39
Mem2Reg.cpp updated: 1.26 -> 1.27
UnifyFunctionExitNodes.cpp updated: 1.36 -> 1.37
---
Log message:

Do not use typeinfo to identify pass in pass manager.


---
Diffs of the changes:  (+33 -3)

 BreakCriticalEdges.cpp |4 
 LCSSA.cpp  |4 
 LoopSimplify.cpp   |4 
 LowerAllocations.cpp   |5 -
 LowerInvoke.cpp|5 -
 LowerSelect.cpp|5 -
 LowerSwitch.cpp|4 
 Mem2Reg.cpp|4 
 UnifyFunctionExitNodes.cpp |1 +
 9 files changed, 33 insertions(+), 3 deletions(-)


Index: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
diff -u llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.44 
llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.45
--- llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.44   Tue Apr 17 
13:09:47 2007
+++ llvm/lib/Transforms/Utils/BreakCriticalEdges.cppTue May  1 16:15:47 2007
@@ -34,6 +34,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN BreakCriticalEdges : public FunctionPass {
+static const int ID; // Pass identifcation, replacement for typeid
+BreakCriticalEdges() : FunctionPass((intptr_t)&ID) {}
+
 virtual bool runOnFunction(Function &F);
 
 virtual void getAnalysisUsage(AnalysisUsage &AU) const {
@@ -47,6 +50,7 @@
 }
   };
 
+  const int BreakCriticalEdges::ID = 0;
   RegisterPass X("break-crit-edges",
 "Break critical edges in CFG");
 }


Index: llvm/lib/Transforms/Utils/LCSSA.cpp
diff -u llvm/lib/Transforms/Utils/LCSSA.cpp:1.38 
llvm/lib/Transforms/Utils/LCSSA.cpp:1.39
--- llvm/lib/Transforms/Utils/LCSSA.cpp:1.38Wed Apr 18 17:39:00 2007
+++ llvm/lib/Transforms/Utils/LCSSA.cpp Tue May  1 16:15:47 2007
@@ -47,6 +47,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN LCSSA : public FunctionPass {
+static const int ID; // Pass identifcation, replacement for typeid
+LCSSA() : FunctionPass((intptr_t)&ID) {}
+
 // Cached analysis information for the current function.
 LoopInfo *LI;
 DominatorTree *DT;
@@ -81,6 +84,7 @@
 }
   };
   
+  const int LCSSA::ID = 0;
   RegisterPass X("lcssa", "Loop-Closed SSA Form Pass");
 }
 


Index: llvm/lib/Transforms/Utils/LoopSimplify.cpp
diff -u llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.92 
llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.93
--- llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.92 Fri Apr 20 15:04:37 2007
+++ llvm/lib/Transforms/Utils/LoopSimplify.cpp  Tue May  1 16:15:47 2007
@@ -54,6 +54,9 @@
 
 namespace {
   struct VISIBILITY_HIDDEN LoopSimplify : public FunctionPass {
+static const int ID; // Pass identifcation, replacement for typeid
+LoopSimplify() : FunctionPass((intptr_t)&ID) {}
+
 // AA - If we have an alias analysis object to update, this is it, 
otherwise
 // this is null.
 AliasAnalysis *AA;
@@ -89,6 +92,7 @@
  std::vector &PredBlocks);
   };
 
+  const int LoopSimplify::ID = 0;
   RegisterPass
   X("loopsimplify", "Canonicalize natural loops", true);
 }


Index: llvm/lib/Transforms/Utils/LowerAllocations.cpp
diff -u llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.73 
llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.74
--- llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.73 Mon Apr 16 13:10:23 2007
+++ llvm/lib/Transforms/Utils/LowerAllocations.cpp  Tue May  1 16:15:47 2007
@@ -36,8 +36,10 @@
 Constant *FreeFunc; // Initialized by doInitialization
 bool LowerMallocArgToInteger;
   public:
+static const int ID; // Pass ID, replacement for typeid
 LowerAllocations(bool LowerToInt = false)
-  : MallocFunc(0), FreeFunc(0), LowerMallocArgToInteger(LowerToInt) {}
+  : BasicBlockPass((intptr_t)&ID), MallocFunc(0), FreeFunc(0), 
+LowerMallocArgToInteger(LowerToInt) {}
 
 virtual void getAnalysisUsage(AnalysisUsage &AU) const {
   AU.addRequired();
@@ -66,6 +68,7 @@
 bool runOnBasicBlock(BasicBlock &BB);
   };
 
+  const int LowerAllocations::ID = 0;
   RegisterPass
   X("lowerallocs", "Lower allocations from instructions to calls");
 }


Index: llvm/lib/Transforms/Utils/LowerInvoke.cpp
diff -u llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.59 
llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.60
--- llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.59  Fri Apr 20 17:40:10 2007
+++ llvm/lib/Transforms/Utils/LowerInvoke.cpp   Tue May  1 16:15:47 2007
@@ -75,7 +75,9 @@
 const TargetLowering *TLI;
 
   public:
-LowerInvoke(const TargetLowering *tli = NULL) : TLI(tli) { }
+static const int ID; // Pass identifcation, replacement for typeid
+LowerInvoke(const TargetLowering *tli = NUL

[llvm-commits] CVS: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp LCSSA.cpp LoopSimplify.cpp LowerAllocations.cpp LowerInvoke.cpp LowerSelect.cpp LowerSwitch.cpp Mem2Reg.cpp UnifyFunctionExitNodes

2006-08-27 Thread Chris Lattner


Changes in directory llvm/lib/Transforms/Utils:

BreakCriticalEdges.cpp updated: 1.31 -> 1.32
LCSSA.cpp updated: 1.27 -> 1.28
LoopSimplify.cpp updated: 1.73 -> 1.74
LowerAllocations.cpp updated: 1.60 -> 1.61
LowerInvoke.cpp updated: 1.38 -> 1.39
LowerSelect.cpp updated: 1.6 -> 1.7
LowerSwitch.cpp updated: 1.23 -> 1.24
Mem2Reg.cpp updated: 1.19 -> 1.20
UnifyFunctionExitNodes.cpp updated: 1.35 -> 1.36
---
Log message:

eliminate RegisterOpt.  It does the same thing as RegisterPass.


---
Diffs of the changes:  (+9 -9)

 BreakCriticalEdges.cpp |2 +-
 LCSSA.cpp  |2 +-
 LoopSimplify.cpp   |2 +-
 LowerAllocations.cpp   |2 +-
 LowerInvoke.cpp|2 +-
 LowerSelect.cpp|2 +-
 LowerSwitch.cpp|2 +-
 Mem2Reg.cpp|2 +-
 UnifyFunctionExitNodes.cpp |2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)


Index: llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
diff -u llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.31 
llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.32
--- llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp:1.31   Sun Aug 27 
07:54:02 2006
+++ llvm/lib/Transforms/Utils/BreakCriticalEdges.cppSun Aug 27 17:42:52 2006
@@ -47,7 +47,7 @@
 }
   };
 
-  RegisterOpt X("break-crit-edges",
+  RegisterPass X("break-crit-edges",
 "Break critical edges in CFG");
 }
 


Index: llvm/lib/Transforms/Utils/LCSSA.cpp
diff -u llvm/lib/Transforms/Utils/LCSSA.cpp:1.27 
llvm/lib/Transforms/Utils/LCSSA.cpp:1.28
--- llvm/lib/Transforms/Utils/LCSSA.cpp:1.27Tue Aug  1 19:16:47 2006
+++ llvm/lib/Transforms/Utils/LCSSA.cpp Sun Aug 27 17:42:52 2006
@@ -80,7 +80,7 @@
 }
   };
   
-  RegisterOpt X("lcssa", "Loop-Closed SSA Form Pass");
+  RegisterPass X("lcssa", "Loop-Closed SSA Form Pass");
 }
 
 FunctionPass *llvm::createLCSSAPass() { return new LCSSA(); }


Index: llvm/lib/Transforms/Utils/LoopSimplify.cpp
diff -u llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.73 
llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.74
--- llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.73 Sun Aug 27 07:54:02 2006
+++ llvm/lib/Transforms/Utils/LoopSimplify.cpp  Sun Aug 27 17:42:52 2006
@@ -89,7 +89,7 @@
  std::vector &PredBlocks);
   };
 
-  RegisterOpt
+  RegisterPass
   X("loopsimplify", "Canonicalize natural loops", true);
 }
 


Index: llvm/lib/Transforms/Utils/LowerAllocations.cpp
diff -u llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.60 
llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.61
--- llvm/lib/Transforms/Utils/LowerAllocations.cpp:1.60 Sun Aug 27 07:54:02 2006
+++ llvm/lib/Transforms/Utils/LowerAllocations.cpp  Sun Aug 27 17:42:52 2006
@@ -65,7 +65,7 @@
 bool runOnBasicBlock(BasicBlock &BB);
   };
 
-  RegisterOpt
+  RegisterPass
   X("lowerallocs", "Lower allocations from instructions to calls");
 }
 


Index: llvm/lib/Transforms/Utils/LowerInvoke.cpp
diff -u llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.38 
llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.39
--- llvm/lib/Transforms/Utils/LowerInvoke.cpp:1.38  Sun Aug 27 07:54:02 2006
+++ llvm/lib/Transforms/Utils/LowerInvoke.cpp   Sun Aug 27 17:42:52 2006
@@ -94,7 +94,7 @@
 unsigned JumpBufAlign;
   };
 
-  RegisterOpt
+  RegisterPass
   X("lowerinvoke", "Lower invoke and unwind, for unwindless code generators");
 }
 


Index: llvm/lib/Transforms/Utils/LowerSelect.cpp
diff -u llvm/lib/Transforms/Utils/LowerSelect.cpp:1.6 
llvm/lib/Transforms/Utils/LowerSelect.cpp:1.7
--- llvm/lib/Transforms/Utils/LowerSelect.cpp:1.6   Wed May 17 16:05:27 2006
+++ llvm/lib/Transforms/Utils/LowerSelect.cpp   Sun Aug 27 17:42:52 2006
@@ -50,7 +50,7 @@
 bool runOnFunction(Function &F);
   };
 
-  RegisterOpt
+  RegisterPass
   X("lowerselect", "Lower select instructions to branches");
 }
 


Index: llvm/lib/Transforms/Utils/LowerSwitch.cpp
diff -u llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.23 
llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.24
--- llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.23  Sun Aug 27 07:54:02 2006
+++ llvm/lib/Transforms/Utils/LowerSwitch.cpp   Sun Aug 27 17:42:52 2006
@@ -68,7 +68,7 @@
 }
   };
 
-  RegisterOpt
+  RegisterPass
   X("lowerswitch", "Lower SwitchInst's to branches");
 }
 


Index: llvm/lib/Transforms/Utils/Mem2Reg.cpp
diff -u llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.19 
llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.20
--- llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.19  Sun Aug 27 07:54:02 2006
+++ llvm/lib/Transforms/Utils/Mem2Reg.cpp   Sun Aug 27 17:42:52 2006
@@ -48,7 +48,7 @@
 }
   };
 
-  RegisterOpt X("mem2reg", "Promote Memory to Register");
+  RegisterPass X("mem2reg", "Promote Memory to Register");
 }  // end of anonymous namespace
 
 bool PromotePass::runOnFunction(Function &F) {


Index: llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp
diff -u llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.35 
llvm/lib/Transforms/Utils/Uni