diff options
25 files changed, 35 insertions, 36 deletions
diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h index c1cdae50f2..c901911495 100644 --- a/include/llvm/Analysis/Dominators.h +++ b/include/llvm/Analysis/Dominators.h @@ -114,7 +114,7 @@ public: /// print - Convert to human readable form /// - virtual void print(std::ostream &OS) const; + virtual void print(std::ostream &OS, const Module* = 0) const; }; //===------------------------------------- @@ -218,7 +218,7 @@ public: /// print - Convert to human readable form /// - virtual void print(std::ostream &OS) const; + virtual void print(std::ostream &OS, const Module* = 0) const; /// dominates - Return true if A dominates B. This performs the special /// checks necessary if A and B are in the same basic block. @@ -375,7 +375,7 @@ public: /// print - Convert to human readable form /// - virtual void print(std::ostream &OS) const; + virtual void print(std::ostream &OS, const Module* = 0) const; }; @@ -475,7 +475,7 @@ public: /// print - Convert to human readable form /// - virtual void print(std::ostream &OS) const; + virtual void print(std::ostream &OS, const Module* = 0) const; }; diff --git a/include/llvm/Analysis/IntervalPartition.h b/include/llvm/Analysis/IntervalPartition.h index 408ace2e7e..d5dd64eca7 100644 --- a/include/llvm/Analysis/IntervalPartition.h +++ b/include/llvm/Analysis/IntervalPartition.h @@ -60,7 +60,7 @@ public: ~IntervalPartition() { destroy(); } // print - Show contents in human readable format... - virtual void print(std::ostream &O) const; + virtual void print(std::ostream &O, const Module* = 0) const; // getRootInterval() - Return the root interval that contains the starting // block of the function. diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h index 32351ea55c..0be3ddb3a0 100644 --- a/include/llvm/Analysis/LoopInfo.h +++ b/include/llvm/Analysis/LoopInfo.h @@ -241,7 +241,7 @@ public: virtual bool runOnFunction(Function &F); virtual void releaseMemory(); - void print(std::ostream &O) const; + void print(std::ostream &O, const Module* = 0) const; /// getAnalysisUsage - Requires dominator sets /// diff --git a/include/llvm/Analysis/ScalarEvolution.h b/include/llvm/Analysis/ScalarEvolution.h index d72405d24d..3a97e91bd7 100644 --- a/include/llvm/Analysis/ScalarEvolution.h +++ b/include/llvm/Analysis/ScalarEvolution.h @@ -202,7 +202,7 @@ namespace llvm { virtual bool runOnFunction(Function &F); virtual void releaseMemory(); virtual void getAnalysisUsage(AnalysisUsage &AU) const; - virtual void print(std::ostream &OS) const; + virtual void print(std::ostream &OS, const Module* = 0) const; }; } diff --git a/include/llvm/CodeGen/LiveIntervalAnalysis.h b/include/llvm/CodeGen/LiveIntervalAnalysis.h index 036ca132d2..815600861f 100644 --- a/include/llvm/CodeGen/LiveIntervalAnalysis.h +++ b/include/llvm/CodeGen/LiveIntervalAnalysis.h @@ -128,7 +128,7 @@ namespace llvm { virtual bool runOnMachineFunction(MachineFunction&); /// print - Implement the dump method. - virtual void print(std::ostream &O) const; + virtual void print(std::ostream &O, const Module* = 0) const; private: /// computeIntervals - compute live intervals diff --git a/include/llvm/Pass.h b/include/llvm/Pass.h index ff710d3766..0855986fbb 100644 --- a/include/llvm/Pass.h +++ b/include/llvm/Pass.h @@ -96,8 +96,7 @@ public: /// provide the Module* in case the analysis doesn't need it it can just be /// ignored. /// - virtual void print(std::ostream &O, const Module *M) const { print(O); } - virtual void print(std::ostream &O) const; + virtual void print(std::ostream &O, const Module *M) const; void dump() const; // dump - call print(std::cerr, 0); diff --git a/lib/Analysis/AliasSetTracker.cpp b/lib/Analysis/AliasSetTracker.cpp index b277634e6c..85937adb38 100644 --- a/lib/Analysis/AliasSetTracker.cpp +++ b/lib/Analysis/AliasSetTracker.cpp @@ -539,7 +539,7 @@ namespace { } /// print - Convert to human readable form - virtual void print(std::ostream &OS) const { + virtual void print(std::ostream &OS, const Module* = 0) const { Tracker->print(OS); } diff --git a/lib/Analysis/CFGPrinter.cpp b/lib/Analysis/CFGPrinter.cpp index 88f9843c0b..c19bbad55c 100644 --- a/lib/Analysis/CFGPrinter.cpp +++ b/lib/Analysis/CFGPrinter.cpp @@ -101,7 +101,7 @@ namespace { return false; } - void print(std::ostream &OS) const {} + void print(std::ostream &OS, const Module* = 0) const {} virtual void getAnalysisUsage(AnalysisUsage &AU) const { AU.setPreservesAll(); @@ -119,7 +119,7 @@ namespace { CFGOnly = OldCFGOnly; return false; } - void print(std::ostream &OS) const {} + void print(std::ostream &OS, const Module* = 0) const {} virtual void getAnalysisUsage(AnalysisUsage &AU) const { AU.setPreservesAll(); diff --git a/lib/Analysis/DataStructure/DataStructureStats.cpp b/lib/Analysis/DataStructure/DataStructureStats.cpp index 7e3f85f3a6..330362ee8f 100644 --- a/lib/Analysis/DataStructure/DataStructureStats.cpp +++ b/lib/Analysis/DataStructure/DataStructureStats.cpp @@ -57,7 +57,7 @@ namespace { void visitStore(StoreInst &SI); /// Debugging support methods - void print(std::ostream &O) const { } + void print(std::ostream &O, const Module* = 0) const { } }; static RegisterAnalysis<DSGraphStats> Z("dsstats", "DS Graph Statistics"); diff --git a/lib/Analysis/DataStructure/IPModRef.cpp b/lib/Analysis/DataStructure/IPModRef.cpp index 6793b0ecdb..e1217bd091 100644 --- a/lib/Analysis/DataStructure/IPModRef.cpp +++ b/lib/Analysis/DataStructure/IPModRef.cpp @@ -424,7 +424,7 @@ void IPModRef::getAnalysisUsage(AnalysisUsage &AU) const { } -void IPModRef::print(std::ostream &O) const +void IPModRef::print(std::ostream &O, const Module*) const { O << "\nRESULTS OF INTERPROCEDURAL MOD/REF ANALYSIS:\n\n"; diff --git a/lib/Analysis/DataStructure/IPModRef.h b/lib/Analysis/DataStructure/IPModRef.h index f8ac15c1be..bb674a0591 100644 --- a/lib/Analysis/DataStructure/IPModRef.h +++ b/lib/Analysis/DataStructure/IPModRef.h @@ -213,7 +213,7 @@ public: // Debugging support methods // - void print(std::ostream &O) const; + void print(std::ostream &O, const Module* = 0) const; void dump() const; /// releaseMemory - Release memory held by this pass when the pass pipeline is diff --git a/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp b/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp index f6c54fb5bb..51485dab89 100644 --- a/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp +++ b/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp @@ -405,7 +405,7 @@ void MemoryDepAnalysis::ProcessSCC(std::vector<BasicBlock*> &S, /// Debugging support methods /// -void MemoryDepAnalysis::print(std::ostream &O) const +void MemoryDepAnalysis::print(std::ostream &O, const Module*) const { // TEMPORARY LOOP for (hash_map<Function*, DependenceGraph*>::const_iterator diff --git a/lib/Analysis/DataStructure/MemoryDepAnalysis.h b/lib/Analysis/DataStructure/MemoryDepAnalysis.h index ed21e5f687..3123bee6cc 100644 --- a/lib/Analysis/DataStructure/MemoryDepAnalysis.h +++ b/lib/Analysis/DataStructure/MemoryDepAnalysis.h @@ -94,7 +94,7 @@ public: /// Debugging support methods /// - void print(std::ostream &O) const; + void print(std::ostream &O, const Module* = 0) const; void dump() const; }; diff --git a/lib/Analysis/DataStructure/PgmDependenceGraph.cpp b/lib/Analysis/DataStructure/PgmDependenceGraph.cpp index 102c72bc47..69201c2df9 100644 --- a/lib/Analysis/DataStructure/PgmDependenceGraph.cpp +++ b/lib/Analysis/DataStructure/PgmDependenceGraph.cpp @@ -222,7 +222,7 @@ void PgmDependenceGraph::printOutgoingSSADeps(Instruction& I, } -void PgmDependenceGraph::print(std::ostream &O) const +void PgmDependenceGraph::print(std::ostream &O, const Module*) const { MemoryDepAnalysis& graphSet = getAnalysis<MemoryDepAnalysis>(); diff --git a/lib/Analysis/DataStructure/PgmDependenceGraph.h b/lib/Analysis/DataStructure/PgmDependenceGraph.h index d7774943bd..a56a7d323f 100644 --- a/lib/Analysis/DataStructure/PgmDependenceGraph.h +++ b/lib/Analysis/DataStructure/PgmDependenceGraph.h @@ -292,7 +292,7 @@ public: /// Debugging support methods /// - void print(std::ostream &O) const; + void print(std::ostream &O, const Module* = 0) const; void dump() const; }; diff --git a/lib/Analysis/IPA/PrintSCC.cpp b/lib/Analysis/IPA/PrintSCC.cpp index 5fe1eecde2..d37c4caa83 100644 --- a/lib/Analysis/IPA/PrintSCC.cpp +++ b/lib/Analysis/IPA/PrintSCC.cpp @@ -37,7 +37,7 @@ namespace { struct CFGSCC : public FunctionPass { bool runOnFunction(Function& func); - void print(std::ostream &O) const { } + void print(std::ostream &O, const Module* = 0) const { } virtual void getAnalysisUsage(AnalysisUsage &AU) const { AU.setPreservesAll(); @@ -48,7 +48,7 @@ namespace { // run - Print out SCCs in the call graph for the specified module. bool runOnModule(Module &M); - void print(std::ostream &O) const { } + void print(std::ostream &O, const Module* = 0) const { } // getAnalysisUsage - This pass requires the CallGraph. virtual void getAnalysisUsage(AnalysisUsage &AU) const { diff --git a/lib/Analysis/IntervalPartition.cpp b/lib/Analysis/IntervalPartition.cpp index 4f178f4f64..eb2c06cc64 100644 --- a/lib/Analysis/IntervalPartition.cpp +++ b/lib/Analysis/IntervalPartition.cpp @@ -32,7 +32,7 @@ void IntervalPartition::destroy() { RootInterval = 0; } -void IntervalPartition::print(std::ostream &O) const { +void IntervalPartition::print(std::ostream &O, const Module*) const { std::copy(Intervals.begin(), Intervals.end(), std::ostream_iterator<const Interval *>(O, "\n")); } diff --git a/lib/Analysis/LoopInfo.cpp b/lib/Analysis/LoopInfo.cpp index 0444c84ec2..156d8b1bac 100644 --- a/lib/Analysis/LoopInfo.cpp +++ b/lib/Analysis/LoopInfo.cpp @@ -119,7 +119,7 @@ void LoopInfo::getAnalysisUsage(AnalysisUsage &AU) const { AU.addRequired<DominatorSet>(); } -void LoopInfo::print(std::ostream &OS) const { +void LoopInfo::print(std::ostream &OS, const Module* ) const { for (unsigned i = 0; i < TopLevelLoops.size(); ++i) TopLevelLoops[i]->print(OS); #if 0 diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp index 757211639b..ad08489cdb 100644 --- a/lib/Analysis/ScalarEvolution.cpp +++ b/lib/Analysis/ScalarEvolution.cpp @@ -2326,7 +2326,7 @@ static void PrintLoopInfo(std::ostream &OS, const ScalarEvolution *SE, std::cerr << "\n"; } -void ScalarEvolution::print(std::ostream &OS) const { +void ScalarEvolution::print(std::ostream &OS, const Module* ) const { Function &F = ((ScalarEvolutionsImpl*)Impl)->F; LoopInfo &LI = ((ScalarEvolutionsImpl*)Impl)->LI; diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index 713f2f892d..df3c6c2b43 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -169,7 +169,7 @@ bool LiveIntervals::runOnMachineFunction(MachineFunction &fn) { } /// print - Implement the dump method. -void LiveIntervals::print(std::ostream &O) const { +void LiveIntervals::print(std::ostream &O, const Module* ) const { O << "********** INTERVALS **********\n"; for (const_iterator I = begin(), E = end(); I != E; ++I) O << " " << I->second << "\n"; diff --git a/lib/CodeGen/LiveIntervalAnalysis.h b/lib/CodeGen/LiveIntervalAnalysis.h index 036ca132d2..815600861f 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.h +++ b/lib/CodeGen/LiveIntervalAnalysis.h @@ -128,7 +128,7 @@ namespace llvm { virtual bool runOnMachineFunction(MachineFunction&); /// print - Implement the dump method. - virtual void print(std::ostream &O) const; + virtual void print(std::ostream &O, const Module* = 0) const; private: /// computeIntervals - compute live intervals diff --git a/lib/VMCore/Dominators.cpp b/lib/VMCore/Dominators.cpp index a120db40bd..b70c7b5155 100644 --- a/lib/VMCore/Dominators.cpp +++ b/lib/VMCore/Dominators.cpp @@ -210,7 +210,7 @@ bool ImmediateDominators::runOnFunction(Function &F) { return false; } -void ImmediateDominatorsBase::print(std::ostream &o) const { +void ImmediateDominatorsBase::print(std::ostream &o, const Module* ) const { Function *F = getRoots()[0]->getParent(); for (Function::iterator I = F->begin(), E = F->end(); I != E; ++I) { o << " Immediate Dominator For Basic Block:"; @@ -313,7 +313,7 @@ static std::ostream &operator<<(std::ostream &o, } } -void DominatorSetBase::print(std::ostream &o) const { +void DominatorSetBase::print(std::ostream &o, const Module* ) const { for (const_iterator I = begin(), E = end(); I != E; ++I) { o << " DomSet For BB: "; if (I->first) @@ -408,7 +408,7 @@ static void PrintDomTree(const DominatorTreeBase::Node *N, std::ostream &o, PrintDomTree(*I, o, Lev+1); } -void DominatorTreeBase::print(std::ostream &o) const { +void DominatorTreeBase::print(std::ostream &o, const Module* ) const { o << "=============================--------------------------------\n" << "Inorder Dominator Tree:\n"; PrintDomTree(getRootNode(), o, 1); @@ -455,7 +455,7 @@ DominanceFrontier::calculate(const DominatorTree &DT, return S; } -void DominanceFrontierBase::print(std::ostream &o) const { +void DominanceFrontierBase::print(std::ostream &o, const Module* ) const { for (const_iterator I = begin(), E = end(); I != E; ++I) { o << " DomFrontier for BB"; if (I->first) diff --git a/lib/VMCore/Pass.cpp b/lib/VMCore/Pass.cpp index 87748d83b4..acde824a79 100644 --- a/lib/VMCore/Pass.cpp +++ b/lib/VMCore/Pass.cpp @@ -217,7 +217,7 @@ const char *Pass::getPassName() const { // to print out the contents of an analysis. Otherwise it is not necessary to // implement this method. // -void Pass::print(std::ostream &O) const { +void Pass::print(std::ostream &O,const Module*) const { O << "Pass::print not implemented for pass: '" << getPassName() << "'!\n"; } diff --git a/tools/analyze/PrintSCC.cpp b/tools/analyze/PrintSCC.cpp index 5fe1eecde2..d37c4caa83 100644 --- a/tools/analyze/PrintSCC.cpp +++ b/tools/analyze/PrintSCC.cpp @@ -37,7 +37,7 @@ namespace { struct CFGSCC : public FunctionPass { bool runOnFunction(Function& func); - void print(std::ostream &O) const { } + void print(std::ostream &O, const Module* = 0) const { } virtual void getAnalysisUsage(AnalysisUsage &AU) const { AU.setPreservesAll(); @@ -48,7 +48,7 @@ namespace { // run - Print out SCCs in the call graph for the specified module. bool runOnModule(Module &M); - void print(std::ostream &O) const { } + void print(std::ostream &O, const Module* = 0) const { } // getAnalysisUsage - This pass requires the CallGraph. virtual void getAnalysisUsage(AnalysisUsage &AU) const { diff --git a/tools/opt/PrintSCC.cpp b/tools/opt/PrintSCC.cpp index 5fe1eecde2..d37c4caa83 100644 --- a/tools/opt/PrintSCC.cpp +++ b/tools/opt/PrintSCC.cpp @@ -37,7 +37,7 @@ namespace { struct CFGSCC : public FunctionPass { bool runOnFunction(Function& func); - void print(std::ostream &O) const { } + void print(std::ostream &O, const Module* = 0) const { } virtual void getAnalysisUsage(AnalysisUsage &AU) const { AU.setPreservesAll(); @@ -48,7 +48,7 @@ namespace { // run - Print out SCCs in the call graph for the specified module. bool runOnModule(Module &M); - void print(std::ostream &O) const { } + void print(std::ostream &O, const Module* = 0) const { } // getAnalysisUsage - This pass requires the CallGraph. virtual void getAnalysisUsage(AnalysisUsage &AU) const { |