diff options
Diffstat (limited to 'lib/Transforms')
60 files changed, 133 insertions, 133 deletions
diff --git a/lib/Transforms/Hello/Hello.cpp b/lib/Transforms/Hello/Hello.cpp index d9af9df18b..2db4990c91 100644 --- a/lib/Transforms/Hello/Hello.cpp +++ b/lib/Transforms/Hello/Hello.cpp @@ -25,7 +25,7 @@ STATISTIC(HelloCounter, "Counts number of functions greeted"); namespace { // Hello - The first implementation, without getAnalysisUsage. struct Hello : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid Hello() : FunctionPass((intptr_t)&ID) {} virtual bool runOnFunction(Function &F) { @@ -37,12 +37,12 @@ namespace { } }; - const int Hello::ID = 0; + const char Hello::ID = 0; RegisterPass<Hello> X("hello", "Hello World Pass"); // Hello2 - The second implementation with getAnalysisUsage implemented. struct Hello2 : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid Hello2() : FunctionPass((intptr_t)&ID) {} virtual bool runOnFunction(Function &F) { @@ -58,7 +58,7 @@ namespace { AU.setPreservesAll(); }; }; - const int Hello2::ID = 0; + const char Hello2::ID = 0; RegisterPass<Hello2> Y("hello2", "Hello World Pass (with getAnalysisUsage implemented)"); } diff --git a/lib/Transforms/IPO/ArgumentPromotion.cpp b/lib/Transforms/IPO/ArgumentPromotion.cpp index 6310e5dc0f..a91dbc263a 100644 --- a/lib/Transforms/IPO/ArgumentPromotion.cpp +++ b/lib/Transforms/IPO/ArgumentPromotion.cpp @@ -63,7 +63,7 @@ namespace { } virtual bool runOnSCC(const std::vector<CallGraphNode *> &SCC); - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid ArgPromotion() : CallGraphSCCPass((intptr_t)&ID) {} private: @@ -72,7 +72,7 @@ namespace { Function *DoPromotion(Function *F, std::vector<Argument*> &ArgsToPromote); }; - const int ArgPromotion::ID = 0; + const char ArgPromotion::ID = 0; RegisterPass<ArgPromotion> X("argpromotion", "Promote 'by reference' arguments to scalars"); } diff --git a/lib/Transforms/IPO/ConstantMerge.cpp b/lib/Transforms/IPO/ConstantMerge.cpp index 5c226438c2..635caf5c69 100644 --- a/lib/Transforms/IPO/ConstantMerge.cpp +++ b/lib/Transforms/IPO/ConstantMerge.cpp @@ -29,7 +29,7 @@ STATISTIC(NumMerged, "Number of global constants merged"); namespace { struct VISIBILITY_HIDDEN ConstantMerge : public ModulePass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid ConstantMerge() : ModulePass((intptr_t)&ID) {} // run - For this pass, process all of the globals in the module, @@ -38,7 +38,7 @@ namespace { bool runOnModule(Module &M); }; - const int ConstantMerge::ID = 0; + const char ConstantMerge::ID = 0; RegisterPass<ConstantMerge>X("constmerge","Merge Duplicate Global Constants"); } diff --git a/lib/Transforms/IPO/DeadArgumentElimination.cpp b/lib/Transforms/IPO/DeadArgumentElimination.cpp index 162d078514..f355021a66 100644 --- a/lib/Transforms/IPO/DeadArgumentElimination.cpp +++ b/lib/Transforms/IPO/DeadArgumentElimination.cpp @@ -76,7 +76,7 @@ namespace { std::multimap<Function*, CallSite> CallSites; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid DAE() : ModulePass((intptr_t)&ID) {} bool runOnModule(Module &M); @@ -95,17 +95,17 @@ namespace { void RemoveDeadArgumentsFromFunction(Function *F); }; - const int DAE::ID = 0; + const char DAE::ID = 0; RegisterPass<DAE> X("deadargelim", "Dead Argument Elimination"); /// DAH - DeadArgumentHacking pass - Same as dead argument elimination, but /// deletes arguments to functions which are external. This is only for use /// by bugpoint. struct DAH : public DAE { - static const int ID; + static const char ID; virtual bool ShouldHackArguments() const { return true; } }; - const int DAH::ID = 0; + const char DAH::ID = 0; RegisterPass<DAH> Y("deadarghaX0r", "Dead Argument Hacking (BUGPOINT USE ONLY; DO NOT USE)"); } diff --git a/lib/Transforms/IPO/DeadTypeElimination.cpp b/lib/Transforms/IPO/DeadTypeElimination.cpp index 8ecd4b7688..4dff7a36f1 100644 --- a/lib/Transforms/IPO/DeadTypeElimination.cpp +++ b/lib/Transforms/IPO/DeadTypeElimination.cpp @@ -26,7 +26,7 @@ STATISTIC(NumKilled, "Number of unused typenames removed from symtab"); namespace { struct VISIBILITY_HIDDEN DTE : public ModulePass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid DTE() : ModulePass((intptr_t)&ID) {} // doPassInitialization - For this pass, it removes global symbol table @@ -43,7 +43,7 @@ namespace { AU.addRequired<FindUsedTypes>(); } }; - const int DTE::ID = 0; + const char DTE::ID = 0; RegisterPass<DTE> X("deadtypeelim", "Dead Type Elimination"); } diff --git a/lib/Transforms/IPO/ExtractFunction.cpp b/lib/Transforms/IPO/ExtractFunction.cpp index 7a4765533e..2d5c0347b6 100644 --- a/lib/Transforms/IPO/ExtractFunction.cpp +++ b/lib/Transforms/IPO/ExtractFunction.cpp @@ -25,7 +25,7 @@ namespace { bool deleteFunc; bool reLink; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid /// FunctionExtractorPass - If deleteFn is true, this pass deletes as the /// specified function. Otherwise, it deletes as much of the module as @@ -134,7 +134,7 @@ namespace { } }; - const int FunctionExtractorPass::ID = 0; + const char FunctionExtractorPass::ID = 0; RegisterPass<FunctionExtractorPass> X("extract", "Function Extractor"); } diff --git a/lib/Transforms/IPO/GlobalDCE.cpp b/lib/Transforms/IPO/GlobalDCE.cpp index 00b16a839e..4a08b453bb 100644 --- a/lib/Transforms/IPO/GlobalDCE.cpp +++ b/lib/Transforms/IPO/GlobalDCE.cpp @@ -30,7 +30,7 @@ STATISTIC(NumVariables, "Number of global variables removed"); namespace { struct VISIBILITY_HIDDEN GlobalDCE : public ModulePass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid GlobalDCE() : ModulePass((intptr_t)&ID) {} // run - Do the GlobalDCE pass on the specified module, optionally updating @@ -49,7 +49,7 @@ namespace { bool SafeToDestroyConstant(Constant* C); bool RemoveUnusedGlobalValue(GlobalValue &GV); }; - const int GlobalDCE::ID = 0; + const char GlobalDCE::ID = 0; RegisterPass<GlobalDCE> X("globaldce", "Dead Global Elimination"); } diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp index cfa8998b2f..421bda6fbd 100644 --- a/lib/Transforms/IPO/GlobalOpt.cpp +++ b/lib/Transforms/IPO/GlobalOpt.cpp @@ -50,7 +50,7 @@ namespace { virtual void getAnalysisUsage(AnalysisUsage &AU) const { AU.addRequired<TargetData>(); } - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid GlobalOpt() : ModulePass((intptr_t)&ID) {} bool runOnModule(Module &M); @@ -63,7 +63,7 @@ namespace { bool ProcessInternalGlobal(GlobalVariable *GV,Module::global_iterator &GVI); }; - const int GlobalOpt::ID = 0; + const char GlobalOpt::ID = 0; RegisterPass<GlobalOpt> X("globalopt", "Global Variable Optimizer"); } diff --git a/lib/Transforms/IPO/IPConstantPropagation.cpp b/lib/Transforms/IPO/IPConstantPropagation.cpp index 9ef775660a..00b829e248 100644 --- a/lib/Transforms/IPO/IPConstantPropagation.cpp +++ b/lib/Transforms/IPO/IPConstantPropagation.cpp @@ -33,7 +33,7 @@ namespace { /// IPCP - The interprocedural constant propagation pass /// struct VISIBILITY_HIDDEN IPCP : public ModulePass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid IPCP() : ModulePass((intptr_t)&ID) {} bool runOnModule(Module &M); @@ -41,7 +41,7 @@ namespace { bool PropagateConstantsIntoArguments(Function &F); bool PropagateConstantReturn(Function &F); }; - const int IPCP::ID = 0; + const char IPCP::ID = 0; RegisterPass<IPCP> X("ipconstprop", "Interprocedural constant propagation"); } diff --git a/lib/Transforms/IPO/IndMemRemoval.cpp b/lib/Transforms/IPO/IndMemRemoval.cpp index 20d11178bf..5dd82bd248 100644 --- a/lib/Transforms/IPO/IndMemRemoval.cpp +++ b/lib/Transforms/IPO/IndMemRemoval.cpp @@ -32,12 +32,12 @@ STATISTIC(NumBounce , "Number of bounce functions created"); namespace { class VISIBILITY_HIDDEN IndMemRemPass : public ModulePass { public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid IndMemRemPass() : ModulePass((intptr_t)&ID) {} virtual bool runOnModule(Module &M); }; - const int IndMemRemPass::ID = 0; + const char IndMemRemPass::ID = 0; RegisterPass<IndMemRemPass> X("indmemrem","Indirect Malloc and Free Removal"); } // end anonymous namespace diff --git a/lib/Transforms/IPO/InlineSimple.cpp b/lib/Transforms/IPO/InlineSimple.cpp index 8f9a1f64d9..a300c62a3e 100644 --- a/lib/Transforms/IPO/InlineSimple.cpp +++ b/lib/Transforms/IPO/InlineSimple.cpp @@ -54,10 +54,10 @@ namespace { class VISIBILITY_HIDDEN SimpleInliner : public Inliner { std::map<const Function*, FunctionInfo> CachedFunctionInfo; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid int getInlineCost(CallSite CS); }; - const int SimpleInliner::ID = 0; + const char SimpleInliner::ID = 0; RegisterPass<SimpleInliner> X("inline", "Function Integration/Inlining"); } diff --git a/lib/Transforms/IPO/Inliner.cpp b/lib/Transforms/IPO/Inliner.cpp index 82611cbc8f..d769043694 100644 --- a/lib/Transforms/IPO/Inliner.cpp +++ b/lib/Transforms/IPO/Inliner.cpp @@ -36,7 +36,7 @@ namespace { cl::desc("Control the amount of inlining to perform (default = 200)")); } -const int Inliner::ID = 0; +const char Inliner::ID = 0; Inliner::Inliner() : CallGraphSCCPass((intptr_t)&ID), InlineThreshold(InlineLimit) {} diff --git a/lib/Transforms/IPO/Inliner.h b/lib/Transforms/IPO/Inliner.h index 321a65f488..6a7c665e29 100644 --- a/lib/Transforms/IPO/Inliner.h +++ b/lib/Transforms/IPO/Inliner.h @@ -27,7 +27,7 @@ namespace llvm { /// perform the inlining operations that does not depend on the policy. /// struct Inliner : public CallGraphSCCPass { - static const int ID; + static const char ID; Inliner(); /// getAnalysisUsage - For this class, we declare that we require and preserve diff --git a/lib/Transforms/IPO/Internalize.cpp b/lib/Transforms/IPO/Internalize.cpp index 17de131590..eeabc3f592 100644 --- a/lib/Transforms/IPO/Internalize.cpp +++ b/lib/Transforms/IPO/Internalize.cpp @@ -46,13 +46,13 @@ namespace { std::set<std::string> ExternalNames; bool DontInternalize; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid InternalizePass(bool InternalizeEverything = true); InternalizePass(const std::vector <const char *>& exportList); void LoadFile(const char *Filename); virtual bool runOnModule(Module &M); }; - const int InternalizePass::ID = 0; + const char InternalizePass::ID = 0; RegisterPass<InternalizePass> X("internalize", "Internalize Global Symbols"); } // end anonymous namespace diff --git a/lib/Transforms/IPO/LoopExtractor.cpp b/lib/Transforms/IPO/LoopExtractor.cpp index 0ea544daa6..dc0ad432ac 100644 --- a/lib/Transforms/IPO/LoopExtractor.cpp +++ b/lib/Transforms/IPO/LoopExtractor.cpp @@ -34,7 +34,7 @@ namespace { // Module passes to require FunctionPasses, so we can't get loop info if we're // not a function pass. struct VISIBILITY_HIDDEN LoopExtractor : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid unsigned NumLoops; LoopExtractor(unsigned numLoops = ~0) @@ -51,17 +51,17 @@ namespace { } }; - const int LoopExtractor::ID = 0; + const char LoopExtractor::ID = 0; RegisterPass<LoopExtractor> X("loop-extract", "Extract loops into new functions"); /// SingleLoopExtractor - For bugpoint. struct SingleLoopExtractor : public LoopExtractor { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid SingleLoopExtractor() : LoopExtractor(1) {} }; - const int SingleLoopExtractor::ID = 0; + const char SingleLoopExtractor::ID = 0; RegisterPass<SingleLoopExtractor> Y("loop-extract-single", "Extract at most one loop into a new function"); } // End anonymous namespace @@ -152,7 +152,7 @@ namespace { class BlockExtractorPass : public ModulePass { std::vector<BasicBlock*> BlocksToNotExtract; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid BlockExtractorPass(std::vector<BasicBlock*> &B) : ModulePass((intptr_t)&ID), BlocksToNotExtract(B) {} BlockExtractorPass() : ModulePass((intptr_t)&ID) {} @@ -160,7 +160,7 @@ namespace { bool runOnModule(Module &M); }; - const int BlockExtractorPass::ID = 0; + const char BlockExtractorPass::ID = 0; RegisterPass<BlockExtractorPass> XX("extract-blocks", "Extract Basic Blocks From Module (for bugpoint use)"); } diff --git a/lib/Transforms/IPO/LowerSetJmp.cpp b/lib/Transforms/IPO/LowerSetJmp.cpp index 010bc592af..1fd90715d6 100644 --- a/lib/Transforms/IPO/LowerSetJmp.cpp +++ b/lib/Transforms/IPO/LowerSetJmp.cpp @@ -109,7 +109,7 @@ namespace { bool IsTransformableFunction(const std::string& Name); public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid LowerSetJmp() : ModulePass((intptr_t)&ID) {} void visitCallInst(CallInst& CI); @@ -121,7 +121,7 @@ namespace { bool doInitialization(Module& M); }; - const int LowerSetJmp::ID = 0; + const char LowerSetJmp::ID = 0; RegisterPass<LowerSetJmp> X("lowersetjmp", "Lower Set Jump"); } // end anonymous namespace diff --git a/lib/Transforms/IPO/PruneEH.cpp b/lib/Transforms/IPO/PruneEH.cpp index ee37992d16..3d70f165d0 100644 --- a/lib/Transforms/IPO/PruneEH.cpp +++ b/lib/Transforms/IPO/PruneEH.cpp @@ -35,7 +35,7 @@ STATISTIC(NumUnreach, "Number of noreturn calls optimized"); namespace { struct VISIBILITY_HIDDEN PruneEH : public CallGraphSCCPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid PruneEH() : CallGraphSCCPass((intptr_t)&ID) {} /// DoesNotUnwind - This set contains all of the functions which we have @@ -53,7 +53,7 @@ namespace { void DeleteBasicBlock(BasicBlock *BB); }; - const int PruneEH::ID = 0; + const char PruneEH::ID = 0; RegisterPass<PruneEH> X("prune-eh", "Remove unused exception handling info"); } diff --git a/lib/Transforms/IPO/RaiseAllocations.cpp b/lib/Transforms/IPO/RaiseAllocations.cpp index f7f40377f0..7b338b1d1d 100644 --- a/lib/Transforms/IPO/RaiseAllocations.cpp +++ b/lib/Transforms/IPO/RaiseAllocations.cpp @@ -35,7 +35,7 @@ namespace { Function *MallocFunc; // Functions in the module we are processing Function *FreeFunc; // Initialized by doPassInitializationVirt public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid RaiseAllocations() : ModulePass((intptr_t)&ID), MallocFunc(0), FreeFunc(0) {} @@ -49,7 +49,7 @@ namespace { bool runOnModule(Module &M); }; - const int RaiseAllocations::ID = 0; + const char RaiseAllocations::ID = 0; RegisterPass<RaiseAllocations> X("raiseallocs", "Raise allocations from calls to instructions"); } // end anonymous namespace diff --git a/lib/Transforms/IPO/SimplifyLibCalls.cpp b/lib/Transforms/IPO/SimplifyLibCalls.cpp index f5a8fee387..8e5567cd3e 100644 --- a/lib/Transforms/IPO/SimplifyLibCalls.cpp +++ b/lib/Transforms/IPO/SimplifyLibCalls.cpp @@ -152,7 +152,7 @@ public: /// @brief A ModulePass for optimizing well-known function calls. class VISIBILITY_HIDDEN SimplifyLibCalls : public ModulePass { public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid SimplifyLibCalls() : ModulePass((intptr_t)&ID) {} /// We need some target data for accurate signature details that are @@ -376,7 +376,7 @@ private: TargetData *TD; ///< Cached TargetData }; -const int SimplifyLibCalls::ID = 0; +const char SimplifyLibCalls::ID = 0; // Register the pass RegisterPass<SimplifyLibCalls> X("simplify-libcalls", "Simplify well-known library calls"); diff --git a/lib/Transforms/IPO/StripDeadPrototypes.cpp b/lib/Transforms/IPO/StripDeadPrototypes.cpp index d1467f9b58..d40e743833 100644 --- a/lib/Transforms/IPO/StripDeadPrototypes.cpp +++ b/lib/Transforms/IPO/StripDeadPrototypes.cpp @@ -27,12 +27,12 @@ namespace { /// @brief Pass to remove unused function declarations. class VISIBILITY_HIDDEN StripDeadPrototypesPass : public ModulePass { public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid StripDeadPrototypesPass() : ModulePass((intptr_t)&ID) { } virtual bool runOnModule(Module &M); }; -const int StripDeadPrototypesPass::ID = 0; +const char StripDeadPrototypesPass::ID = 0; RegisterPass<StripDeadPrototypesPass> X("strip-dead-prototypes", "Strip Unused Function Prototypes"); diff --git a/lib/Transforms/IPO/StripSymbols.cpp b/lib/Transforms/IPO/StripSymbols.cpp index 3330f7afae..50a5abae4d 100644 --- a/lib/Transforms/IPO/StripSymbols.cpp +++ b/lib/Transforms/IPO/StripSymbols.cpp @@ -37,7 +37,7 @@ namespace { class VISIBILITY_HIDDEN StripSymbols : public ModulePass { bool OnlyDebugInfo; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid StripSymbols(bool ODI = false) : ModulePass((intptr_t)&ID), OnlyDebugInfo(ODI) {} @@ -48,7 +48,7 @@ namespace { } }; - const int StripSymbols::ID = 0; + const char StripSymbols::ID = 0; RegisterPass<StripSymbols> X("strip", "Strip all symbols from a module"); } diff --git a/lib/Transforms/Instrumentation/BlockProfiling.cpp b/lib/Transforms/Instrumentation/BlockProfiling.cpp index a44899e1b9..c3f5022630 100644 --- a/lib/Transforms/Instrumentation/BlockProfiling.cpp +++ b/lib/Transforms/Instrumentation/BlockProfiling.cpp @@ -33,11 +33,11 @@ using namespace llvm; namespace { class VISIBILITY_HIDDEN FunctionProfiler : public RSProfilers_std { public: - static const int ID; + static const char ID; bool runOnModule(Module &M); }; - const int FunctionProfiler::ID = 0; + const char FunctionProfiler::ID = 0; RegisterPass<FunctionProfiler> X("insert-function-profiling", "Insert instrumentation for function profiling"); @@ -84,10 +84,10 @@ namespace { class BlockProfiler : public RSProfilers_std { bool runOnModule(Module &M); public: - static const int ID; + static const char ID; }; - const int BlockProfiler::ID = 0; + const char BlockProfiler::ID = 0; RegisterPass<BlockProfiler> Y("insert-block-profiling", "Insert instrumentation for block profiling"); RegisterAnalysisGroup<RSProfilers> YG(Y); diff --git a/lib/Transforms/Instrumentation/EdgeProfiling.cpp b/lib/Transforms/Instrumentation/EdgeProfiling.cpp index ff7d4270ba..07024cd642 100644 --- a/lib/Transforms/Instrumentation/EdgeProfiling.cpp +++ b/lib/Transforms/Instrumentation/EdgeProfiling.cpp @@ -33,11 +33,11 @@ namespace { class VISIBILITY_HIDDEN EdgeProfiler : public ModulePass { bool runOnModule(Module &M); public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid EdgeProfiler() : ModulePass((intptr_t)&ID) {} }; - const int EdgeProfiler::ID = 0; + const char EdgeProfiler::ID = 0; RegisterPass<EdgeProfiler> X("insert-edge-profiling", "Insert instrumentation for edge profiling"); } diff --git a/lib/Transforms/Instrumentation/RSProfiling.cpp b/lib/Transforms/Instrumentation/RSProfiling.cpp index 321e3908e0..f19e9b4bbe 100644 --- a/lib/Transforms/Instrumentation/RSProfiling.cpp +++ b/lib/Transforms/Instrumentation/RSProfiling.cpp @@ -69,7 +69,7 @@ namespace { /// measuring framework overhead class VISIBILITY_HIDDEN NullProfilerRS : public RSProfilers { public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid bool isProfiling(Value* v) { return false; } @@ -139,7 +139,7 @@ namespace { /// ProfilerRS - Insert the random sampling framework struct VISIBILITY_HIDDEN ProfilerRS : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid ProfilerRS() : FunctionPass((intptr_t)&ID) {} std::map<Value*, Value*> TransCache; @@ -162,9 +162,9 @@ namespace { "Insert random sampling instrumentation framework"); } -const int RSProfilers::ID = 0; -const int NullProfilerRS::ID = 0; -const int ProfilerRS::ID = 0; +const char RSProfilers::ID = 0; +const char NullProfilerRS::ID = 0; +const char ProfilerRS::ID = 0; //Local utilities static void ReplacePhiPred(BasicBlock* btarget, diff --git a/lib/Transforms/Instrumentation/RSProfiling.h b/lib/Transforms/Instrumentation/RSProfiling.h index 3f7d92f17a..c1250a26af 100644 --- a/lib/Transforms/Instrumentation/RSProfiling.h +++ b/lib/Transforms/Instrumentation/RSProfiling.h @@ -17,7 +17,7 @@ namespace llvm { /// RSProfilers_std - a simple support class for profilers that handles most /// of the work of chaining and tracking inserted code. struct RSProfilers_std : public RSProfilers { - static const int ID; + static const char ID; std::set<Value*> profcode; // Lookup up values in profcode virtual bool isProfiling(Value* v); diff --git a/lib/Transforms/Scalar/ADCE.cpp b/lib/Transforms/Scalar/ADCE.cpp index 75e9d2f61b..c7aae4be6e 100644 --- a/lib/Transforms/Scalar/ADCE.cpp +++ b/lib/Transforms/Scalar/ADCE.cpp @@ -52,7 +52,7 @@ class VISIBILITY_HIDDEN ADCE : public FunctionPass { // The public interface for this class // public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid ADCE() : FunctionPass((intptr_t)&ID) {} // Execute the Aggressive Dead Code Elimination Algorithm @@ -107,7 +107,7 @@ private: } }; - const int ADCE::ID = 0; + const char ADCE::ID = 0; RegisterPass<ADCE> X("adce", "Aggressive Dead Code Elimination"); } // End of anonymous namespace diff --git a/lib/Transforms/Scalar/BasicBlockPlacement.cpp b/lib/Transforms/Scalar/BasicBlockPlacement.cpp index a560d559bd..b8f1d50b69 100644 --- a/lib/Transforms/Scalar/BasicBlockPlacement.cpp +++ b/lib/Transforms/Scalar/BasicBlockPlacement.cpp @@ -41,7 +41,7 @@ STATISTIC(NumMoved, "Number of basic blocks moved"); namespace { struct VISIBILITY_HIDDEN BlockPlacement : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid BlockPlacement() : FunctionPass((intptr_t)&ID) {} virtual bool runOnFunction(Function &F); @@ -73,7 +73,7 @@ namespace { void PlaceBlocks(BasicBlock *BB); }; - const int BlockPlacement::ID = 0; + const char BlockPlacement::ID = 0; RegisterPass<BlockPlacement> X("block-placement", "Profile Guided Basic Block Placement"); } diff --git a/lib/Transforms/Scalar/CodeGenPrepare.cpp b/lib/Transforms/Scalar/CodeGenPrepare.cpp index 738db8027a..a40d1330ad 100644 --- a/lib/Transforms/Scalar/CodeGenPrepare.cpp +++ b/lib/Transforms/Scalar/CodeGenPrepare.cpp @@ -39,7 +39,7 @@ namespace { /// transformation profitability. const TargetLowering *TLI; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid CodeGenPrepare(const TargetLowering *tli = 0) : FunctionPass((intptr_t)&ID), TLI(tli) {} bool runOnFunction(Function &F); @@ -55,7 +55,7 @@ namespace { }; } -const int CodeGenPrepare::ID = 0; +const char CodeGenPrepare::ID = 0; static RegisterPass<CodeGenPrepare> X("codegenprepare", "Optimize for code generation"); diff --git a/lib/Transforms/Scalar/CondPropagate.cpp b/lib/Transforms/Scalar/CondPropagate.cpp index 4f41b1badf..c1dd9edba9 100644 --- a/lib/Transforms/Scalar/CondPropagate.cpp +++ b/lib/Transforms/Scalar/CondPropagate.cpp @@ -31,7 +31,7 @@ STATISTIC(NumSwThread, "Number of CFG edges threaded through switches"); namespace { struct VISIBILITY_HIDDEN CondProp : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid CondProp() : FunctionPass((intptr_t)&ID) {} virtual bool runOnFunction(Function &F); @@ -49,7 +49,7 @@ namespace { void RevectorBlockTo(BasicBlock *FromBB, BasicBlock *ToBB); }; - const int CondProp::ID = 0; + const char CondProp::ID = 0; RegisterPass<CondProp> X("condprop", "Conditional Propagation"); } diff --git a/lib/Transforms/Scalar/ConstantProp.cpp b/lib/Transforms/Scalar/ConstantProp.cpp index 32f5879911..26d32604ad 100644 --- a/lib/Transforms/Scalar/ConstantProp.cpp +++ b/lib/Transforms/Scalar/ConstantProp.cpp @@ -34,7 +34,7 @@ STATISTIC(NumInstKilled, "Number of instructions killed"); namespace { struct VISIBILITY_HIDDEN ConstantPropagation : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid ConstantPropagation() : FunctionPass((intptr_t)&ID) {} bool runOnFunction(Function &F); @@ -44,7 +44,7 @@ namespace { } }; - const int ConstantPropagation::ID = 0; + const char ConstantPropagation::ID = 0; RegisterPass<ConstantPropagation> X("constprop", "Simple constant propagation"); } diff --git a/lib/Transforms/Scalar/CorrelatedExprs.cpp b/lib/Transforms/Scalar/CorrelatedExprs.cpp index 540f62c674..c6f4dd720b 100644 --- a/lib/Transforms/Scalar/CorrelatedExprs.cpp +++ b/lib/Transforms/Scalar/CorrelatedExprs.cpp @@ -225,7 +225,7 @@ namespace { std::map<BasicBlock*, RegionInfo> RegionInfoMap; ETForest *EF; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid CEE() : FunctionPass((intptr_t)&ID) {} virtual bool runOnFunction(Function &F); @@ -288,7 +288,7 @@ namespace { bool SimplifyInstruction(Instruction *Inst, const RegionInfo &RI); }; - const int CEE::ID = 0; + const char CEE::ID = 0; RegisterPass<CEE> X("cee", "Correlated Expression Elimination"); } diff --git a/lib/Transforms/Scalar/DCE.cpp b/lib/Transforms/Scalar/DCE.cpp index 1bfa73d91f..9a8b39f609 100644 --- a/lib/Transforms/Scalar/DCE.cpp +++ b/lib/Transforms/Scalar/DCE.cpp @@ -35,7 +35,7 @@ namespace { // DeadInstElimination pass implementation // struct VISIBILITY_HIDDEN DeadInstElimination : public BasicBlockPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid DeadInstElimination() : BasicBlockPass(intptr_t(&ID)) {} virtual bool runOnBasicBlock(BasicBlock &BB) { bool Changed = false; @@ -53,7 +53,7 @@ namespace { } }; - const int DeadInstElimination::ID = 0; + const char DeadInstElimination::ID = 0; RegisterPass<DeadInstElimination> X("die", "Dead Instruction Elimination"); } @@ -67,7 +67,7 @@ namespace { // DeadCodeElimination pass implementation // struct DCE : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid DCE() : FunctionPass((intptr_t)&ID) {} virtual bool runOnFunction(Function &F); @@ -77,7 +77,7 @@ namespace { } }; - const int DCE::ID = 0; + const char DCE::ID = 0; RegisterPass<DCE> Y("dce", "Dead Code Elimination"); } diff --git a/lib/Transforms/Scalar/DeadStoreElimination.cpp b/lib/Transforms/Scalar/DeadStoreElimination.cpp index 709d1689f8..aef6653402 100644 --- a/lib/Transforms/Scalar/DeadStoreElimination.cpp +++ b/lib/Transforms/Scalar/DeadStoreElimination.cpp @@ -34,7 +34,7 @@ STATISTIC(NumOther , "Number of other instrs removed"); namespace { struct VISIBILITY_HIDDEN DSE : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid DSE() : FunctionPass((intptr_t)&ID) {} virtual bool runOnFunction(Function &F) { @@ -58,7 +58,7 @@ namespace { AU.addPreserved<AliasAnalysis>(); } }; - const int DSE::ID = 0; + const char DSE::ID = 0; RegisterPass<DSE> X("dse", "Dead Store Elimination"); } diff --git a/lib/Transforms/Scalar/GCSE.cpp b/lib/Transforms/Scalar/GCSE.cpp index bf84c937ac..2cf8b64d1e 100644 --- a/lib/Transforms/Scalar/GCSE.cpp +++ b/lib/Transforms/Scalar/GCSE.cpp @@ -37,7 +37,7 @@ STATISTIC(NumArgsRepl , "Number of function arguments replaced " "with constant values"); namespace { struct VISIBILITY_HIDDEN GCSE : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid GCSE() : FunctionPass((intptr_t)&ID) {} virtual bool runOnFunction(Function &F); @@ -54,7 +54,7 @@ namespace { } }; - const int GCSE::ID = 0; + const char GCSE::ID = 0; RegisterPass<GCSE> X("gcse", "Global Common Subexpression Elimination"); } diff --git a/lib/Transforms/Scalar/IndVarSimplify.cpp b/lib/Transforms/Scalar/IndVarSimplify.cpp index 313f811051..c7262a0fb5 100644 --- a/lib/Transforms/Scalar/IndVarSimplify.cpp +++ b/lib/Transforms/Scalar/IndVarSimplify.cpp @@ -69,7 +69,7 @@ namespace { bool Changed; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid IndVarSimplify() : LoopPass((intptr_t)&ID) {} bool runOnLoop(Loop *L, LPPassManager &LPM); @@ -95,7 +95,7 @@ namespace { void DeleteTriviallyDeadInstructions(std::set<Instruction*> &Insts); }; - const int IndVarSimplify::ID = 0; + const char IndVarSimplify::ID = 0; RegisterPass<IndVarSimplify> X("indvars", "Canonicalize Induction Variables"); } diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp index c1bc47d543..8da33c51a4 100644 --- a/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/lib/Transforms/Scalar/InstructionCombining.cpp @@ -76,7 +76,7 @@ namespace { TargetData *TD; bool MustPreserveLCSSA; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid InstCombiner() : FunctionPass((intptr_t)&ID) {} /// AddToWorkList - Add the specified instruction to the worklist if it @@ -361,7 +361,7 @@ namespace { Value *EvaluateInDifferentType(Value *V, const Type *Ty, bool isSigned); }; - const int InstCombiner::ID = 0; + const char InstCombiner::ID = 0; RegisterPass<InstCombiner> X("instcombine", "Combine redundant instructions"); } diff --git a/lib/Transforms/Scalar/LICM.cpp b/lib/Transforms/Scalar/LICM.cpp index 6a16243eba..d3b4353872 100644 --- a/lib/Transforms/Scalar/LICM.cpp +++ b/lib/Transforms/Scalar/LICM.cpp @@ -63,7 +63,7 @@ namespace { cl::desc("Disable memory promotion in LICM pass")); struct VISIBILITY_HIDDEN LICM : public LoopPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid LICM() : LoopPass((intptr_t)&ID) {} virtual bool runOnLoop(Loop *L, LPPassManager &LPM); @@ -204,7 +204,7 @@ namespace { std::map<Value*, AllocaInst*> &Val2AlMap); }; - const int LICM::ID = 0; + const char LICM::ID = 0; RegisterPass<LICM> X("licm", "Loop Invariant Code Motion"); } diff --git a/lib/Transforms/Scalar/LoopRotation.cpp b/lib/Transforms/Scalar/LoopRotation.cpp index 8abd96eb06..b746e1d6fb 100644 --- a/lib/Transforms/Scalar/LoopRotation.cpp +++ b/lib/Transforms/Scalar/LoopRotation.cpp @@ -44,7 +44,7 @@ namespace { class VISIBILITY_HIDDEN LoopRotate : public LoopPass { public: - static const int ID; // Pass ID, replacement for typeid + static const char ID; // Pass ID, replacement for typeid LoopRotate() : LoopPass((intptr_t)&ID) {} // Rotate Loop L as many times as possible. Return true if @@ -94,7 +94,7 @@ namespace { SmallVector<RenameData, MAX_HEADER_SIZE> LoopHeaderInfo; }; - const int LoopRotate::ID = 0; + const char LoopRotate::ID = 0; RegisterPass<LoopRotate> X ("loop-rotate", "Rotate Loops"); } diff --git a/lib/Transforms/Scalar/LoopStrengthReduce.cpp b/lib/Transforms/Scalar/LoopStrengthReduce.cpp index 5f9562b6b3..c728d6e210 100644 --- a/lib/Transforms/Scalar/LoopStrengthReduce.cpp +++ b/lib/Transforms/Scalar/LoopStrengthReduce.cpp @@ -143,7 +143,7 @@ namespace { const TargetLowering *TLI; public: - static const int ID; // Pass ID, replacement for typeid + static const char ID; // Pass ID, replacement for typeid LoopStrengthReduce(const TargetLowering *tli = NULL) : LoopPass((intptr_t)&ID), TLI(tli) { } @@ -188,7 +188,7 @@ private: Loop *L, bool isOnlyStride); void DeleteTriviallyDeadInstructions(std::set<Instruction*> &Insts); }; - const int LoopStrengthReduce::ID = 0; + const char LoopStrengthReduce::ID = 0; RegisterPass<LoopStrengthReduce> X("loop-reduce", "Loop Strength Reduction"); } diff --git a/lib/Transforms/Scalar/LoopUnroll.cpp b/lib/Transforms/Scalar/LoopUnroll.cpp index 0cdef0f8a3..b3671a9f1a 100644 --- a/lib/Transforms/Scalar/LoopUnroll.cpp +++ b/lib/Transforms/Scalar/LoopUnroll.cpp @@ -49,7 +49,7 @@ namespace { class VISIBILITY_HIDDEN LoopUnroll : public LoopPass { LoopInfo *LI; // The current loop information public: - static const int ID; // Pass ID, replacement for typeid + static const char ID; // Pass ID, replacement for typeid LoopUnroll() : LoopPass((intptr_t)&ID) {} bool runOnLoop(Loop *L, LPPassManager &LPM); @@ -66,7 +66,7 @@ namespace { AU.addPreserved<LoopInfo>(); } }; - const int LoopUnroll::ID = 0; + const char LoopUnroll::ID = 0; RegisterPass<LoopUnroll> X("loop-unroll", "Unroll loops"); } diff --git a/lib/Transforms/Scalar/LoopUnswitch.cpp b/lib/Transforms/Scalar/LoopUnswitch.cpp index ce459e708a..b46c29c956 100644 --- a/lib/Transforms/Scalar/LoopUnswitch.cpp +++ b/lib/Transforms/Scalar/LoopUnswitch.cpp @@ -69,7 +69,7 @@ namespace { SmallPtrSet<Value *,8> UnswitchedVals; public: - static const int ID; // Pass ID, replacement for typeid + static const char ID; // Pass ID, replacement for typeid LoopUnswitch() : LoopPass((intptr_t)&ID) {} bool runOnLoop(Loop *L, LPPassManager &LPM); @@ -112,7 +112,7 @@ namespace { std::vector<Instruction*> &Worklist); void RemoveLoopFromHierarchy(Loop *L); }; - const int LoopUnswitch::ID = 0; + const char LoopUnswitch::ID = 0; RegisterPass<LoopUnswitch> X("loop-unswitch", "Unswitch loops"); } diff --git a/lib/Transforms/Scalar/LowerGC.cpp b/lib/Transforms/Scalar/LowerGC.cpp index 93e7e85ab3..9cf3ad1e8c 100644 --- a/lib/Transforms/Scalar/LowerGC.cpp +++ b/lib/Transforms/Scalar/LowerGC.cpp @@ -47,7 +47,7 @@ namespace { /// had zero roots. const Type *MainRootRecordType; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid LowerGC() : FunctionPass((intptr_t)&ID), GCRootInt(0), GCReadInt(0), GCWriteInt(0), GCRead(0), GCWrite(0), RootChain(0), MainRootRecordType(0) {} @@ -58,7 +58,7 @@ namespace { const StructType *getRootRecordType(unsigned NumRoots); }; - const int LowerGC::ID = 0; + const char LowerGC::ID = 0; RegisterPass<LowerGC> X("lowergc", "Lower GC intrinsics, for GCless code generators"); } diff --git a/lib/Transforms/Scalar/LowerPacked.cpp b/lib/Transforms/Scalar/LowerPacked.cpp index 11949dbc67..c80d14a763 100644 --- a/lib/Transforms/Scalar/LowerPacked.cpp +++ b/lib/Transforms/Scalar/LowerPacked.cpp @@ -40,7 +40,7 @@ namespace { class VISIBILITY_HIDDEN LowerPacked : public FunctionPass, public InstVisitor<LowerPacked> { public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid LowerPacked() : FunctionPass((intptr_t)&ID) {} /// @brief Lowers packed operations to scalar operations. @@ -107,7 +107,7 @@ private: std::vector<Instruction*> instrsToRemove; }; -const int LowerPacked::ID = 0; +const char LowerPacked::ID = 0; RegisterPass<LowerPacked> X("lower-packed", "lowers packed operations to operations on smaller packed datatypes"); diff --git a/lib/Transforms/Scalar/PredicateSimplifier.cpp b/lib/Transforms/Scalar/PredicateSimplifier.cpp index ce2741bdce..f9f8713f43 100644 --- a/lib/Transforms/Scalar/PredicateSimplifier.cpp +++ b/lib/Transforms/Scalar/PredicateSimplifier.cpp @@ -1989,7 +1989,7 @@ namespace { std::vector<DominatorTree::Node *> WorkList; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid PredicateSimplifier() : FunctionPass((intptr_t)&ID) {} bool runOnFunction(Function &F); @@ -2377,7 +2377,7 @@ namespace { } } - const int PredicateSimplifier::ID = 0; + const char PredicateSimplifier::ID = 0; RegisterPass<PredicateSimplifier> X("predsimplify", "Predicate Simplifier"); } diff --git a/lib/Transforms/Scalar/Reassociate.cpp b/lib/Transforms/Scalar/Reassociate.cpp index a07b0febeb..da9efac2f3 100644 --- a/lib/Transforms/Scalar/Reassociate.cpp +++ b/lib/Transforms/Scalar/Reassociate.cpp @@ -69,7 +69,7 @@ namespace { std::map<Value*, unsigned> ValueRankMap; bool MadeChange; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid Reassociate() : FunctionPass((intptr_t)&ID) {} bool runOnFunction(Function &F); @@ -92,7 +92,7 @@ namespace { void RemoveDeadBinaryOp(Value *V); }; - const int Reassociate::ID = 0; + const char Reassociate::ID = 0; RegisterPass<Reassociate> X("reassociate", "Reassociate expressions"); } diff --git a/lib/Transforms/Scalar/Reg2Mem.cpp b/lib/Transforms/Scalar/Reg2Mem.cpp index 6abe4dc39e..17f19d7994 100644 --- a/lib/Transforms/Scalar/Reg2Mem.cpp +++ b/lib/Transforms/Scalar/Reg2Mem.cpp @@ -33,7 +33,7 @@ STATISTIC(NumDemoted, "Number of registers demoted"); namespace { struct VISIBILITY_HIDDEN RegToMem : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid RegToMem() : FunctionPass((intptr_t)&ID) {} virtual void getAnalysisUsage(AnalysisUsage &AU) const { @@ -78,7 +78,7 @@ namespace { } }; - const int RegToMem::ID = 0; + const char RegToMem::ID = 0; RegisterPass<RegToMem> X("reg2mem", "Demote all values to stack slots"); } diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp index 4ead2757b4..b90fc405ae 100644 --- a/lib/Transforms/Scalar/SCCP.cpp +++ b/lib/Transforms/Scalar/SCCP.cpp @@ -1334,7 +1334,7 @@ namespace { /// Sparse Conditional Constant Propagator. /// struct VISIBILITY_HIDDEN SCCP : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid SCCP() : FunctionPass((intptr_t)&ID) {} // runOnFunction - Run the Sparse Conditional Constant Propagation @@ -1347,7 +1347,7 @@ namespace { } }; - const int SCCP::ID = 0; + const char SCCP::ID = 0; RegisterPass<SCCP> X("sccp", "Sparse Conditional Constant Propagation"); } // end anonymous namespace @@ -1447,12 +1447,12 @@ namespace { /// Constant Propagation. /// struct VISIBILITY_HIDDEN IPSCCP : public ModulePass { - static const int ID; + static const char ID; IPSCCP() : ModulePass((intptr_t)&ID) {} bool runOnModule(Module &M); }; - const int IPSCCP::ID = 0; + const char IPSCCP::ID = 0; RegisterPass<IPSCCP> Y("ipsccp", "Interprocedural Sparse Conditional Constant Propagation"); } // end anonymous namespace diff --git a/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/lib/Transforms/Scalar/ScalarReplAggregates.cpp index da5488be76..f0faa874b8 100644 --- a/lib/Transforms/Scalar/ScalarReplAggregates.cpp +++ b/lib/Transforms/Scalar/ScalarReplAggregates.cpp @@ -47,7 +47,7 @@ STATISTIC(NumGlobals, "Number of allocas copied from constant global"); namespace { struct VISIBILITY_HIDDEN SROA : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid SROA() : FunctionPass((intptr_t)&ID) {} bool runOnFunction(Function &F); @@ -84,7 +84,7 @@ namespace { static Instruction *isOnlyCopiedFromConstantGlobal(AllocationInst *AI); }; - const int SROA::ID = 0; + const char SROA::ID = 0; RegisterPass<SROA> X("scalarrepl", "Scalar Replacement of Aggregates"); } diff --git a/lib/Transforms/Scalar/SimplifyCFG.cpp b/lib/Transforms/Scalar/SimplifyCFG.cpp index 4a4bcb6eac..b8ebbdbe0e 100644 --- a/lib/Transforms/Scalar/SimplifyCFG.cpp +++ b/lib/Transforms/Scalar/SimplifyCFG.cpp @@ -35,12 +35,12 @@ STATISTIC(NumSimpl, "Number of blocks simplified"); namespace { struct VISIBILITY_HIDDEN CFGSimplifyPass : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid CFGSimplifyPass() : FunctionPass((intptr_t)&ID) {} virtual bool runOnFunction(Function &F); }; - const int CFGSimplifyPass::ID = 0; + const char CFGSimplifyPass::ID = 0; RegisterPass<CFGSimplifyPass> X("simplifycfg", "Simplify the CFG"); } diff --git a/lib/Transforms/Scalar/TailDuplication.cpp b/lib/Transforms/Scalar/TailDuplication.cpp index dcd57ce212..b218628baf 100644 --- a/lib/Transforms/Scalar/TailDuplication.cpp +++ b/lib/Transforms/Scalar/TailDuplication.cpp @@ -43,14 +43,14 @@ namespace { class VISIBILITY_HIDDEN TailDup : public FunctionPass { bool runOnFunction(Function &F); public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid TailDup() : FunctionPass((intptr_t)&ID) {} private: inline bool shouldEliminateUnconditionalBranch(TerminatorInst *TI); inline void eliminateUnconditionalBranch(BranchInst *BI); }; - const int TailDup::ID = 0; + const char TailDup::ID = 0; RegisterPass<TailDup> X("tailduplicate", "Tail Duplication"); } diff --git a/lib/Transforms/Scalar/TailRecursionElimination.cpp b/lib/Transforms/Scalar/TailRecursionElimination.cpp index c75b93015c..056c2a1291 100644 --- a/lib/Transforms/Scalar/TailRecursionElimination.cpp +++ b/lib/Transforms/Scalar/TailRecursionElimination.cpp @@ -67,7 +67,7 @@ STATISTIC(NumAccumAdded, "Number of accumulators introduced"); namespace { struct VISIBILITY_HIDDEN TailCallElim : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid TailCallElim() : FunctionPass((intptr_t)&ID) {} virtual bool runOnFunction(Function &F); @@ -80,7 +80,7 @@ namespace { bool CanMoveAboveCall(Instruction *I, CallInst *CI); Value *CanTransformAccumulatorRecursion(Instruction *I, CallInst *CI); }; - const int TailCallElim::ID = 0; + const char TailCallElim::ID = 0; RegisterPass<TailCallElim> X("tailcallelim", "Tail Call Elimination"); } diff --git a/lib/Transforms/Utils/BreakCriticalEdges.cpp b/lib/Transforms/Utils/BreakCriticalEdges.cpp index 561b71dd2c..67ccbc8214 100644 --- a/lib/Transforms/Utils/BreakCriticalEdges.cpp +++ b/lib/Transforms/Utils/BreakCriticalEdges.cpp @@ -34,7 +34,7 @@ STATISTIC(NumBroken, "Number of blocks inserted"); 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 @@ namespace { } }; - const int BreakCriticalEdges::ID = 0; + const char BreakCriticalEdges::ID = 0; RegisterPass<BreakCriticalEdges> X("break-crit-edges", "Break critical edges in CFG"); } diff --git a/lib/Transforms/Utils/LCSSA.cpp b/lib/Transforms/Utils/LCSSA.cpp index e46e35b3ca..86f6da079c 100644 --- a/lib/Transforms/Utils/LCSSA.cpp +++ b/lib/Transforms/Utils/LCSSA.cpp @@ -47,7 +47,7 @@ STATISTIC(NumLCSSA, "Number of live out of a loop variables"); 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 @@ namespace { } }; - const int LCSSA::ID = 0; + const char LCSSA::ID = 0; RegisterPass<LCSSA> X("lcssa", "Loop-Closed SSA Form Pass"); } diff --git a/lib/Transforms/Utils/LoopSimplify.cpp b/lib/Transforms/Utils/LoopSimplify.cpp index cea0bca939..c0227e10a6 100644 --- a/lib/Transforms/Utils/LoopSimplify.cpp +++ b/lib/Transforms/Utils/LoopSimplify.cpp @@ -54,7 +54,7 @@ STATISTIC(NumNested , "Number of nested loops split out"); 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 @@ namespace { std::vector<BasicBlock*> &PredBlocks); }; - const int LoopSimplify::ID = 0; + const char LoopSimplify::ID = 0; RegisterPass<LoopSimplify> X("loopsimplify", "Canonicalize natural loops", true); } diff --git a/lib/Transforms/Utils/LowerAllocations.cpp b/lib/Transforms/Utils/LowerAllocations.cpp index 0ecc775c35..2d0258e751 100644 --- a/lib/Transforms/Utils/LowerAllocations.cpp +++ b/lib/Transforms/Utils/LowerAllocations.cpp @@ -36,7 +36,7 @@ namespace { 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 @@ namespace { bool runOnBasicBlock(BasicBlock &BB); }; - const int LowerAllocations::ID = 0; + const char LowerAllocations::ID = 0; RegisterPass<LowerAllocations> X("lowerallocs", "Lower allocations from instructions to calls"); } diff --git a/lib/Transforms/Utils/LowerInvoke.cpp b/lib/Transforms/Utils/LowerInvoke.cpp index 3f8d06f31a..7c6070ea81 100644 --- a/lib/Transforms/Utils/LowerInvoke.cpp +++ b/lib/Transforms/Utils/LowerInvoke.cpp @@ -75,7 +75,7 @@ namespace { 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 @@ namespace { 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"); } diff --git a/lib/Transforms/Utils/LowerSelect.cpp b/lib/Transforms/Utils/LowerSelect.cpp index fda26c9e1f..2a65fe7940 100644 --- a/lib/Transforms/Utils/LowerSelect.cpp +++ b/lib/Transforms/Utils/LowerSelect.cpp @@ -33,7 +33,7 @@ namespace { 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 @@ namespace { bool runOnFunction(Function &F); }; - const int LowerSelect::ID = 0; + const char LowerSelect::ID = 0; RegisterPass<LowerSelect> X("lowerselect", "Lower select instructions to branches"); } diff --git a/lib/Transforms/Utils/LowerSwitch.cpp b/lib/Transforms/Utils/LowerSwitch.cpp index 482ada9b6a..6a6833fa78 100644 --- a/lib/Transforms/Utils/LowerSwitch.cpp +++ b/lib/Transforms/Utils/LowerSwitch.cpp @@ -30,7 +30,7 @@ namespace { /// 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 @@ namespace { } }; - const int LowerSwitch::ID = 0; + const char LowerSwitch::ID = 0; RegisterPass<LowerSwitch> X("lowerswitch", "Lower SwitchInst's to branches"); } diff --git a/lib/Transforms/Utils/Mem2Reg.cpp b/lib/Transforms/Utils/Mem2Reg.cpp index 37bc318545..16fd07b776 100644 --- a/lib/Transforms/Utils/Mem2Reg.cpp +++ b/lib/Transforms/Utils/Mem2Reg.cpp @@ -27,7 +27,7 @@ STATISTIC(NumPromoted, "Number of alloca's promoted"); 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 @@ namespace { } }; - const int PromotePass::ID = 0; + const char PromotePass::ID = 0; RegisterPass<PromotePass> X("mem2reg", "Promote Memory to Register"); } // end of anonymous namespace diff --git a/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp b/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp index f7dd1139ca..aef64b4ad8 100644 --- a/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp +++ b/lib/Transforms/Utils/UnifyFunctionExitNodes.cpp @@ -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"); |