Changes in directory llvm/tools/opt:
AnalysisWrappers.cpp updated: 1.21 -> 1.22 GraphPrinters.cpp updated: 1.14 -> 1.15 PrintSCC.cpp updated: 1.15 -> 1.16 opt.cpp updated: 1.134 -> 1.135 --- Log message: Do not use typeinfo to identify pass in pass manager. --- Diffs of the changes: (+31 -4) AnalysisWrappers.cpp | 7 +++++++ GraphPrinters.cpp | 4 ++++ PrintSCC.cpp | 7 +++++++ opt.cpp | 17 +++++++++++++---- 4 files changed, 31 insertions(+), 4 deletions(-) Index: llvm/tools/opt/AnalysisWrappers.cpp diff -u llvm/tools/opt/AnalysisWrappers.cpp:1.21 llvm/tools/opt/AnalysisWrappers.cpp:1.22 --- llvm/tools/opt/AnalysisWrappers.cpp:1.21 Tue Jan 30 14:08:39 2007 +++ llvm/tools/opt/AnalysisWrappers.cpp Tue May 1 16:15:47 2007 @@ -30,6 +30,8 @@ /// 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 + ExternalFunctionsPassedConstants() : ModulePass((intptr_t)&ID) {} virtual bool runOnModule(Module &M) { for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) if (I->isDeclaration()) { @@ -61,10 +63,14 @@ } }; + const int ExternalFunctionsPassedConstants::ID = 0; RegisterPass<ExternalFunctionsPassedConstants> P1("externalfnconstants", "Print external fn callsites passed constants"); struct CallGraphPrinter : public ModulePass { + static const int ID; // Pass ID, replacement for typeid + CallGraphPrinter() : ModulePass((intptr_t)&ID) {} + virtual void getAnalysisUsage(AnalysisUsage &AU) const { AU.setPreservesAll(); AU.addRequiredTransitive<CallGraph>(); @@ -76,6 +82,7 @@ } }; + const int CallGraphPrinter::ID = 0; RegisterPass<CallGraphPrinter> P2("callgraph", "Print a call graph"); } Index: llvm/tools/opt/GraphPrinters.cpp diff -u llvm/tools/opt/GraphPrinters.cpp:1.14 llvm/tools/opt/GraphPrinters.cpp:1.15 --- llvm/tools/opt/GraphPrinters.cpp:1.14 Fri Nov 17 04:05:07 2006 +++ llvm/tools/opt/GraphPrinters.cpp Tue May 1 16:15:47 2007 @@ -60,6 +60,9 @@ namespace { struct CallGraphPrinter : public ModulePass { + static const int ID; // Pass ID, replacement for typeid + CallGraphPrinter() : ModulePass((intptr_t)&ID) {} + virtual bool runOnModule(Module &M) { WriteGraphToFile(std::cerr, "callgraph", &getAnalysis<CallGraph>()); return false; @@ -74,6 +77,7 @@ } }; + const int CallGraphPrinter::ID = 0; RegisterPass<CallGraphPrinter> P2("print-callgraph", "Print Call Graph to 'dot' file"); } Index: llvm/tools/opt/PrintSCC.cpp diff -u llvm/tools/opt/PrintSCC.cpp:1.15 llvm/tools/opt/PrintSCC.cpp:1.16 --- llvm/tools/opt/PrintSCC.cpp:1.15 Sun Aug 27 17:30:17 2006 +++ llvm/tools/opt/PrintSCC.cpp Tue May 1 16:15:47 2007 @@ -35,6 +35,8 @@ namespace { struct CFGSCC : public FunctionPass { + static const int ID; // Pass identification, replacement for typeid + CFGSCC() : FunctionPass((intptr_t)&ID) {} bool runOnFunction(Function& func); void print(std::ostream &O, const Module* = 0) const { } @@ -45,6 +47,9 @@ }; struct CallGraphSCC : public ModulePass { + static const int ID; // Pass identification, replacement for typeid + CallGraphSCC() : ModulePass((intptr_t)&ID) {} + // run - Print out SCCs in the call graph for the specified module. bool runOnModule(Module &M); @@ -57,9 +62,11 @@ } }; + const int CFGSCC::ID = 0; RegisterPass<CFGSCC> Y("cfgscc", "Print SCCs of each function CFG"); + const int CallGraphSCC::ID = 0; RegisterPass<CallGraphSCC> Z("callscc", "Print SCCs of the Call Graph"); } Index: llvm/tools/opt/opt.cpp diff -u llvm/tools/opt/opt.cpp:1.134 llvm/tools/opt/opt.cpp:1.135 --- llvm/tools/opt/opt.cpp:1.134 Thu Apr 19 23:45:58 2007 +++ llvm/tools/opt/opt.cpp Tue May 1 16:15:47 2007 @@ -98,8 +98,10 @@ namespace { struct ModulePassPrinter : public ModulePass { + static const int ID; const PassInfo *PassToPrint; - ModulePassPrinter(const PassInfo *PI) : PassToPrint(PI) {} + ModulePassPrinter(const PassInfo *PI) : ModulePass((intptr_t)&ID), + PassToPrint(PI) {} virtual bool runOnModule(Module &M) { if (!Quiet) { @@ -119,12 +121,15 @@ } }; +const int ModulePassPrinter::ID = 0; struct FunctionPassPrinter : public FunctionPass { const PassInfo *PassToPrint; - FunctionPassPrinter(const PassInfo *PI) : PassToPrint(PI) {} + static const int ID; + FunctionPassPrinter(const PassInfo *PI) : FunctionPass((intptr_t)&ID), + PassToPrint(PI) {} virtual bool runOnFunction(Function &F) { - if (!Quiet) { + if (!Quiet) { cout << "Printing analysis '" << PassToPrint->getPassName() << "' for function '" << F.getName() << "':\n"; } @@ -141,9 +146,12 @@ } }; +const int FunctionPassPrinter::ID = 0; struct BasicBlockPassPrinter : public BasicBlockPass { const PassInfo *PassToPrint; - BasicBlockPassPrinter(const PassInfo *PI) : PassToPrint(PI) {} + static const int ID; + BasicBlockPassPrinter(const PassInfo *PI) + : BasicBlockPass((intptr_t)&ID), PassToPrint(PI) {} virtual bool runOnBasicBlock(BasicBlock &BB) { if (!Quiet) { @@ -164,6 +172,7 @@ } }; +const int BasicBlockPassPrinter::ID = 0; inline void addPass(PassManager &PM, Pass *P) { // Add the pass to the pass manager... PM.add(P); _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits