For PR387:\
Make only one print method to avoid overloaded virtual warnings when \
compiled with -Woverloaded-virtual
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18589 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h
index c1cdae5..c901911 100644
--- a/include/llvm/Analysis/Dominators.h
+++ b/include/llvm/Analysis/Dominators.h
@@ -114,7 +114,7 @@
/// 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 @@
/// 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 @@
/// 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 @@
/// 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 408ace2..d5dd64e 100644
--- a/include/llvm/Analysis/IntervalPartition.h
+++ b/include/llvm/Analysis/IntervalPartition.h
@@ -60,7 +60,7 @@
~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 32351ea..0be3ddb 100644
--- a/include/llvm/Analysis/LoopInfo.h
+++ b/include/llvm/Analysis/LoopInfo.h
@@ -241,7 +241,7 @@
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 d72405d..3a97e91 100644
--- a/include/llvm/Analysis/ScalarEvolution.h
+++ b/include/llvm/Analysis/ScalarEvolution.h
@@ -202,7 +202,7 @@
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 036ca13..8156008 100644
--- a/include/llvm/CodeGen/LiveIntervalAnalysis.h
+++ b/include/llvm/CodeGen/LiveIntervalAnalysis.h
@@ -128,7 +128,7 @@
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 ff710d3..0855986 100644
--- a/include/llvm/Pass.h
+++ b/include/llvm/Pass.h
@@ -96,8 +96,7 @@
/// 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 b277634..85937ad 100644
--- a/lib/Analysis/AliasSetTracker.cpp
+++ b/lib/Analysis/AliasSetTracker.cpp
@@ -539,7 +539,7 @@
}
/// 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 88f9843..c19bbad 100644
--- a/lib/Analysis/CFGPrinter.cpp
+++ b/lib/Analysis/CFGPrinter.cpp
@@ -101,7 +101,7 @@
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 @@
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 7e3f85f..330362e 100644
--- a/lib/Analysis/DataStructure/DataStructureStats.cpp
+++ b/lib/Analysis/DataStructure/DataStructureStats.cpp
@@ -57,7 +57,7 @@
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 6793b0e..e1217bd 100644
--- a/lib/Analysis/DataStructure/IPModRef.cpp
+++ b/lib/Analysis/DataStructure/IPModRef.cpp
@@ -424,7 +424,7 @@
}
-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 f8ac15c..bb674a0 100644
--- a/lib/Analysis/DataStructure/IPModRef.h
+++ b/lib/Analysis/DataStructure/IPModRef.h
@@ -213,7 +213,7 @@
// 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 f6c54fb..51485da 100644
--- a/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
+++ b/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
@@ -405,7 +405,7 @@
/// 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 ed21e5f..3123bee 100644
--- a/lib/Analysis/DataStructure/MemoryDepAnalysis.h
+++ b/lib/Analysis/DataStructure/MemoryDepAnalysis.h
@@ -94,7 +94,7 @@
/// 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 102c72b..69201c2 100644
--- a/lib/Analysis/DataStructure/PgmDependenceGraph.cpp
+++ b/lib/Analysis/DataStructure/PgmDependenceGraph.cpp
@@ -222,7 +222,7 @@
}
-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 d777494..a56a7d3 100644
--- a/lib/Analysis/DataStructure/PgmDependenceGraph.h
+++ b/lib/Analysis/DataStructure/PgmDependenceGraph.h
@@ -292,7 +292,7 @@
/// 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 5fe1eec..d37c4ca 100644
--- a/lib/Analysis/IPA/PrintSCC.cpp
+++ b/lib/Analysis/IPA/PrintSCC.cpp
@@ -37,7 +37,7 @@
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 @@
// 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 4f178f4..eb2c06c 100644
--- a/lib/Analysis/IntervalPartition.cpp
+++ b/lib/Analysis/IntervalPartition.cpp
@@ -32,7 +32,7 @@
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 0444c84..156d8b1 100644
--- a/lib/Analysis/LoopInfo.cpp
+++ b/lib/Analysis/LoopInfo.cpp
@@ -119,7 +119,7 @@
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 7572116..ad08489 100644
--- a/lib/Analysis/ScalarEvolution.cpp
+++ b/lib/Analysis/ScalarEvolution.cpp
@@ -2326,7 +2326,7 @@
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 713f2f8..df3c6c2 100644
--- a/lib/CodeGen/LiveIntervalAnalysis.cpp
+++ b/lib/CodeGen/LiveIntervalAnalysis.cpp
@@ -169,7 +169,7 @@
}
/// 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 036ca13..8156008 100644
--- a/lib/CodeGen/LiveIntervalAnalysis.h
+++ b/lib/CodeGen/LiveIntervalAnalysis.h
@@ -128,7 +128,7 @@
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 a120db4..b70c7b5 100644
--- a/lib/VMCore/Dominators.cpp
+++ b/lib/VMCore/Dominators.cpp
@@ -210,7 +210,7 @@
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 @@
}
}
-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 @@
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 @@
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 87748d8..acde824 100644
--- a/lib/VMCore/Pass.cpp
+++ b/lib/VMCore/Pass.cpp
@@ -217,7 +217,7 @@
// 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 5fe1eec..d37c4ca 100644
--- a/tools/analyze/PrintSCC.cpp
+++ b/tools/analyze/PrintSCC.cpp
@@ -37,7 +37,7 @@
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 @@
// 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 5fe1eec..d37c4ca 100644
--- a/tools/opt/PrintSCC.cpp
+++ b/tools/opt/PrintSCC.cpp
@@ -37,7 +37,7 @@
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 @@
// 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 {