Changes in directory llvm/lib/VMCore:
AsmWriter.cpp updated: 1.280 -> 1.281 Dominators.cpp updated: 1.98 -> 1.99 PassManager.cpp updated: 1.154 -> 1.155 Verifier.cpp updated: 1.210 -> 1.211 --- 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: (+16 -16) AsmWriter.cpp | 4 ++-- Dominators.cpp | 6 +++--- PassManager.cpp | 18 +++++++++--------- Verifier.cpp | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) Index: llvm/lib/VMCore/AsmWriter.cpp diff -u llvm/lib/VMCore/AsmWriter.cpp:1.280 llvm/lib/VMCore/AsmWriter.cpp:1.281 --- llvm/lib/VMCore/AsmWriter.cpp:1.280 Tue May 1 16:15:47 2007 +++ llvm/lib/VMCore/AsmWriter.cpp Wed May 2 16:39:19 2007 @@ -135,10 +135,10 @@ } // end namespace llvm -const int PrintModulePass::ID = 0; +const char PrintModulePass::ID = 0; static RegisterPass<PrintModulePass> X("printm", "Print module to stderr"); -const int PrintFunctionPass::ID = 0; +const char PrintFunctionPass::ID = 0; static RegisterPass<PrintFunctionPass> Y("print","Print function to stderr"); Index: llvm/lib/VMCore/Dominators.cpp diff -u llvm/lib/VMCore/Dominators.cpp:1.98 llvm/lib/VMCore/Dominators.cpp:1.99 --- llvm/lib/VMCore/Dominators.cpp:1.98 Tue May 1 16:15:47 2007 +++ llvm/lib/VMCore/Dominators.cpp Wed May 2 16:39:20 2007 @@ -58,7 +58,7 @@ // //===----------------------------------------------------------------------===// -const int DominatorTree::ID = 0; +const char DominatorTree::ID = 0; static RegisterPass<DominatorTree> E("domtree", "Dominator Tree Construction", true); @@ -354,7 +354,7 @@ // DominanceFrontier Implementation //===----------------------------------------------------------------------===// -const int DominanceFrontier::ID = 0; +const char DominanceFrontier::ID = 0; static RegisterPass<DominanceFrontier> G("domfrontier", "Dominance Frontier Construction", true); @@ -835,7 +835,7 @@ // ETForest implementation //===----------------------------------------------------------------------===// -const int ETForest::ID = 0; +const char ETForest::ID = 0; static RegisterPass<ETForest> D("etforest", "ET Forest Construction", true); Index: llvm/lib/VMCore/PassManager.cpp diff -u llvm/lib/VMCore/PassManager.cpp:1.154 llvm/lib/VMCore/PassManager.cpp:1.155 --- llvm/lib/VMCore/PassManager.cpp:1.154 Tue May 1 16:15:47 2007 +++ llvm/lib/VMCore/PassManager.cpp Wed May 2 16:39:20 2007 @@ -63,7 +63,7 @@ public FunctionPass { public: - static const int ID; + static const char ID; BBPassManager(int Depth) : PMDataManager(Depth), FunctionPass((intptr_t)&ID) {} @@ -106,7 +106,7 @@ } }; -const int BBPassManager::ID = 0; +const char BBPassManager::ID = 0; } namespace llvm { @@ -119,7 +119,7 @@ public PMDataManager, public PMTopLevelManager { public: - static const int ID; + static const char ID; FunctionPassManagerImpl(int Depth) : Pass((intptr_t)&ID), PMDataManager(Depth), PMTopLevelManager(TLM_Function) { } @@ -173,7 +173,7 @@ } }; -const int FunctionPassManagerImpl::ID = 0; +const char FunctionPassManagerImpl::ID = 0; //===----------------------------------------------------------------------===// // MPPassManager // @@ -183,7 +183,7 @@ class MPPassManager : public Pass, public PMDataManager { public: - static const int ID; + static const char ID; MPPassManager(int Depth) : Pass((intptr_t)&ID), PMDataManager(Depth) { } // Delete on the fly managers. @@ -247,7 +247,7 @@ std::map<Pass *, FunctionPassManagerImpl *> OnTheFlyManagers; }; -const int MPPassManager::ID = 0; +const char MPPassManager::ID = 0; //===----------------------------------------------------------------------===// // PassManagerImpl // @@ -258,7 +258,7 @@ public PMTopLevelManager { public: - static const int ID; + static const char ID; PassManagerImpl(int Depth) : Pass((intptr_t)&ID), PMDataManager(Depth), PMTopLevelManager(TLM_Pass) { } @@ -304,7 +304,7 @@ }; -const int PassManagerImpl::ID = 0; +const char PassManagerImpl::ID = 0; } // End of llvm namespace namespace { @@ -1108,7 +1108,7 @@ //===----------------------------------------------------------------------===// // FPPassManager implementation -const int FPPassManager::ID = 0; +const char FPPassManager::ID = 0; /// Print passes managed by this manager void FPPassManager::dumpPassStructure(unsigned Offset) { llvm::cerr << std::string(Offset*2, ' ') << "FunctionPass Manager\n"; Index: llvm/lib/VMCore/Verifier.cpp diff -u llvm/lib/VMCore/Verifier.cpp:1.210 llvm/lib/VMCore/Verifier.cpp:1.211 --- llvm/lib/VMCore/Verifier.cpp:1.210 Tue May 1 16:15:47 2007 +++ llvm/lib/VMCore/Verifier.cpp Wed May 2 16:39:20 2007 @@ -69,7 +69,7 @@ struct VISIBILITY_HIDDEN Verifier : public FunctionPass, InstVisitor<Verifier> { - static const int ID; // Pass ID, replacement for typeid + static const char ID; // Pass ID, replacement for typeid bool Broken; // Is this module found to be broken? bool RealPass; // Are we not being run by a PassManager? VerifierFailureAction action; @@ -266,7 +266,7 @@ } }; - const int Verifier::ID = 0; + const char Verifier::ID = 0; RegisterPass<Verifier> X("verify", "Module Verifier"); } // End anonymous namespace _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits