From 3e15bf33e024b9df9e89351a165acfdb1dde51ed Mon Sep 17 00:00:00 2001 From: Devang Patel Date: Wed, 2 May 2007 21:39:20 +0000 Subject: 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36652 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/WritingAnLLVMPass.html | 6 +++--- include/llvm/Analysis/AliasAnalysis.h | 2 +- include/llvm/Analysis/CallGraph.h | 2 +- include/llvm/Analysis/Dominators.h | 6 +++--- include/llvm/Analysis/FindUsedTypes.h | 2 +- include/llvm/Analysis/IntervalPartition.h | 2 +- include/llvm/Analysis/LoopInfo.h | 2 +- include/llvm/Analysis/LoopPass.h | 2 +- include/llvm/Analysis/PostDominators.h | 6 +++--- include/llvm/Analysis/ProfileInfo.h | 2 +- include/llvm/Analysis/ScalarEvolution.h | 2 +- include/llvm/Analysis/ValueNumbering.h | 2 +- include/llvm/Assembly/PrintModulePass.h | 4 ++-- include/llvm/Bytecode/WriteBytecodePass.h | 2 +- include/llvm/CodeGen/AsmPrinter.h | 2 +- include/llvm/CodeGen/LiveIntervalAnalysis.h | 2 +- include/llvm/CodeGen/LiveVariables.h | 2 +- include/llvm/CodeGen/MachineModuleInfo.h | 2 +- include/llvm/CodeGen/SelectionDAGISel.h | 2 +- include/llvm/PassManagers.h | 2 +- include/llvm/Target/TargetData.h | 2 +- include/llvm/Transforms/RSProfiling.h | 2 +- include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h | 2 +- lib/Analysis/AliasAnalysis.cpp | 2 +- lib/Analysis/AliasAnalysisCounter.cpp | 4 ++-- lib/Analysis/AliasAnalysisEvaluator.cpp | 4 ++-- lib/Analysis/AliasDebugger.cpp | 4 ++-- lib/Analysis/AliasSetTracker.cpp | 4 ++-- lib/Analysis/BasicAliasAnalysis.cpp | 8 ++++---- lib/Analysis/CFGPrinter.cpp | 8 ++++---- lib/Analysis/IPA/Andersens.cpp | 4 ++-- lib/Analysis/IPA/CallGraph.cpp | 7 +++---- lib/Analysis/IPA/CallGraphSCCPass.cpp | 4 ++-- lib/Analysis/IPA/FindUsedTypes.cpp | 2 +- lib/Analysis/IPA/GlobalsModRef.cpp | 4 ++-- lib/Analysis/InstCount.cpp | 4 ++-- lib/Analysis/IntervalPartition.cpp | 2 +- lib/Analysis/LoadValueNumbering.cpp | 4 ++-- lib/Analysis/LoopInfo.cpp | 2 +- lib/Analysis/LoopPass.cpp | 2 +- lib/Analysis/PostDominators.cpp | 6 +++--- lib/Analysis/ProfileInfo.cpp | 6 +++--- lib/Analysis/ProfileInfoLoaderPass.cpp | 4 ++-- lib/Analysis/ScalarEvolution.cpp | 2 +- lib/Analysis/ValueNumbering.cpp | 6 +++--- lib/Bytecode/Writer/Writer.cpp | 2 +- lib/CodeGen/AsmPrinter.cpp | 2 +- lib/CodeGen/BranchFolding.cpp | 4 ++-- lib/CodeGen/ELFWriter.cpp | 2 +- lib/CodeGen/ELFWriter.h | 2 +- lib/CodeGen/LiveIntervalAnalysis.cpp | 2 +- lib/CodeGen/LiveVariables.cpp | 2 +- lib/CodeGen/MachOWriter.cpp | 2 +- lib/CodeGen/MachOWriter.h | 2 +- lib/CodeGen/MachineFunction.cpp | 8 ++++---- lib/CodeGen/MachineModuleInfo.cpp | 6 +++--- lib/CodeGen/PHIElimination.cpp | 4 ++-- lib/CodeGen/PrologEpilogInserter.cpp | 4 ++-- lib/CodeGen/RegAllocLinearScan.cpp | 4 ++-- lib/CodeGen/RegAllocLocal.cpp | 4 ++-- lib/CodeGen/RegAllocSimple.cpp | 4 ++-- lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 2 +- lib/CodeGen/TwoAddressInstructionPass.cpp | 4 ++-- lib/CodeGen/UnreachableBlockElim.cpp | 4 ++-- lib/Target/ARM/ARMConstantIslandPass.cpp | 4 ++-- lib/Target/ARM/ARMLoadStoreOptimizer.cpp | 4 ++-- lib/Target/Alpha/AlphaBranchSelector.cpp | 4 ++-- lib/Target/Alpha/AlphaCodeEmitter.cpp | 4 ++-- lib/Target/Alpha/AlphaLLRP.cpp | 4 ++-- lib/Target/CBackend/CBackend.cpp | 8 ++++---- lib/Target/IA64/IA64Bundling.cpp | 4 ++-- lib/Target/MSIL/MSILWriter.cpp | 4 ++-- lib/Target/MSIL/MSILWriter.h | 4 ++-- lib/Target/PowerPC/PPCBranchSelector.cpp | 4 ++-- lib/Target/PowerPC/PPCCodeEmitter.cpp | 4 ++-- lib/Target/Sparc/DelaySlotFiller.cpp | 4 ++-- lib/Target/Sparc/FPMover.cpp | 4 ++-- lib/Target/TargetData.cpp | 2 +- lib/Target/X86/X86CodeEmitter.cpp | 4 ++-- lib/Target/X86/X86FloatingPoint.cpp | 4 ++-- lib/Transforms/Hello/Hello.cpp | 8 ++++---- lib/Transforms/IPO/ArgumentPromotion.cpp | 4 ++-- lib/Transforms/IPO/ConstantMerge.cpp | 4 ++-- lib/Transforms/IPO/DeadArgumentElimination.cpp | 8 ++++---- lib/Transforms/IPO/DeadTypeElimination.cpp | 4 ++-- lib/Transforms/IPO/ExtractFunction.cpp | 4 ++-- lib/Transforms/IPO/GlobalDCE.cpp | 4 ++-- lib/Transforms/IPO/GlobalOpt.cpp | 4 ++-- lib/Transforms/IPO/IPConstantPropagation.cpp | 4 ++-- lib/Transforms/IPO/IndMemRemoval.cpp | 4 ++-- lib/Transforms/IPO/InlineSimple.cpp | 4 ++-- lib/Transforms/IPO/Inliner.cpp | 2 +- lib/Transforms/IPO/Inliner.h | 2 +- lib/Transforms/IPO/Internalize.cpp | 4 ++-- lib/Transforms/IPO/LoopExtractor.cpp | 12 ++++++------ lib/Transforms/IPO/LowerSetJmp.cpp | 4 ++-- lib/Transforms/IPO/PruneEH.cpp | 4 ++-- lib/Transforms/IPO/RaiseAllocations.cpp | 4 ++-- lib/Transforms/IPO/SimplifyLibCalls.cpp | 4 ++-- lib/Transforms/IPO/StripDeadPrototypes.cpp | 4 ++-- lib/Transforms/IPO/StripSymbols.cpp | 4 ++-- lib/Transforms/Instrumentation/BlockProfiling.cpp | 8 ++++---- lib/Transforms/Instrumentation/EdgeProfiling.cpp | 4 ++-- lib/Transforms/Instrumentation/RSProfiling.cpp | 10 +++++----- lib/Transforms/Instrumentation/RSProfiling.h | 2 +- lib/Transforms/Scalar/ADCE.cpp | 4 ++-- lib/Transforms/Scalar/BasicBlockPlacement.cpp | 4 ++-- lib/Transforms/Scalar/CodeGenPrepare.cpp | 4 ++-- lib/Transforms/Scalar/CondPropagate.cpp | 4 ++-- lib/Transforms/Scalar/ConstantProp.cpp | 4 ++-- lib/Transforms/Scalar/CorrelatedExprs.cpp | 4 ++-- lib/Transforms/Scalar/DCE.cpp | 8 ++++---- lib/Transforms/Scalar/DeadStoreElimination.cpp | 4 ++-- lib/Transforms/Scalar/GCSE.cpp | 4 ++-- lib/Transforms/Scalar/IndVarSimplify.cpp | 4 ++-- lib/Transforms/Scalar/InstructionCombining.cpp | 4 ++-- lib/Transforms/Scalar/LICM.cpp | 4 ++-- lib/Transforms/Scalar/LoopRotation.cpp | 4 ++-- lib/Transforms/Scalar/LoopStrengthReduce.cpp | 4 ++-- lib/Transforms/Scalar/LoopUnroll.cpp | 4 ++-- lib/Transforms/Scalar/LoopUnswitch.cpp | 4 ++-- lib/Transforms/Scalar/LowerGC.cpp | 4 ++-- lib/Transforms/Scalar/LowerPacked.cpp | 4 ++-- lib/Transforms/Scalar/PredicateSimplifier.cpp | 4 ++-- lib/Transforms/Scalar/Reassociate.cpp | 4 ++-- lib/Transforms/Scalar/Reg2Mem.cpp | 4 ++-- lib/Transforms/Scalar/SCCP.cpp | 8 ++++---- lib/Transforms/Scalar/ScalarReplAggregates.cpp | 4 ++-- lib/Transforms/Scalar/SimplifyCFG.cpp | 4 ++-- lib/Transforms/Scalar/TailDuplication.cpp | 4 ++-- lib/Transforms/Scalar/TailRecursionElimination.cpp | 4 ++-- lib/Transforms/Utils/BreakCriticalEdges.cpp | 4 ++-- lib/Transforms/Utils/LCSSA.cpp | 4 ++-- lib/Transforms/Utils/LoopSimplify.cpp | 4 ++-- lib/Transforms/Utils/LowerAllocations.cpp | 4 ++-- lib/Transforms/Utils/LowerInvoke.cpp | 4 ++-- lib/Transforms/Utils/LowerSelect.cpp | 4 ++-- lib/Transforms/Utils/LowerSwitch.cpp | 4 ++-- lib/Transforms/Utils/Mem2Reg.cpp | 4 ++-- lib/Transforms/Utils/UnifyFunctionExitNodes.cpp | 2 +- lib/VMCore/AsmWriter.cpp | 4 ++-- lib/VMCore/Dominators.cpp | 6 +++--- lib/VMCore/PassManager.cpp | 18 +++++++++--------- lib/VMCore/Verifier.cpp | 4 ++-- tools/bugpoint/ExtractFunction.cpp | 4 ++-- tools/bugpoint/TestPasses.cpp | 8 ++++---- tools/opt/AnalysisWrappers.cpp | 8 ++++---- tools/opt/GraphPrinters.cpp | 4 ++-- tools/opt/PrintSCC.cpp | 8 ++++---- tools/opt/opt.cpp | 12 ++++++------ 150 files changed, 312 insertions(+), 313 deletions(-) diff --git a/docs/WritingAnLLVMPass.html b/docs/WritingAnLLVMPass.html index 13849d0dba..77b059989c 100644 --- a/docs/WritingAnLLVMPass.html +++ b/docs/WritingAnLLVMPass.html @@ -263,7 +263,7 @@ href="#FunctionPass">FunctionPass's operate a function at a time.

-     static const int ID;
+     static const char ID;
      Hello() : FunctionPass((intptr_t)&ID) {}

@@ -285,7 +285,7 @@ to do our thing, so we just print out our message with the name of each function.

-  const int Hello::ID = 0;
+  const char Hello::ID = 0;

We initialize pass ID here. LLVM uses ID's address to identify pass so @@ -311,7 +311,7 @@ argument "hello", and a name "Hello World Pass".

namespace { struct Hello : public FunctionPass { - static const int ID; + static const char ID; Hello() : FunctionPass((intptr_t)&ID) {} virtual bool runOnFunction(Function &F) { diff --git a/include/llvm/Analysis/AliasAnalysis.h b/include/llvm/Analysis/AliasAnalysis.h index d61c886e7c..92a30d8c60 100644 --- a/include/llvm/Analysis/AliasAnalysis.h +++ b/include/llvm/Analysis/AliasAnalysis.h @@ -61,7 +61,7 @@ protected: virtual void getAnalysisUsage(AnalysisUsage &AU) const; public: - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo AliasAnalysis() : TD(0), AA(0) {} virtual ~AliasAnalysis(); // We want to be subclassed diff --git a/include/llvm/Analysis/CallGraph.h b/include/llvm/Analysis/CallGraph.h index cd27e318cd..5225a89b78 100644 --- a/include/llvm/Analysis/CallGraph.h +++ b/include/llvm/Analysis/CallGraph.h @@ -73,7 +73,7 @@ protected: FunctionMapTy FunctionMap; // Map from a function to its node public: - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo //===--------------------------------------------------------------------- // Accessors... // diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h index b172b792fc..0be0bb06ce 100644 --- a/include/llvm/Analysis/Dominators.h +++ b/include/llvm/Analysis/Dominators.h @@ -208,7 +208,7 @@ public: /// class DominatorTree : public DominatorTreeBase { public: - static const int ID; // Pass ID, replacement for typeid + static const char ID; // Pass ID, replacement for typeid DominatorTree() : DominatorTreeBase((intptr_t)&ID, false) {} BasicBlock *getRoot() const { @@ -399,7 +399,7 @@ protected: class ETForest : public ETForestBase { public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid ETForest() : ETForestBase((intptr_t)&ID, false) {} @@ -477,7 +477,7 @@ public: /// class DominanceFrontier : public DominanceFrontierBase { public: - static const int ID; // Pass ID, replacement for typeid + static const char ID; // Pass ID, replacement for typeid DominanceFrontier() : DominanceFrontierBase((intptr_t)& ID, false) {} diff --git a/include/llvm/Analysis/FindUsedTypes.h b/include/llvm/Analysis/FindUsedTypes.h index de892f1b9c..9c83e41d24 100644 --- a/include/llvm/Analysis/FindUsedTypes.h +++ b/include/llvm/Analysis/FindUsedTypes.h @@ -24,7 +24,7 @@ class Type; class FindUsedTypes : public ModulePass { std::set UsedTypes; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid FindUsedTypes() : ModulePass((intptr_t)&ID) {} /// getTypes - After the pass has been run, return the set containing all of diff --git a/include/llvm/Analysis/IntervalPartition.h b/include/llvm/Analysis/IntervalPartition.h index 07f054b131..886450ff61 100644 --- a/include/llvm/Analysis/IntervalPartition.h +++ b/include/llvm/Analysis/IntervalPartition.h @@ -45,7 +45,7 @@ class IntervalPartition : public FunctionPass { std::vector Intervals; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid IntervalPartition() : FunctionPass((intptr_t)&ID), RootInterval(0) {} diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h index 8e38c07a47..08eca1b517 100644 --- a/include/llvm/Analysis/LoopInfo.h +++ b/include/llvm/Analysis/LoopInfo.h @@ -241,7 +241,7 @@ class LoopInfo : public FunctionPass { std::vector TopLevelLoops; friend class Loop; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid LoopInfo() : FunctionPass((intptr_t)&ID) {} ~LoopInfo() { releaseMemory(); } diff --git a/include/llvm/Analysis/LoopPass.h b/include/llvm/Analysis/LoopPass.h index 24e61435ff..70fabfd1ba 100644 --- a/include/llvm/Analysis/LoopPass.h +++ b/include/llvm/Analysis/LoopPass.h @@ -68,7 +68,7 @@ class LoopPass : public Pass { class LPPassManager : public FunctionPass, public PMDataManager { public: - static const int ID; + static const char ID; LPPassManager(int Depth); /// run - Execute all of the passes scheduled for execution. Keep track of diff --git a/include/llvm/Analysis/PostDominators.h b/include/llvm/Analysis/PostDominators.h index 793c7f4889..161478c872 100644 --- a/include/llvm/Analysis/PostDominators.h +++ b/include/llvm/Analysis/PostDominators.h @@ -22,7 +22,7 @@ namespace llvm { /// compute the a post-dominator tree. /// struct PostDominatorTree : public DominatorTreeBase { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid PostDominatorTree() : DominatorTreeBase((intptr_t)&ID, true) {} @@ -54,7 +54,7 @@ private: /// PostETForest Class - Concrete subclass of ETForestBase that is used to /// compute a forwards post-dominator ET-Forest. struct PostETForest : public ETForestBase { - static const int ID; + static const char ID; PostETForest() : ETForestBase((intptr_t)&ID, true) {} virtual void getAnalysisUsage(AnalysisUsage &AU) const { @@ -79,7 +79,7 @@ struct PostETForest : public ETForestBase { /// used to compute the a post-dominance frontier. /// struct PostDominanceFrontier : public DominanceFrontierBase { - static const int ID; + static const char ID; PostDominanceFrontier() : DominanceFrontierBase((intptr_t) &ID, true) {} diff --git a/include/llvm/Analysis/ProfileInfo.h b/include/llvm/Analysis/ProfileInfo.h index dc17ac1664..c8c3055bf6 100644 --- a/include/llvm/Analysis/ProfileInfo.h +++ b/include/llvm/Analysis/ProfileInfo.h @@ -38,7 +38,7 @@ namespace llvm { // entered. std::map, unsigned> EdgeCounts; public: - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo virtual ~ProfileInfo(); // We want to be subclassed //===------------------------------------------------------------------===// diff --git a/include/llvm/Analysis/ScalarEvolution.h b/include/llvm/Analysis/ScalarEvolution.h index 6b05714358..72fdd9f7d7 100644 --- a/include/llvm/Analysis/ScalarEvolution.h +++ b/include/llvm/Analysis/ScalarEvolution.h @@ -197,7 +197,7 @@ namespace llvm { class ScalarEvolution : public FunctionPass { void *Impl; // ScalarEvolution uses the pimpl pattern public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid ScalarEvolution() : FunctionPass((intptr_t)&ID), Impl(0) {} /// getSCEV - Return a SCEV expression handle for the full generality of the diff --git a/include/llvm/Analysis/ValueNumbering.h b/include/llvm/Analysis/ValueNumbering.h index 9d1aeb564d..f4e7da9143 100644 --- a/include/llvm/Analysis/ValueNumbering.h +++ b/include/llvm/Analysis/ValueNumbering.h @@ -29,7 +29,7 @@ class Value; class Instruction; struct ValueNumbering { - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo virtual ~ValueNumbering(); // We want to be subclassed /// getEqualNumberNodes - Return nodes with the same value number as the diff --git a/include/llvm/Assembly/PrintModulePass.h b/include/llvm/Assembly/PrintModulePass.h index 4da55484ee..c769c13037 100644 --- a/include/llvm/Assembly/PrintModulePass.h +++ b/include/llvm/Assembly/PrintModulePass.h @@ -28,7 +28,7 @@ class PrintModulePass : public ModulePass { OStream *Out; // ostream to print on bool DeleteStream; // Delete the ostream in our dtor? public: - static const int ID; + static const char ID; PrintModulePass() : ModulePass((intptr_t)&ID), Out(&cerr), DeleteStream(false) {} PrintModulePass(OStream *o, bool DS = false) : ModulePass((intptr_t)&ID), Out(o), DeleteStream(DS) {} @@ -52,7 +52,7 @@ class PrintFunctionPass : public FunctionPass { OStream *Out; // ostream to print on bool DeleteStream; // Delete the ostream in our dtor? public: - static const int ID; + static const char ID; PrintFunctionPass() : FunctionPass((intptr_t)&ID), Banner(""), Out(&cerr), DeleteStream(false) {} PrintFunctionPass(const std::string &B, OStream *o = &cout, diff --git a/include/llvm/Bytecode/WriteBytecodePass.h b/include/llvm/Bytecode/WriteBytecodePass.h index 5c21ccded5..924a1ff22f 100644 --- a/include/llvm/Bytecode/WriteBytecodePass.h +++ b/include/llvm/Bytecode/WriteBytecodePass.h @@ -26,7 +26,7 @@ class WriteBytecodePass : public ModulePass { bool DeleteStream; bool CompressFile; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid WriteBytecodePass() : ModulePass((intptr_t) &ID), Out(&cout), DeleteStream(false), CompressFile(false) {} diff --git a/include/llvm/CodeGen/AsmPrinter.h b/include/llvm/CodeGen/AsmPrinter.h index 3a5418d937..9703e2e220 100644 --- a/include/llvm/CodeGen/AsmPrinter.h +++ b/include/llvm/CodeGen/AsmPrinter.h @@ -34,7 +34,7 @@ namespace llvm { /// AsmPrinter - This class is intended to be used as a driving class for all /// asm writers. class AsmPrinter : public MachineFunctionPass { - static const int ID; + static const char ID; /// FunctionNumber - This provides a unique ID for each function emitted in /// this translation unit. It is autoincremented by SetupMachineFunction, diff --git a/include/llvm/CodeGen/LiveIntervalAnalysis.h b/include/llvm/CodeGen/LiveIntervalAnalysis.h index 3ea0272425..c77edf82a3 100644 --- a/include/llvm/CodeGen/LiveIntervalAnalysis.h +++ b/include/llvm/CodeGen/LiveIntervalAnalysis.h @@ -65,7 +65,7 @@ namespace llvm { BitVector JoinedLIs; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid LiveIntervals() : MachineFunctionPass((intptr_t)&ID) {} struct CopyRec { diff --git a/include/llvm/CodeGen/LiveVariables.h b/include/llvm/CodeGen/LiveVariables.h index ce377cd2cf..198ce751b9 100644 --- a/include/llvm/CodeGen/LiveVariables.h +++ b/include/llvm/CodeGen/LiveVariables.h @@ -40,7 +40,7 @@ class MRegisterInfo; class LiveVariables : public MachineFunctionPass { public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid LiveVariables() : MachineFunctionPass((intptr_t)&ID) {} /// VarInfo - This represents the regions where a virtual register is live in diff --git a/include/llvm/CodeGen/MachineModuleInfo.h b/include/llvm/CodeGen/MachineModuleInfo.h index c23916def9..791b866948 100644 --- a/include/llvm/CodeGen/MachineModuleInfo.h +++ b/include/llvm/CodeGen/MachineModuleInfo.h @@ -1022,7 +1022,7 @@ private: std::vector TypeInfos; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid MachineModuleInfo(); ~MachineModuleInfo(); diff --git a/include/llvm/CodeGen/SelectionDAGISel.h b/include/llvm/CodeGen/SelectionDAGISel.h index f363daf9e4..5682cfd533 100644 --- a/include/llvm/CodeGen/SelectionDAGISel.h +++ b/include/llvm/CodeGen/SelectionDAGISel.h @@ -41,7 +41,7 @@ public: MachineBasicBlock *BB; std::vector TopOrder; unsigned DAGSize; - static const int ID; + static const char ID; explicit SelectionDAGISel(TargetLowering &tli) : FunctionPass((intptr_t)&ID), TLI(tli), DAGSize(0) {} diff --git a/include/llvm/PassManagers.h b/include/llvm/PassManagers.h index 81e89a7ff5..7716b6abe8 100644 --- a/include/llvm/PassManagers.h +++ b/include/llvm/PassManagers.h @@ -336,7 +336,7 @@ private: class FPPassManager : public ModulePass, public PMDataManager { public: - static const int ID; + static const char ID; explicit FPPassManager(int Depth) : ModulePass((intptr_t)&ID), PMDataManager(Depth) { } diff --git a/include/llvm/Target/TargetData.h b/include/llvm/Target/TargetData.h index bfc41b1640..50cfab1236 100644 --- a/include/llvm/Target/TargetData.h +++ b/include/llvm/Target/TargetData.h @@ -202,7 +202,7 @@ public: /// requested alignment (if the global has one). unsigned getPreferredAlignmentLog(const GlobalVariable *GV) const; - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid }; /// StructLayout - used to lazily calculate structure layout information for a diff --git a/include/llvm/Transforms/RSProfiling.h b/include/llvm/Transforms/RSProfiling.h index 900d147f7d..96554c5904 100644 --- a/include/llvm/Transforms/RSProfiling.h +++ b/include/llvm/Transforms/RSProfiling.h @@ -23,7 +23,7 @@ namespace llvm { /// this interface are expected to chain to other implementations, such that /// multiple profilers can be support simultaniously. struct RSProfilers : public ModulePass { - static const int ID; // Pass identification, replacement for typeinfo + static const char ID; // Pass identification, replacement for typeinfo RSProfilers() : ModulePass((intptr_t)&ID) {} /// isProfiling - This method returns true if the value passed it was diff --git a/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h b/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h index c120acce6b..d107c93f51 100644 --- a/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h +++ b/include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h @@ -25,7 +25,7 @@ namespace llvm { struct UnifyFunctionExitNodes : public FunctionPass { BasicBlock *ReturnBlock, *UnwindBlock, *UnreachableBlock; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid UnifyFunctionExitNodes() : FunctionPass((intptr_t)&ID), ReturnBlock(0), UnwindBlock(0) {} diff --git a/lib/Analysis/AliasAnalysis.cpp b/lib/Analysis/AliasAnalysis.cpp index ab29e4ebb4..32d2bb6b36 100644 --- a/lib/Analysis/AliasAnalysis.cpp +++ b/lib/Analysis/AliasAnalysis.cpp @@ -36,7 +36,7 @@ using namespace llvm; namespace { RegisterAnalysisGroup Z("Alias Analysis"); } -const int AliasAnalysis::ID = 0; +const char AliasAnalysis::ID = 0; //===----------------------------------------------------------------------===// // Default chaining methods diff --git a/lib/Analysis/AliasAnalysisCounter.cpp b/lib/Analysis/AliasAnalysisCounter.cpp index ee1980fc4c..313f4c3c5b 100644 --- a/lib/Analysis/AliasAnalysisCounter.cpp +++ b/lib/Analysis/AliasAnalysisCounter.cpp @@ -34,7 +34,7 @@ namespace { const char *Name; Module *M; public: - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo AliasAnalysisCounter() : ModulePass((intptr_t) &ID) { No = May = Must = 0; NoMR = JustRef = JustMod = MR = 0; @@ -108,7 +108,7 @@ namespace { } }; - const int AliasAnalysisCounter::ID = 0; + const char AliasAnalysisCounter::ID = 0; RegisterPass X("count-aa", "Count Alias Analysis Query Responses"); RegisterAnalysisGroup Y(X); diff --git a/lib/Analysis/AliasAnalysisEvaluator.cpp b/lib/Analysis/AliasAnalysisEvaluator.cpp index f2631cb8ba..34d984d7ae 100644 --- a/lib/Analysis/AliasAnalysisEvaluator.cpp +++ b/lib/Analysis/AliasAnalysisEvaluator.cpp @@ -50,7 +50,7 @@ namespace { unsigned NoModRef, Mod, Ref, ModRef; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid AAEval() : FunctionPass((intptr_t)&ID) {} virtual void getAnalysisUsage(AnalysisUsage &AU) const { @@ -73,7 +73,7 @@ namespace { bool doFinalization(Module &M); }; - const int AAEval::ID = 0; + const char AAEval::ID = 0; RegisterPass X("aa-eval", "Exhaustive Alias Analysis Precision Evaluator"); } diff --git a/lib/Analysis/AliasDebugger.cpp b/lib/Analysis/AliasDebugger.cpp index a4df97a196..14526a279d 100644 --- a/lib/Analysis/AliasDebugger.cpp +++ b/lib/Analysis/AliasDebugger.cpp @@ -40,7 +40,7 @@ namespace { std::set Vals; public: - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo AliasDebugger() : ModulePass((intptr_t)&ID) {} bool runOnModule(Module &M) { @@ -122,7 +122,7 @@ namespace { }; - const int AliasDebugger::ID = 0; + const char AliasDebugger::ID = 0; RegisterPass X("debug-aa", "AA use debugger"); RegisterAnalysisGroup Y(X); } diff --git a/lib/Analysis/AliasSetTracker.cpp b/lib/Analysis/AliasSetTracker.cpp index 90c90fe58f..79d21985da 100644 --- a/lib/Analysis/AliasSetTracker.cpp +++ b/lib/Analysis/AliasSetTracker.cpp @@ -555,7 +555,7 @@ namespace { class VISIBILITY_HIDDEN AliasSetPrinter : public FunctionPass { AliasSetTracker *Tracker; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid AliasSetPrinter() : FunctionPass((intptr_t)&ID) {} virtual void getAnalysisUsage(AnalysisUsage &AU) const { @@ -573,6 +573,6 @@ namespace { return false; } }; - const int AliasSetPrinter::ID = 0; + const char AliasSetPrinter::ID = 0; RegisterPass X("print-alias-sets", "Alias Set Printer"); } diff --git a/lib/Analysis/BasicAliasAnalysis.cpp b/lib/Analysis/BasicAliasAnalysis.cpp index b1369a2920..1b728186ff 100644 --- a/lib/Analysis/BasicAliasAnalysis.cpp +++ b/lib/Analysis/BasicAliasAnalysis.cpp @@ -36,7 +36,7 @@ namespace { /// such it doesn't follow many of the rules that other alias analyses must. /// struct VISIBILITY_HIDDEN NoAA : public ImmutablePass, public AliasAnalysis { - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo NoAA() : ImmutablePass((intptr_t)&ID) {} virtual void getAnalysisUsage(AnalysisUsage &AU) const { @@ -77,7 +77,7 @@ namespace { }; // Register this pass... - const int NoAA::ID = 0; + const char NoAA::ID = 0; RegisterPass U("no-aa", "No Alias Analysis (always returns 'may' alias)"); @@ -92,7 +92,7 @@ namespace { /// Because it doesn't chain to a previous alias analysis (like -no-aa), it /// derives from the NoAA class. struct VISIBILITY_HIDDEN BasicAliasAnalysis : public NoAA { - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo AliasResult alias(const Value *V1, unsigned V1Size, const Value *V2, unsigned V2Size); @@ -124,7 +124,7 @@ namespace { }; // Register this pass... - const int BasicAliasAnalysis::ID = 0; + const char BasicAliasAnalysis::ID = 0; RegisterPass X("basicaa", "Basic Alias Analysis (default AA impl)"); diff --git a/lib/Analysis/CFGPrinter.cpp b/lib/Analysis/CFGPrinter.cpp index 6154460375..13ed16b09a 100644 --- a/lib/Analysis/CFGPrinter.cpp +++ b/lib/Analysis/CFGPrinter.cpp @@ -91,7 +91,7 @@ struct DOTGraphTraits : public DefaultDOTGraphTraits { namespace { struct VISIBILITY_HIDDEN CFGPrinter : public FunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid CFGPrinter() : FunctionPass((intptr_t)&ID) {} virtual bool runOnFunction(Function &F) { @@ -114,12 +114,12 @@ namespace { } }; - const int CFGPrinter::ID = 0; + const char CFGPrinter::ID = 0; RegisterPass P1("print-cfg", "Print CFG of function to 'dot' file"); struct VISIBILITY_HIDDEN CFGOnlyPrinter : public CFGPrinter { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid virtual bool runOnFunction(Function &F) { bool OldCFGOnly = CFGOnly; CFGOnly = true; @@ -134,7 +134,7 @@ namespace { } }; - const int CFGOnlyPrinter::ID = 0; + const char CFGOnlyPrinter::ID = 0; RegisterPass P2("print-cfg-only", "Print CFG of function to 'dot' file (with no function bodies)"); diff --git a/lib/Analysis/IPA/Andersens.cpp b/lib/Analysis/IPA/Andersens.cpp index cd90a6f22b..3e5be678ed 100644 --- a/lib/Analysis/IPA/Andersens.cpp +++ b/lib/Analysis/IPA/Andersens.cpp @@ -76,7 +76,7 @@ namespace { class VISIBILITY_HIDDEN Andersens : public ModulePass, public AliasAnalysis, private InstVisitor { public: - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo Andersens() : ModulePass((intptr_t)&ID) {} private: /// Node class - This class is used to represent a memory object in the @@ -339,7 +339,7 @@ namespace { void visitInstruction(Instruction &I); }; - const int Andersens::ID = 0; + const char Andersens::ID = 0; RegisterPass X("anders-aa", "Andersen's Interprocedural Alias Analysis"); RegisterAnalysisGroup Y(X); diff --git a/lib/Analysis/IPA/CallGraph.cpp b/lib/Analysis/IPA/CallGraph.cpp index ad6c898540..4309555bf1 100644 --- a/lib/Analysis/IPA/CallGraph.cpp +++ b/lib/Analysis/IPA/CallGraph.cpp @@ -51,7 +51,7 @@ class VISIBILITY_HIDDEN BasicCallGraph : public CallGraph, public ModulePass { CallGraphNode *CallsExternalNode; public: - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo BasicCallGraph() : ModulePass((intptr_t)&ID), Root(0), ExternalCallingNode(0), CallsExternalNode(0) {} @@ -190,15 +190,14 @@ private: } }; - RegisterAnalysisGroup X("Call Graph"); RegisterPass Y("basiccg", "Basic CallGraph Construction"); RegisterAnalysisGroup Z(Y); } //End anonymous namespace -const int CallGraph::ID = 0; -const int BasicCallGraph::ID = 0; +const char CallGraph::ID = 0; +const char BasicCallGraph::ID = 0; void CallGraph::initialize(Module &M) { Mod = &M; diff --git a/lib/Analysis/IPA/CallGraphSCCPass.cpp b/lib/Analysis/IPA/CallGraphSCCPass.cpp index 2c5aeaa4c2..b75eae8a5c 100644 --- a/lib/Analysis/IPA/CallGraphSCCPass.cpp +++ b/lib/Analysis/IPA/CallGraphSCCPass.cpp @@ -30,7 +30,7 @@ using namespace llvm; class CGPassManager : public ModulePass, public PMDataManager { public: - static const int ID; + static const char ID; CGPassManager(int Depth) : ModulePass((intptr_t)&ID), PMDataManager(Depth) { } @@ -73,7 +73,7 @@ public: } }; -const int CGPassManager::ID = 0; +const char CGPassManager::ID = 0; /// run - Execute all of the passes scheduled for execution. Keep track of /// whether any of the passes modifies the module, and if so, return true. bool CGPassManager::runOnModule(Module &M) { diff --git a/lib/Analysis/IPA/FindUsedTypes.cpp b/lib/Analysis/IPA/FindUsedTypes.cpp index d35f7beed1..d52617da08 100644 --- a/lib/Analysis/IPA/FindUsedTypes.cpp +++ b/lib/Analysis/IPA/FindUsedTypes.cpp @@ -21,7 +21,7 @@ #include "llvm/Support/InstIterator.h" using namespace llvm; -const int FindUsedTypes::ID = 0; +const char FindUsedTypes::ID = 0; static RegisterPass X("printusedtypes", "Find Used Types"); diff --git a/lib/Analysis/IPA/GlobalsModRef.cpp b/lib/Analysis/IPA/GlobalsModRef.cpp index ea8b1d8487..b704931afe 100644 --- a/lib/Analysis/IPA/GlobalsModRef.cpp +++ b/lib/Analysis/IPA/GlobalsModRef.cpp @@ -83,7 +83,7 @@ namespace { std::map FunctionInfo; public: - static const int ID; + static const char ID; GlobalsModRef() : ModulePass((intptr_t)&ID) {} bool runOnModule(Module &M) { @@ -146,7 +146,7 @@ namespace { bool AnalyzeIndirectGlobalMemory(GlobalValue *GV); }; - const int GlobalsModRef::ID = 0; + const char GlobalsModRef::ID = 0; RegisterPass X("globalsmodref-aa", "Simple mod/ref analysis for globals"); RegisterAnalysisGroup Y(X); diff --git a/lib/Analysis/InstCount.cpp b/lib/Analysis/InstCount.cpp index 23c891b5ed..87fcd8ff4e 100644 --- a/lib/Analysis/InstCount.cpp +++ b/lib/Analysis/InstCount.cpp @@ -51,7 +51,7 @@ namespace { abort(); } public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid InstCount() : FunctionPass((intptr_t)&ID) {} virtual bool runOnFunction(Function &F); @@ -63,7 +63,7 @@ namespace { }; - const int InstCount::ID = 0; + const char InstCount::ID = 0; RegisterPass X("instcount", "Counts the various types of Instructions"); } diff --git a/lib/Analysis/IntervalPartition.cpp b/lib/Analysis/IntervalPartition.cpp index b380a5190d..dab60d6c48 100644 --- a/lib/Analysis/IntervalPartition.cpp +++ b/lib/Analysis/IntervalPartition.cpp @@ -15,7 +15,7 @@ #include "llvm/Analysis/IntervalIterator.h" using namespace llvm; -const int IntervalPartition::ID = 0; +const char IntervalPartition::ID = 0; static RegisterPass X("intervals", "Interval Partition Construction", true); diff --git a/lib/Analysis/LoadValueNumbering.cpp b/lib/Analysis/LoadValueNumbering.cpp index fdb5545c2b..6f4dbbbf56 100644 --- a/lib/Analysis/LoadValueNumbering.cpp +++ b/lib/Analysis/LoadValueNumbering.cpp @@ -40,7 +40,7 @@ using namespace llvm; namespace { // FIXME: This should not be a FunctionPass. struct VISIBILITY_HIDDEN LoadVN : public FunctionPass, public ValueNumbering { - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo LoadVN() : FunctionPass((intptr_t)&ID) {} /// Pass Implementation stuff. This doesn't do any analysis. @@ -83,7 +83,7 @@ namespace { std::vector &RetVals) const; }; - const int LoadVN::ID = 0; + const char LoadVN::ID = 0; // Register this pass... RegisterPass X("load-vn", "Load Value Numbering"); diff --git a/lib/Analysis/LoopInfo.cpp b/lib/Analysis/LoopInfo.cpp index fd66d29584..f936706255 100644 --- a/lib/Analysis/LoopInfo.cpp +++ b/lib/Analysis/LoopInfo.cpp @@ -27,7 +27,7 @@ #include using namespace llvm; -const int LoopInfo::ID = 0; +const char LoopInfo::ID = 0; static RegisterPass X("loops", "Natural Loop Construction", true); diff --git a/lib/Analysis/LoopPass.cpp b/lib/Analysis/LoopPass.cpp index eeb27ac1b3..de0f21ca20 100644 --- a/lib/Analysis/LoopPass.cpp +++ b/lib/Analysis/LoopPass.cpp @@ -21,7 +21,7 @@ using namespace llvm; // LPPassManager // -const int LPPassManager::ID = 0; +const char LPPassManager::ID = 0; /// LPPassManager manages FPPassManagers and CalLGraphSCCPasses. LPPassManager::LPPassManager(int Depth) diff --git a/lib/Analysis/PostDominators.cpp b/lib/Analysis/PostDominators.cpp index a328a89414..a818e6a03c 100644 --- a/lib/Analysis/PostDominators.cpp +++ b/lib/Analysis/PostDominators.cpp @@ -22,9 +22,9 @@ using namespace llvm; // PostDominatorTree Implementation //===----------------------------------------------------------------------===// -const int PostDominatorTree::ID = 0; -const int PostDominanceFrontier::ID = 0; -const int PostETForest::ID = 0; +const char PostDominatorTree::ID = 0; +const char PostDominanceFrontier::ID = 0; +const char PostETForest::ID = 0; static RegisterPass F("postdomtree", "Post-Dominator Tree Construction", true); diff --git a/lib/Analysis/ProfileInfo.cpp b/lib/Analysis/ProfileInfo.cpp index 2a6a6a50bd..f487a058d2 100644 --- a/lib/Analysis/ProfileInfo.cpp +++ b/lib/Analysis/ProfileInfo.cpp @@ -24,7 +24,7 @@ using namespace llvm; namespace { RegisterAnalysisGroup Z("Profile Information"); } -const int ProfileInfo::ID = 0; +const char ProfileInfo::ID = 0; ProfileInfo::~ProfileInfo() {} @@ -86,11 +86,11 @@ unsigned ProfileInfo::getExecutionCount(BasicBlock *BB) const { namespace { struct VISIBILITY_HIDDEN NoProfileInfo : public ImmutablePass, public ProfileInfo { - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo NoProfileInfo() : ImmutablePass((intptr_t)&ID) {} }; - const int NoProfileInfo::ID = 0; + const char NoProfileInfo::ID = 0; // Register this pass... RegisterPass X("no-profile", "No Profile Information"); diff --git a/lib/Analysis/ProfileInfoLoaderPass.cpp b/lib/Analysis/ProfileInfoLoaderPass.cpp index 9697de8cdd..ca6f4e44a5 100644 --- a/lib/Analysis/ProfileInfoLoaderPass.cpp +++ b/lib/Analysis/ProfileInfoLoaderPass.cpp @@ -32,7 +32,7 @@ namespace { class VISIBILITY_HIDDEN LoaderPass : public ModulePass, public ProfileInfo { std::string Filename; public: - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo LoaderPass(const std::string &filename = "") : ModulePass((intptr_t)&ID), Filename(filename) { if (filename.empty()) Filename = ProfileInfoFilename; @@ -50,7 +50,7 @@ namespace { virtual bool runOnModule(Module &M); }; - const int LoaderPass::ID = 0; + const char LoaderPass::ID = 0; RegisterPass X("profile-loader", "Load profile information from llvmprof.out"); diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp index 2c591fc0d5..cef1dc255f 100644 --- a/lib/Analysis/ScalarEvolution.cpp +++ b/lib/Analysis/ScalarEvolution.cpp @@ -105,7 +105,7 @@ namespace { RegisterPass R("scalar-evolution", "Scalar Evolution Analysis"); } -const int ScalarEvolution::ID = 0; +const char ScalarEvolution::ID = 0; //===----------------------------------------------------------------------===// // SCEV class definitions diff --git a/lib/Analysis/ValueNumbering.cpp b/lib/Analysis/ValueNumbering.cpp index 2ecbce55c2..b91286bc7a 100644 --- a/lib/Analysis/ValueNumbering.cpp +++ b/lib/Analysis/ValueNumbering.cpp @@ -22,7 +22,7 @@ #include "llvm/Support/Compiler.h" using namespace llvm; -const int ValueNumbering::ID = 0; +const char ValueNumbering::ID = 0; // Register the ValueNumbering interface, providing a nice name to refer to. static RegisterAnalysisGroup X("Value Numbering"); @@ -52,7 +52,7 @@ namespace { /// struct VISIBILITY_HIDDEN BasicVN : public ImmutablePass, public ValueNumbering { - static const int ID; // Class identification, replacement for typeinfo + static const char ID; // Class identification, replacement for typeinfo BasicVN() : ImmutablePass((intptr_t)&ID) {} /// getEqualNumberNodes - Return nodes with the same value number as the @@ -65,7 +65,7 @@ namespace { std::vector &RetVals) const; }; - const int BasicVN::ID = 0; + const char BasicVN::ID = 0; // Register this pass... RegisterPass X("basicvn", "Basic Value Numbering (default GVN impl)"); diff --git a/lib/Bytecode/Writer/Writer.cpp b/lib/Bytecode/Writer/Writer.cpp index 3e09a92e9f..16a291a24f 100644 --- a/lib/Bytecode/Writer/Writer.cpp +++ b/lib/Bytecode/Writer/Writer.cpp @@ -47,7 +47,7 @@ using namespace llvm; /// @brief The bytecode version number const unsigned BCVersionNum = 7; -const int WriteBytecodePass::ID = 0; +const char WriteBytecodePass::ID = 0; static RegisterPass X("emitbytecode", "Bytecode Writer"); STATISTIC(BytesWritten, "Number of bytecode bytes written"); diff --git a/lib/CodeGen/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter.cpp index 4ce379c3e4..999a91bc01 100644 --- a/lib/CodeGen/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter.cpp @@ -32,7 +32,7 @@ using namespace llvm; static cl::opt AsmVerbose("asm-verbose", cl::Hidden, cl::desc("Add comments to directives.")); -const int AsmPrinter::ID = 0; +const char AsmPrinter::ID = 0; AsmPrinter::AsmPrinter(std::ostream &o, TargetMachine &tm, const TargetAsmInfo *T) : MachineFunctionPass((intptr_t)&ID), FunctionNumber(0), O(o), TM(tm), TAI(T) diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp index 394fe7b81b..2cad5a754a 100644 --- a/lib/CodeGen/BranchFolding.cpp +++ b/lib/CodeGen/BranchFolding.cpp @@ -39,7 +39,7 @@ static cl::opt EnableTailMerge("enable-tail-merge", cl::Hidden); namespace { struct BranchFolder : public MachineFunctionPass { - static const int ID; + static const char ID; BranchFolder() : MachineFunctionPass((intptr_t)&ID) {} virtual bool runOnMachineFunction(MachineFunction &MF); @@ -67,7 +67,7 @@ namespace { MachineBasicBlock *TBB, MachineBasicBlock *FBB, const std::vector &Cond); }; - const int BranchFolder::ID = 0; + const char BranchFolder::ID = 0; } FunctionPass *llvm::createBranchFoldingPass() { return new BranchFolder(); } diff --git a/lib/CodeGen/ELFWriter.cpp b/lib/CodeGen/ELFWriter.cpp index ce534092ba..9ca7cf14c2 100644 --- a/lib/CodeGen/ELFWriter.cpp +++ b/lib/CodeGen/ELFWriter.cpp @@ -47,7 +47,7 @@ #include using namespace llvm; -const int ELFWriter::ID = 0; +const char ELFWriter::ID = 0; /// AddELFWriter - Concrete function to add the ELF writer to the function pass /// manager. MachineCodeEmitter *llvm::AddELFWriter(FunctionPassManager &FPM, diff --git a/lib/CodeGen/ELFWriter.h b/lib/CodeGen/ELFWriter.h index 8b577a0a78..f8f82de581 100644 --- a/lib/CodeGen/ELFWriter.h +++ b/lib/CodeGen/ELFWriter.h @@ -30,7 +30,7 @@ namespace llvm { class ELFWriter : public MachineFunctionPass { friend class ELFCodeEmitter; public: - static const int ID; + static const char ID; MachineCodeEmitter &getMachineCodeEmitter() const { return *(MachineCodeEmitter*)MCE; diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index d11de96bec..5e69852f4a 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -44,7 +44,7 @@ STATISTIC(numPeep , "Number of identity moves eliminated after coalescing"); STATISTIC(numFolded , "Number of loads/stores folded into instructions"); STATISTIC(numAborts , "Number of times interval joining aborted"); -const int LiveIntervals::ID = 0; +const char LiveIntervals::ID = 0; namespace { RegisterPass X("liveintervals", "Live Interval Analysis"); diff --git a/lib/CodeGen/LiveVariables.cpp b/lib/CodeGen/LiveVariables.cpp index 3ea60bcf15..796f160f71 100644 --- a/lib/CodeGen/LiveVariables.cpp +++ b/lib/CodeGen/LiveVariables.cpp @@ -37,7 +37,7 @@ #include using namespace llvm; -const int LiveVariables::ID = 0; +const char LiveVariables::ID = 0; static RegisterPass X("livevars", "Live Variable Analysis"); void LiveVariables::VarInfo::dump() const { diff --git a/lib/CodeGen/MachOWriter.cpp b/lib/CodeGen/MachOWriter.cpp index f8dccc1895..cec245d864 100644 --- a/lib/CodeGen/MachOWriter.cpp +++ b/lib/CodeGen/MachOWriter.cpp @@ -317,7 +317,7 @@ void MachOCodeEmitter::emitJumpTables(MachineJumpTableInfo *MJTI) { // MachOWriter Implementation //===----------------------------------------------------------------------===// -const int MachOWriter::ID = 0; +const char MachOWriter::ID = 0; MachOWriter::MachOWriter(std::ostream &o, TargetMachine &tm) : MachineFunctionPass((intptr_t)&ID), O(o), TM(tm) { is64Bit = TM.getTargetData()->getPointerSizeInBits() == 64; diff --git a/lib/CodeGen/MachOWriter.h b/lib/CodeGen/MachOWriter.h index d4c146d3bf..6c44662bb5 100644 --- a/lib/CodeGen/MachOWriter.h +++ b/lib/CodeGen/MachOWriter.h @@ -84,7 +84,7 @@ namespace llvm { class MachOWriter : public MachineFunctionPass { friend class MachOCodeEmitter; public: - static const int ID; + static const char ID; MachineCodeEmitter &getMachineCodeEmitter() const { return *(MachineCodeEmitter*)MCE; } diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp index 9b43e655bc..9690eeaf74 100644 --- a/lib/CodeGen/MachineFunction.cpp +++ b/lib/CodeGen/MachineFunction.cpp @@ -44,7 +44,7 @@ void MachineFunctionPass::virtfn() {} namespace { struct VISIBILITY_HIDDEN Printer : public MachineFunctionPass { - static const int ID; + static const char ID; std::ostream *OS; const std::string Banner; @@ -64,7 +64,7 @@ namespace { return false; } }; - const int Printer::ID = 0; + const char Printer::ID = 0; } /// Returns a newly-created MachineFunction Printer pass. The default output @@ -77,7 +77,7 @@ FunctionPass *llvm::createMachineFunctionPrinterPass(std::ostream *OS, namespace { struct VISIBILITY_HIDDEN Deleter : public MachineFunctionPass { - static const int ID; + static const char ID; Deleter() : MachineFunctionPass((intptr_t)&ID) {} const char *getPassName() const { return "Machine Code Deleter"; } @@ -88,7 +88,7 @@ namespace { return true; } }; - const int Deleter::ID = 0; + const char Deleter::ID = 0; } /// MachineCodeDeletion Pass - This pass deletes all of the machine code for diff --git a/lib/CodeGen/MachineModuleInfo.cpp b/lib/CodeGen/MachineModuleInfo.cpp index d62eb962a3..ab664ac8cb 100644 --- a/lib/CodeGen/MachineModuleInfo.cpp +++ b/lib/CodeGen/MachineModuleInfo.cpp @@ -30,7 +30,7 @@ using namespace llvm::dwarf; namespace { RegisterPass X("machinemoduleinfo", "Module Information"); } -const int MachineModuleInfo::ID = 0; +const char MachineModuleInfo::ID = 0; //===----------------------------------------------------------------------===// @@ -1751,14 +1751,14 @@ Function *MachineModuleInfo::getPersonality() const { namespace llvm { struct DebugLabelFolder : public MachineFunctionPass { - static const int ID; + static const char ID; DebugLabelFolder() : MachineFunctionPass((intptr_t)&ID) {} virtual bool runOnMachineFunction(MachineFunction &MF); virtual const char *getPassName() const { return "Label Folder"; } }; -const int DebugLabelFolder::ID = 0; +const char DebugLabelFolder::ID = 0; bool DebugLabelFolder::runOnMachineFunction(MachineFunction &MF) { // Get machine module info. diff --git a/lib/CodeGen/PHIElimination.cpp b/lib/CodeGen/PHIElimination.cpp index f26819d9e2..91dbc2e17b 100644 --- a/lib/CodeGen/PHIElimination.cpp +++ b/lib/CodeGen/PHIElimination.cpp @@ -33,7 +33,7 @@ STATISTIC(NumAtomic, "Number of atomic phis lowered"); namespace { struct VISIBILITY_HIDDEN PNE : public MachineFunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid PNE() : MachineFunctionPass((intptr_t)&ID) {} bool runOnMachineFunction(MachineFunction &Fn) { @@ -76,7 +76,7 @@ namespace { VRegPHIUse VRegPHIUseCount; }; - const int PNE::ID = 0; + const char PNE::ID = 0; RegisterPass X("phi-node-elimination", "Eliminate PHI nodes for register allocation"); } diff --git a/lib/CodeGen/PrologEpilogInserter.cpp b/lib/CodeGen/PrologEpilogInserter.cpp index 927f7d1226..18b2d7d963 100644 --- a/lib/CodeGen/PrologEpilogInserter.cpp +++ b/lib/CodeGen/PrologEpilogInserter.cpp @@ -32,7 +32,7 @@ using namespace llvm; namespace { struct VISIBILITY_HIDDEN PEI : public MachineFunctionPass { - static const int ID; + static const char ID; PEI() : MachineFunctionPass((intptr_t)&ID) {} const char *getPassName() const { @@ -101,7 +101,7 @@ namespace { void replaceFrameIndices(MachineFunction &Fn); void insertPrologEpilogCode(MachineFunction &Fn); }; - const int PEI::ID = 0; + const char PEI::ID = 0; } diff --git a/lib/CodeGen/RegAllocLinearScan.cpp b/lib/CodeGen/RegAllocLinearScan.cpp index b45d983eeb..1e345a482a 100644 --- a/lib/CodeGen/RegAllocLinearScan.cpp +++ b/lib/CodeGen/RegAllocLinearScan.cpp @@ -48,7 +48,7 @@ namespace { static unsigned numIntervals = 0; struct VISIBILITY_HIDDEN RA : public MachineFunctionPass { - static const int ID; + static const char ID; RA() : MachineFunctionPass((intptr_t)&ID) {} typedef std::pair IntervalPtr; @@ -149,7 +149,7 @@ namespace { } } }; - const int RA::ID = 0; + const char RA::ID = 0; } void RA::ComputeRelatedRegClasses() { diff --git a/lib/CodeGen/RegAllocLocal.cpp b/lib/CodeGen/RegAllocLocal.cpp index 4494552c9f..500ed87018 100644 --- a/lib/CodeGen/RegAllocLocal.cpp +++ b/lib/CodeGen/RegAllocLocal.cpp @@ -44,7 +44,7 @@ namespace { class VISIBILITY_HIDDEN RA : public MachineFunctionPass { public: - static const int ID; + static const char ID; RA() : MachineFunctionPass((intptr_t)&ID) {} private: const TargetMachine *TM; @@ -228,7 +228,7 @@ namespace { void reloadPhysReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator &I, unsigned PhysReg); }; - const int RA::ID = 0; + const char RA::ID = 0; } /// getStackSpaceFor - This allocates space for the specified virtual register diff --git a/lib/CodeGen/RegAllocSimple.cpp b/lib/CodeGen/RegAllocSimple.cpp index 771c68b1ac..181ba03649 100644 --- a/lib/CodeGen/RegAllocSimple.cpp +++ b/lib/CodeGen/RegAllocSimple.cpp @@ -39,7 +39,7 @@ namespace { class VISIBILITY_HIDDEN RegAllocSimple : public MachineFunctionPass { public: - static const int ID; + static const char ID; RegAllocSimple() : MachineFunctionPass((intptr_t)&ID) {} private: MachineFunction *MF; @@ -94,7 +94,7 @@ namespace { void spillVirtReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator I, unsigned VirtReg, unsigned PhysReg); }; - const int RegAllocSimple::ID = 0; + const char RegAllocSimple::ID = 0; } /// getStackSpaceFor - This allocates space for the specified virtual diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index c83eb5bb3d..3f6a10ae44 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -5012,4 +5012,4 @@ SelectInlineAsmMemoryOperands(std::vector &Ops, SelectionDAG &DAG) { Ops.push_back(InOps.back()); } -const int SelectionDAGISel::ID = 0; +const char SelectionDAGISel::ID = 0; diff --git a/lib/CodeGen/TwoAddressInstructionPass.cpp b/lib/CodeGen/TwoAddressInstructionPass.cpp index 455993c45d..dfbc4a730f 100644 --- a/lib/CodeGen/TwoAddressInstructionPass.cpp +++ b/lib/CodeGen/TwoAddressInstructionPass.cpp @@ -50,7 +50,7 @@ STATISTIC(NumConvertedTo3Addr, "Number of instructions promoted to 3-address"); namespace { struct VISIBILITY_HIDDEN TwoAddressInstructionPass : public MachineFunctionPass { - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid TwoAddressInstructionPass() : MachineFunctionPass((intptr_t)&ID) {} virtual void getAnalysisUsage(AnalysisUsage &AU) const; @@ -59,7 +59,7 @@ namespace { bool runOnMachineFunction(MachineFunction&); }; - const int TwoAddressInstructionPass::ID = 0; + const char TwoAddressInstructionPass::ID = 0; RegisterPass X("twoaddressinstruction", "Two-Address instruction pass"); } diff --git a/lib/CodeGen/UnreachableBlockElim.cpp b/lib/CodeGen/UnreachableBlockElim.cpp index f66a7713d7..24ee42ea40 100644 --- a/lib/CodeGen/UnreachableBlockElim.cpp +++ b/lib/CodeGen/UnreachableBlockElim.cpp @@ -35,10 +35,10 @@ namespace { class VISIBILITY_HIDDEN UnreachableBlockElim : public FunctionPass { virtual bool runOnFunction(Function &F); public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid UnreachableBlockElim() : FunctionPass((intptr_t)&ID) {} }; - const int UnreachableBlockElim::ID = 0; + const char UnreachableBlockElim::ID = 0; RegisterPass X("unreachableblockelim", "Remove unreachable blocks from the CFG"); } diff --git a/lib/Target/ARM/ARMConstantIslandPass.cpp b/lib/Target/ARM/ARMConstantIslandPass.cpp index 0850d22994..405ac0a2c6 100644 --- a/lib/Target/ARM/ARMConstantIslandPass.cpp +++ b/lib/Target/ARM/ARMConstantIslandPass.cpp @@ -128,7 +128,7 @@ namespace { ARMFunctionInfo *AFI; bool isThumb; public: - static const int ID; + static const char ID; ARMConstantIslands() : MachineFunctionPass((intptr_t)&ID) {} virtual bool runOnMachineFunction(MachineFunction &Fn); @@ -174,7 +174,7 @@ namespace { void dumpBBs(); void verify(MachineFunction &Fn); }; - const int ARMConstantIslands::ID = 0; + const char ARMConstantIslands::ID = 0; } /// verify - check BBOffsets, BBSizes, alignment of islands diff --git a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp index 143fa1bbda..83509d8518 100644 --- a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp +++ b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp @@ -38,7 +38,7 @@ STATISTIC(NumFSTMGened, "Number of fstm instructions generated"); namespace { struct VISIBILITY_HIDDEN ARMLoadStoreOpt : public MachineFunctionPass { - static const int ID; + static const char ID; ARMLoadStoreOpt() : MachineFunctionPass((intptr_t)&ID) {} const TargetInstrInfo *TII; @@ -73,7 +73,7 @@ namespace { bool LoadStoreMultipleOpti(MachineBasicBlock &MBB); bool MergeReturnIntoLDM(MachineBasicBlock &MBB); }; - const int ARMLoadStoreOpt::ID = 0; + const char ARMLoadStoreOpt::ID = 0; } /// createARMLoadStoreOptimizationPass - returns an instance of the load / store diff --git a/lib/Target/Alpha/AlphaBranchSelector.cpp b/lib/Target/Alpha/AlphaBranchSelector.cpp index f0f70adffe..a9b9c63233 100644 --- a/lib/Target/Alpha/AlphaBranchSelector.cpp +++ b/lib/Target/Alpha/AlphaBranchSelector.cpp @@ -22,7 +22,7 @@ using namespace llvm; namespace { struct VISIBILITY_HIDDEN AlphaBSel : public MachineFunctionPass { - static const int ID; + static const char ID; AlphaBSel() : MachineFunctionPass((intptr_t)&ID) {} virtual bool runOnMachineFunction(MachineFunction &Fn); @@ -31,7 +31,7 @@ namespace { return "Alpha Branch Selection"; } }; - const int AlphaBSel::ID = 0; + const char AlphaBSel::ID = 0; } /// createAlphaBranchSelectionPass - returns an instance of the Branch Selection diff --git a/lib/Target/Alpha/AlphaCodeEmitter.cpp b/lib/Target/Alpha/AlphaCodeEmitter.cpp index 006e57176e..23552fa69a 100644 --- a/lib/Target/Alpha/AlphaCodeEmitter.cpp +++ b/lib/Target/Alpha/AlphaCodeEmitter.cpp @@ -36,7 +36,7 @@ namespace { int getMachineOpValue(MachineInstr &MI, MachineOperand &MO); public: - static const int ID; + static const char ID; explicit AlphaCodeEmitter(TargetMachine &tm, MachineCodeEmitter &mce) : MachineFunctionPass((intptr_t)&ID), II(0), TM(tm), MCE(mce) {} AlphaCodeEmitter(TargetMachine &tm, MachineCodeEmitter &mce, @@ -61,7 +61,7 @@ namespace { void emitBasicBlock(MachineBasicBlock &MBB); }; - const int AlphaCodeEmitter::ID = 0; + const char AlphaCodeEmitter::ID = 0; } /// createAlphaCodeEmitterPass - Return a pass that emits the collected Alpha code diff --git a/lib/Target/Alpha/AlphaLLRP.cpp b/lib/Target/Alpha/AlphaLLRP.cpp index c5a20e7a0c..ee745b52b3 100644 --- a/lib/Target/Alpha/AlphaLLRP.cpp +++ b/lib/Target/Alpha/AlphaLLRP.cpp @@ -37,7 +37,7 @@ namespace { /// AlphaTargetMachine &TM; - static const int ID; + static const char ID; AlphaLLRPPass(AlphaTargetMachine &tm) : MachineFunctionPass((intptr_t)&ID), TM(tm) { } @@ -154,7 +154,7 @@ namespace { return Changed; } }; - const int AlphaLLRPPass::ID = 0; + const char AlphaLLRPPass::ID = 0; } // end of anonymous namespace FunctionPass *llvm::createAlphaLLRPPass(AlphaTargetMachine &tm) { diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp index cbf480e855..0fd03e003b 100644 --- a/lib/Target/CBackend/CBackend.cpp +++ b/lib/Target/CBackend/CBackend.cpp @@ -57,7 +57,7 @@ namespace { /// class CBackendNameAllUsedStructsAndMergeFunctions : public ModulePass { public: - static const int ID; + static const char ID; CBackendNameAllUsedStructsAndMergeFunctions() : ModulePass((intptr_t)&ID) {} void getAnalysisUsage(AnalysisUsage &AU) const { @@ -71,7 +71,7 @@ namespace { virtual bool runOnModule(Module &M); }; - const int CBackendNameAllUsedStructsAndMergeFunctions::ID = 0; + const char CBackendNameAllUsedStructsAndMergeFunctions::ID = 0; /// CWriter - This class is the main chunk of code that converts an LLVM /// module to a C translation unit. @@ -88,7 +88,7 @@ namespace { std::set intrinsicPrototypesAlreadyGenerated; public: - static const int ID; + static const char ID; CWriter(std::ostream &o) : FunctionPass((intptr_t)&ID), Out(o), IL(0), Mang(0), LI(0), TheModule(0), TAsm(0), TD(0) {} @@ -264,7 +264,7 @@ namespace { }; } -const int CWriter::ID = 0; +const char CWriter::ID = 0; /// This method inserts names for any unnamed structure types that are used by /// the program, and removes names from structure types that are not used by the diff --git a/lib/Target/IA64/IA64Bundling.cpp b/lib/Target/IA64/IA64Bundling.cpp index 89732aed5f..afe029c286 100644 --- a/lib/Target/IA64/IA64Bundling.cpp +++ b/lib/Target/IA64/IA64Bundling.cpp @@ -36,7 +36,7 @@ STATISTIC(StopBitsAdded, "Number of stop bits added"); namespace { struct IA64BundlingPass : public MachineFunctionPass { - static const int ID; + static const char ID; /// Target machine description which we query for reg. names, data /// layout, etc. /// @@ -63,7 +63,7 @@ namespace { // 'fallthrough' code std::set PendingRegWrites; }; - const int IA64BundlingPass::ID = 0; + const char IA64BundlingPass::ID = 0; } // end of anonymous namespace /// createIA64BundlingPass - Returns a pass that adds STOP (;;) instructions diff --git a/lib/Target/MSIL/MSILWriter.cpp b/lib/Target/MSIL/MSILWriter.cpp index 86bea59db4..029094c418 100644 --- a/lib/Target/MSIL/MSILWriter.cpp +++ b/lib/Target/MSIL/MSILWriter.cpp @@ -80,8 +80,8 @@ bool MSILModule::runOnModule(Module &M) { return Changed; } -const int MSILModule::ID = 0; -const int MSILWriter::ID = 0; +const char MSILModule::ID = 0; +const char MSILWriter::ID = 0; bool MSILWriter::runOnFunction(Function &F) { if (F.isDeclaration()) return false; diff --git a/lib/Target/MSIL/MSILWriter.h b/lib/Target/MSIL/MSILWriter.h index 15a463d73d..6746d67a68 100644 --- a/lib/Target/MSIL/MSILWriter.h +++ b/lib/Target/MSIL/MSILWriter.h @@ -37,7 +37,7 @@ namespace { const TargetData*& TD; public: - static const int ID; + static const char ID; MSILModule(const std::set*& _UsedTypes, const TargetData*& _TD) : ModulePass((intptr_t)&ID), UsedTypes(_UsedTypes), TD(_TD) {} @@ -83,7 +83,7 @@ namespace { std::map > StaticInitList; const std::set* UsedTypes; - static const int ID; + static const char ID; MSILWriter(std::ostream &o) : FunctionPass((intptr_t)&ID), Out(o) { UniqID = 0; } diff --git a/lib/Target/PowerPC/PPCBranchSelector.cpp b/lib/Target/PowerPC/PPCBranchSelector.cpp index a4f0caee8a..28a61c09e8 100644 --- a/lib/Target/PowerPC/PPCBranchSelector.cpp +++ b/lib/Target/PowerPC/PPCBranchSelector.cpp @@ -32,7 +32,7 @@ STATISTIC(NumExpanded, "Number of branches expanded to long format"); namespace { struct VISIBILITY_HIDDEN PPCBSel : public MachineFunctionPass { - static const int ID; + static const char ID; PPCBSel() : MachineFunctionPass((intptr_t)&ID) {} /// BlockSizes - The sizes of the basic blocks in the function. @@ -44,7 +44,7 @@ namespace { return "PowerPC Branch Selector"; } }; - const int PPCBSel::ID = 0; + const char PPCBSel::ID = 0; } /// createPPCBranchSelectionPass - returns an instance of the Branch Selection diff --git a/lib/Target/PowerPC/PPCCodeEmitter.cpp b/lib/Target/PowerPC/PPCCodeEmitter.cpp index acca7a30eb..cffc128089 100644 --- a/lib/Target/PowerPC/PPCCodeEmitter.cpp +++ b/lib/Target/PowerPC/PPCCodeEmitter.cpp @@ -40,7 +40,7 @@ namespace { int getMachineOpValue(MachineInstr &MI, MachineOperand &MO); public: - static const int ID; + static const char ID; PPCCodeEmitter(TargetMachine &T, MachineCodeEmitter &M) : MachineFunctionPass((intptr_t)&ID), TM(T), MCE(M) {} @@ -64,7 +64,7 @@ namespace { /// unsigned getBinaryCodeForInstr(MachineInstr &MI); }; - const int PPCCodeEmitter::ID = 0; + const char PPCCodeEmitter::ID = 0; } /// createPPCCodeEmitterPass - Return a pass that emits the collected PPC code diff --git a/lib/Target/Sparc/DelaySlotFiller.cpp b/lib/Target/Sparc/DelaySlotFiller.cpp index 313eab9319..57eb1a1c9c 100644 --- a/lib/Target/Sparc/DelaySlotFiller.cpp +++ b/lib/Target/Sparc/DelaySlotFiller.cpp @@ -30,7 +30,7 @@ namespace { TargetMachine &TM; const TargetInstrInfo *TII; - static const int ID; + static const char ID; Filler(TargetMachine &tm) : MachineFunctionPass((intptr_t)&ID), TM(tm), TII(tm.getInstrInfo()) { } @@ -48,7 +48,7 @@ namespace { } }; - const int Filler::ID = 0; + const char Filler::ID = 0; } // end of anonymous namespace /// createSparcDelaySlotFillerPass - Returns a pass that fills in delay diff --git a/lib/Target/Sparc/FPMover.cpp b/lib/Target/Sparc/FPMover.cpp index 5596586f0c..ca70a9ceb4 100644 --- a/lib/Target/Sparc/FPMover.cpp +++ b/lib/Target/Sparc/FPMover.cpp @@ -32,7 +32,7 @@ namespace { /// TargetMachine &TM; - static const int ID; + static const char ID; FPMover(TargetMachine &tm) : MachineFunctionPass((intptr_t)&ID), TM(tm) { } @@ -43,7 +43,7 @@ namespace { bool runOnMachineBasicBlock(MachineBasicBlock &MBB); bool runOnMachineFunction(MachineFunction &F); }; - const int FPMover::ID = 0; + const char FPMover::ID = 0; } // end of anonymous namespace /// createSparcFPMoverPass - Returns a pass that turns FpMOVD diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp index 9492c8aad2..d4c9e58c47 100644 --- a/lib/Target/TargetData.cpp +++ b/lib/Target/TargetData.cpp @@ -35,7 +35,7 @@ namespace { // Register the default SparcV9 implementation... RegisterPass X("targetdata", "Target Data Layout"); } -const int TargetData::ID = 0; +const char TargetData::ID = 0; //===----------------------------------------------------------------------===// // Support for StructLayout diff --git a/lib/Target/X86/X86CodeEmitter.cpp b/lib/Target/X86/X86CodeEmitter.cpp index db80d9f892..244ddc0a9e 100644 --- a/lib/Target/X86/X86CodeEmitter.cpp +++ b/lib/Target/X86/X86CodeEmitter.cpp @@ -39,7 +39,7 @@ namespace { MachineCodeEmitter &MCE; bool Is64BitMode; public: - static const int ID; + static const char ID; explicit Emitter(TargetMachine &tm, MachineCodeEmitter &mce) : MachineFunctionPass((intptr_t)&ID), II(0), TD(0), TM(tm), MCE(mce), Is64BitMode(false) {} @@ -82,7 +82,7 @@ namespace { bool isX86_64ExtendedReg(const MachineOperand &MO); unsigned determineREX(const MachineInstr &MI); }; - const int Emitter::ID = 0; + const char Emitter::ID = 0; } /// createX86CodeEmitterPass - Return a pass that emits the collected X86 code diff --git a/lib/Target/X86/X86FloatingPoint.cpp b/lib/Target/X86/X86FloatingPoint.cpp index 4667b91ba6..9a048ccb72 100644 --- a/lib/Target/X86/X86FloatingPoint.cpp +++ b/lib/Target/X86/X86FloatingPoint.cpp @@ -52,7 +52,7 @@ STATISTIC(NumFP , "Number of floating point instructions"); namespace { struct VISIBILITY_HIDDEN FPS : public MachineFunctionPass { - static const int ID; + static const char ID; FPS() : MachineFunctionPass((intptr_t)&ID) {} virtual bool runOnMachineFunction(MachineFunction &MF); @@ -154,7 +154,7 @@ namespace { void handleCondMovFP(MachineBasicBlock::iterator &I); void handleSpecialFP(MachineBasicBlock::iterator &I); }; - const int FPS::ID = 0; + const char FPS::ID = 0; } FunctionPass *llvm::createX86FloatingPointStackifierPass() { return new FPS(); } 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 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 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 &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 &ArgsToPromote); }; - const int ArgPromotion::ID = 0; + const char ArgPromotion::ID = 0; RegisterPass 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; RegisterPassX("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 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 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 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(); } }; - const int DTE::ID = 0; + const char DTE::ID = 0; RegisterPass 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 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 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(); } - 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 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 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 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 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 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 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 & exportList); void LoadFile(const char *Filename); virtual bool runOnModule(Module &M); }; - const int InternalizePass::ID = 0; + const char InternalizePass::ID = 0; RegisterPass 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 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 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 BlocksToNotExtract; public: - static const int ID; // Pass identifcation, replacement for typeid + static const char ID; // Pass identifcation, replacement for typeid BlockExtractorPass(std::vector &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 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 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 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 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 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 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 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 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 Y("insert-block-profiling", "Insert instrumentation for block profiling"); RegisterAnalysisGroup 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 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 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 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 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 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 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 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 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 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 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 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 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(); } }; - const int DSE::ID = 0; + const char DSE::ID = 0; RegisterPass 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 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 &Insts); }; - const int IndVarSimplify::ID = 0; + const char IndVarSimplify::ID = 0; RegisterPass 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 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 &Val2AlMap); }; - const int LICM::ID = 0; + const char LICM::ID = 0; RegisterPass 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 LoopHeaderInfo; }; - const int LoopRotate::ID = 0; + const char LoopRotate::ID = 0; RegisterPass 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 &Insts); }; - const int LoopStrengthReduce::ID = 0; + const char LoopStrengthReduce::ID = 0; RegisterPass 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(); } }; - const int LoopUnroll::ID = 0; + const char LoopUnroll::ID = 0; RegisterPass 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 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 &Worklist); void RemoveLoopFromHierarchy(Loop *L); }; - const int LoopUnswitch::ID = 0; + const char LoopUnswitch::ID = 0; RegisterPass 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 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 { 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 instrsToRemove; }; -const int LowerPacked::ID = 0; +const char LowerPacked::ID = 0; RegisterPass 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 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 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 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 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 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 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 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 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 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 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 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 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 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 &PredBlocks); }; - const int LoopSimplify::ID = 0; + const char LoopSimplify::ID = 0; RegisterPass 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 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 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 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 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 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 X("mergereturn", "Unify function exit nodes"); diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index 53828f618e..f747760900 100644 --- a/lib/VMCore/AsmWriter.cpp +++ b/lib/VMCore/AsmWriter.cpp @@ -135,10 +135,10 @@ public: } // end namespace llvm -const int PrintModulePass::ID = 0; +const char PrintModulePass::ID = 0; static RegisterPass X("printm", "Print module to stderr"); -const int PrintFunctionPass::ID = 0; +const char PrintFunctionPass::ID = 0; static RegisterPass Y("print","Print function to stderr"); diff --git a/lib/VMCore/Dominators.cpp b/lib/VMCore/Dominators.cpp index 905b56ee63..f1d655fd24 100644 --- a/lib/VMCore/Dominators.cpp +++ b/lib/VMCore/Dominators.cpp @@ -58,7 +58,7 @@ static std::ostream &operator<<(std::ostream &o, // //===----------------------------------------------------------------------===// -const int DominatorTree::ID = 0; +const char DominatorTree::ID = 0; static RegisterPass E("domtree", "Dominator Tree Construction", true); @@ -354,7 +354,7 @@ bool DominatorTree::runOnFunction(Function &F) { // DominanceFrontier Implementation //===----------------------------------------------------------------------===// -const int DominanceFrontier::ID = 0; +const char DominanceFrontier::ID = 0; static RegisterPass G("domfrontier", "Dominance Frontier Construction", true); @@ -835,7 +835,7 @@ void ETNode::assignDFSNumber(int num) { // ETForest implementation //===----------------------------------------------------------------------===// -const int ETForest::ID = 0; +const char ETForest::ID = 0; static RegisterPass D("etforest", "ET Forest Construction", true); diff --git a/lib/VMCore/PassManager.cpp b/lib/VMCore/PassManager.cpp index 694827bc5b..ee9200c26a 100644 --- a/lib/VMCore/PassManager.cpp +++ b/lib/VMCore/PassManager.cpp @@ -63,7 +63,7 @@ class VISIBILITY_HIDDEN BBPassManager : public PMDataManager, public FunctionPass { public: - static const int ID; + static const char ID; BBPassManager(int Depth) : PMDataManager(Depth), FunctionPass((intptr_t)&ID) {} @@ -106,7 +106,7 @@ public: } }; -const int BBPassManager::ID = 0; +const char BBPassManager::ID = 0; } namespace llvm { @@ -119,7 +119,7 @@ class FunctionPassManagerImpl : public Pass, 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 @@ public: } }; -const int FunctionPassManagerImpl::ID = 0; +const char FunctionPassManagerImpl::ID = 0; //===----------------------------------------------------------------------===// // MPPassManager // @@ -183,7 +183,7 @@ const int FunctionPassManagerImpl::ID = 0; 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 @@ public: std::map OnTheFlyManagers; }; -const int MPPassManager::ID = 0; +const char MPPassManager::ID = 0; //===----------------------------------------------------------------------===// // PassManagerImpl // @@ -258,7 +258,7 @@ class PassManagerImpl : public Pass, 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 @@ public: }; -const int PassManagerImpl::ID = 0; +const char PassManagerImpl::ID = 0; } // End of llvm namespace namespace { @@ -1108,7 +1108,7 @@ bool FunctionPassManagerImpl::run(Function &F) { //===----------------------------------------------------------------------===// // 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"; diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index 94027f858f..4006e1f749 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -69,7 +69,7 @@ namespace { // Anonymous namespace for class struct VISIBILITY_HIDDEN Verifier : public FunctionPass, InstVisitor { - 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 @@ namespace { // Anonymous namespace for class } }; - const int Verifier::ID = 0; + const char Verifier::ID = 0; RegisterPass X("verify", "Module Verifier"); } // End anonymous namespace diff --git a/tools/bugpoint/ExtractFunction.cpp b/tools/bugpoint/ExtractFunction.cpp index e4eb32f07a..6e21e890b9 100644 --- a/tools/bugpoint/ExtractFunction.cpp +++ b/tools/bugpoint/ExtractFunction.cpp @@ -306,10 +306,10 @@ namespace { class BlockExtractorPass : public ModulePass { bool runOnModule(Module &M); public: - static const int ID; // Pass ID, replacement for typeid + static const char ID; // Pass ID, replacement for typeid BlockExtractorPass() : ModulePass((intptr_t)&ID) {} }; - const int BlockExtractorPass::ID = 0; + const char BlockExtractorPass::ID = 0; RegisterPass XX("extract-bbs", "Extract Basic Blocks From Module (for bugpoint use)"); } diff --git a/tools/bugpoint/TestPasses.cpp b/tools/bugpoint/TestPasses.cpp index a3fc149612..3d1fc3a48d 100644 --- a/tools/bugpoint/TestPasses.cpp +++ b/tools/bugpoint/TestPasses.cpp @@ -26,7 +26,7 @@ namespace { /// crashes on any call instructions. class CrashOnCalls : public BasicBlockPass { public: - static const int ID; // Pass ID, replacement for typeid + static const char ID; // Pass ID, replacement for typeid CrashOnCalls() : BasicBlockPass((intptr_t)&ID) {} private: virtual void getAnalysisUsage(AnalysisUsage &AU) const { @@ -42,7 +42,7 @@ namespace { } }; - const int CrashOnCalls::ID = 0; + const char CrashOnCalls::ID = 0; RegisterPass X("bugpoint-crashcalls", "BugPoint Test Pass - Intentionally crash on CallInsts"); @@ -53,7 +53,7 @@ namespace { /// deletes some call instructions, "misoptimizing" the program. class DeleteCalls : public BasicBlockPass { public: - static const int ID; // Pass ID, replacement for typeid + static const char ID; // Pass ID, replacement for typeid DeleteCalls() : BasicBlockPass((intptr_t)&ID) {} private: bool runOnBasicBlock(BasicBlock &BB) { @@ -68,7 +68,7 @@ namespace { } }; - const int DeleteCalls::ID = 0; + const char DeleteCalls::ID = 0; RegisterPass Y("bugpoint-deletecalls", "BugPoint Test Pass - Intentionally 'misoptimize' CallInsts"); diff --git a/tools/opt/AnalysisWrappers.cpp b/tools/opt/AnalysisWrappers.cpp index a13695daef..439c5a27ba 100644 --- a/tools/opt/AnalysisWrappers.cpp +++ b/tools/opt/AnalysisWrappers.cpp @@ -30,7 +30,7 @@ namespace { /// useful when looking for standard library functions we should constant fold /// or handle in alias analyses. struct ExternalFunctionsPassedConstants : public ModulePass { - static const int ID; // Pass ID, replacement for typeid + static const char ID; // Pass ID, replacement for typeid ExternalFunctionsPassedConstants() : ModulePass((intptr_t)&ID) {} virtual bool runOnModule(Module &M) { for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) @@ -63,12 +63,12 @@ namespace { } }; - const int ExternalFunctionsPassedConstants::ID = 0; + const char ExternalFunctionsPassedConstants::ID = 0; RegisterPass P1("externalfnconstants", "Print external fn callsites passed constants"); struct CallGraphPrinter : public ModulePass { - static const int ID; // Pass ID, replacement for typeid + static const char ID; // Pass ID, replacement for typeid CallGraphPrinter() : ModulePass((intptr_t)&ID) {} virtual void getAnalysisUsage(AnalysisUsage &AU) const { @@ -82,7 +82,7 @@ namespace { } }; - const int CallGraphPrinter::ID = 0; + const char CallGraphPrinter::ID = 0; RegisterPass P2("callgraph", "Print a call graph"); } diff --git a/tools/opt/GraphPrinters.cpp b/tools/opt/GraphPrinters.cpp index cb0b6643ae..9b41ebc899 100644 --- a/tools/opt/GraphPrinters.cpp +++ b/tools/opt/GraphPrinters.cpp @@ -60,7 +60,7 @@ namespace llvm { namespace { struct CallGraphPrinter : public ModulePass { - static const int ID; // Pass ID, replacement for typeid + static const char ID; // Pass ID, replacement for typeid CallGraphPrinter() : ModulePass((intptr_t)&ID) {} virtual bool runOnModule(Module &M) { @@ -77,7 +77,7 @@ namespace { } }; - const int CallGraphPrinter::ID = 0; + const char CallGraphPrinter::ID = 0; RegisterPass P2("print-callgraph", "Print Call Graph to 'dot' file"); } diff --git a/tools/opt/PrintSCC.cpp b/tools/opt/PrintSCC.cpp index 689307ca66..bf3078f672 100644 --- a/tools/opt/PrintSCC.cpp +++ b/tools/opt/PrintSCC.cpp @@ -35,7 +35,7 @@ using namespace llvm; namespace { struct CFGSCC : public FunctionPass { - static const int ID; // Pass identification, replacement for typeid + static const char ID; // Pass identification, replacement for typeid CFGSCC() : FunctionPass((intptr_t)&ID) {} bool runOnFunction(Function& func); @@ -47,7 +47,7 @@ namespace { }; struct CallGraphSCC : public ModulePass { - static const int ID; // Pass identification, replacement for typeid + static const char ID; // Pass identification, replacement for typeid CallGraphSCC() : ModulePass((intptr_t)&ID) {} // run - Print out SCCs in the call graph for the specified module. @@ -62,11 +62,11 @@ namespace { } }; - const int CFGSCC::ID = 0; + const char CFGSCC::ID = 0; RegisterPass Y("cfgscc", "Print SCCs of each function CFG"); - const int CallGraphSCC::ID = 0; + const char CallGraphSCC::ID = 0; RegisterPass Z("callscc", "Print SCCs of the Call Graph"); } diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp index 680bb5f49f..3df54f200b 100644 --- a/tools/opt/opt.cpp +++ b/tools/opt/opt.cpp @@ -98,7 +98,7 @@ AnalyzeOnly("analyze", cl::desc("Only perform analysis, no optimization")); namespace { struct ModulePassPrinter : public ModulePass { - static const int ID; + static const char ID; const PassInfo *PassToPrint; ModulePassPrinter(const PassInfo *PI) : ModulePass((intptr_t)&ID), PassToPrint(PI) {} @@ -121,10 +121,10 @@ struct ModulePassPrinter : public ModulePass { } }; -const int ModulePassPrinter::ID = 0; +const char ModulePassPrinter::ID = 0; struct FunctionPassPrinter : public FunctionPass { const PassInfo *PassToPrint; - static const int ID; + static const char ID; FunctionPassPrinter(const PassInfo *PI) : FunctionPass((intptr_t)&ID), PassToPrint(PI) {} @@ -146,10 +146,10 @@ struct FunctionPassPrinter : public FunctionPass { } }; -const int FunctionPassPrinter::ID = 0; +const char FunctionPassPrinter::ID = 0; struct BasicBlockPassPrinter : public BasicBlockPass { const PassInfo *PassToPrint; - static const int ID; + static const char ID; BasicBlockPassPrinter(const PassInfo *PI) : BasicBlockPass((intptr_t)&ID), PassToPrint(PI) {} @@ -172,7 +172,7 @@ struct BasicBlockPassPrinter : public BasicBlockPass { } }; -const int BasicBlockPassPrinter::ID = 0; +const char BasicBlockPassPrinter::ID = 0; inline void addPass(PassManager &PM, Pass *P) { // Add the pass to the pass manager... PM.add(P); -- cgit v1.2.3