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.cpp Wed 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<BreakCriticalEdges> 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.39 Tue 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<LCSSA> 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<BasicBlock*> &PredBlocks); }; - const int LoopSimplify::ID = 0; + const char LoopSimplify::ID = 0; RegisterPass<LoopSimplify> 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<LowerAllocations> 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 @@ const TargetLowering *TLI; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid LowerInvoke(const TargetLowering *tli = NULL) : FunctionPass((intptr_t)&ID), TLI(tli) { } bool doInitialization(Module &M); @@ -99,7 +99,7 @@ bool insertExpensiveEHSupport(Function &F); }; - const int LowerInvoke::ID = 0; + const char LowerInvoke::ID = 0; RegisterPass<LowerInvoke> 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.13 llvm/lib/Transforms/Utils/LowerSelect.cpp:1.14 --- llvm/lib/Transforms/Utils/LowerSelect.cpp:1.13 Tue May 1 16:15:47 2007 +++ llvm/lib/Transforms/Utils/LowerSelect.cpp Wed May 2 16:39:19 2007 @@ -33,7 +33,7 @@ class VISIBILITY_HIDDEN LowerSelect : public FunctionPass { bool OnlyFP; // Only lower FP select instructions? public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid LowerSelect(bool onlyfp = false) : FunctionPass((intptr_t)&ID), OnlyFP(onlyfp) {} @@ -50,7 +50,7 @@ bool runOnFunction(Function &F); }; - const int LowerSelect::ID = 0; + const char LowerSelect::ID = 0; RegisterPass<LowerSelect> X("lowerselect", "Lower select instructions to branches"); } Index: llvm/lib/Transforms/Utils/LowerSwitch.cpp diff -u llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.39 llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.40 --- llvm/lib/Transforms/Utils/LowerSwitch.cpp:1.39 Tue May 1 16:15:47 2007 +++ llvm/lib/Transforms/Utils/LowerSwitch.cpp Wed May 2 16:39:19 2007 @@ -30,7 +30,7 @@ /// modifies the CFG! class VISIBILITY_HIDDEN LowerSwitch : public FunctionPass { public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid LowerSwitch() : FunctionPass((intptr_t) &ID) {} virtual bool runOnFunction(Function &F); @@ -78,7 +78,7 @@ } }; - const int LowerSwitch::ID = 0; + const char LowerSwitch::ID = 0; RegisterPass<LowerSwitch> X("lowerswitch", "Lower SwitchInst's to branches"); } Index: llvm/lib/Transforms/Utils/Mem2Reg.cpp diff -u llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.27 llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.28 --- llvm/lib/Transforms/Utils/Mem2Reg.cpp:1.27 Tue May 1 16:15:47 2007 +++ llvm/lib/Transforms/Utils/Mem2Reg.cpp Wed May 2 16:39:19 2007 @@ -27,7 +27,7 @@ namespace { struct VISIBILITY_HIDDEN PromotePass : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid PromotePass() : FunctionPass((intptr_t)&ID) {} // runOnFunction - To run this pass, first we calculate the alloca @@ -50,7 +50,7 @@ } }; - const int PromotePass::ID = 0; + const char PromotePass::ID = 0; RegisterPass<PromotePass> X("mem2reg", "Promote Memory to Register"); } // end of anonymous namespace Index: llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp diff -u llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.37 llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.38 --- llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp:1.37 Tue May 1 16:15:47 2007 +++ llvm/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp Wed May 2 16:39:19 2007 @@ -22,7 +22,7 @@ #include "llvm/Type.h" using namespace llvm; -const int UnifyFunctionExitNodes::ID = 0; +const char UnifyFunctionExitNodes::ID = 0; static RegisterPass<UnifyFunctionExitNodes> X("mergereturn", "Unify function exit nodes"); _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits