Remove the 'printname' argument to WriteAsOperand. It is always true, and
passing false would make the asmprinter fail anyway.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32264 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/Assembly/Writer.h b/include/llvm/Assembly/Writer.h
index 9ddb45e..45c9513 100644
--- a/include/llvm/Assembly/Writer.h
+++ b/include/llvm/Assembly/Writer.h
@@ -38,7 +38,7 @@
// pointer is printed symbolically.
//
std::ostream &WriteAsOperand(std::ostream &, const Value *, bool PrintTy = true,
- bool PrintName = true, const Module *Context = 0);
+ const Module *Context = 0);
} // End llvm namespace
diff --git a/lib/Analysis/AliasAnalysisCounter.cpp b/lib/Analysis/AliasAnalysisCounter.cpp
index 6412dbb..d563c13 100644
--- a/lib/Analysis/AliasAnalysisCounter.cpp
+++ b/lib/Analysis/AliasAnalysisCounter.cpp
@@ -135,9 +135,9 @@
if (PrintAll || (PrintAllFailures && R == MayAlias)) {
llvm_cerr << AliasString << ":\t";
llvm_cerr << "[" << V1Size << "B] ";
- WriteAsOperand(std::cerr, V1, true, true, M) << ", ";
+ WriteAsOperand(std::cerr, V1, true, M) << ", ";
llvm_cerr << "[" << V2Size << "B] ";
- WriteAsOperand(std::cerr, V2, true, true, M) << "\n";
+ WriteAsOperand(std::cerr, V2, true, M) << "\n";
}
return R;
@@ -159,7 +159,7 @@
if (PrintAll || (PrintAllFailures && R == ModRef)) {
llvm_cerr << MRString << ": Ptr: ";
llvm_cerr << "[" << Size << "B] ";
- WriteAsOperand(std::cerr, P, true, true, M);
+ WriteAsOperand(std::cerr, P, true, M);
llvm_cerr << "\t<->" << *CS.getInstruction();
}
return R;
diff --git a/lib/Analysis/AliasAnalysisEvaluator.cpp b/lib/Analysis/AliasAnalysisEvaluator.cpp
index 946a2dd..d64394a 100644
--- a/lib/Analysis/AliasAnalysisEvaluator.cpp
+++ b/lib/Analysis/AliasAnalysisEvaluator.cpp
@@ -80,8 +80,8 @@
Module *M) {
if (P) {
llvm_cerr << " " << Msg << ":\t";
- WriteAsOperand(std::cerr, V1, true, true, M) << ", ";
- WriteAsOperand(std::cerr, V2, true, true, M) << "\n";
+ WriteAsOperand(std::cerr, V1, true, M) << ", ";
+ WriteAsOperand(std::cerr, V2, true, M) << "\n";
}
}
@@ -90,7 +90,7 @@
Module *M) {
if (P) {
llvm_cerr << " " << Msg << ": Ptr: ";
- WriteAsOperand(std::cerr, Ptr, true, true, M);
+ WriteAsOperand(std::cerr, Ptr, true, M);
llvm_cerr << "\t<->" << *I;
}
}
diff --git a/lib/Analysis/CFGPrinter.cpp b/lib/Analysis/CFGPrinter.cpp
index 3f6846e..bfc71c6 100644
--- a/lib/Analysis/CFGPrinter.cpp
+++ b/lib/Analysis/CFGPrinter.cpp
@@ -50,12 +50,12 @@
std::ostringstream Out;
if (CFGOnly) {
- WriteAsOperand(Out, Node, false, true);
+ WriteAsOperand(Out, Node, false);
return Out.str();
}
if (Node->getName().empty()) {
- WriteAsOperand(Out, Node, false, true);
+ WriteAsOperand(Out, Node, false);
Out << ":";
}
diff --git a/lib/Analysis/DataStructure/Printer.cpp b/lib/Analysis/DataStructure/Printer.cpp
index ef3ed75..af358bf 100644
--- a/lib/Analysis/DataStructure/Printer.cpp
+++ b/lib/Analysis/DataStructure/Printer.cpp
@@ -81,7 +81,7 @@
if (G) GlobalECs = &G->getGlobalECs();
for (unsigned i = 0, e = N->getGlobalsList().size(); i != e; ++i) {
- WriteAsOperand(OS, N->getGlobalsList()[i], false, true, M);
+ WriteAsOperand(OS, N->getGlobalsList()[i], false, M);
// Figure out how many globals are equivalent to this one.
if (GlobalECs) {
@@ -157,7 +157,7 @@
for (DSGraph::ScalarMapTy::const_iterator I = VM.begin(); I != VM.end();++I)
if (!isa<GlobalValue>(I->first)) {
std::stringstream OS;
- WriteAsOperand(OS, I->first, false, true, CurMod);
+ WriteAsOperand(OS, I->first, false, CurMod);
GW.emitSimpleNode(I->first, "", OS.str());
// Add edge from return node to real destination
diff --git a/lib/Analysis/Trace.cpp b/lib/Analysis/Trace.cpp
index 91c7ffa..d045755 100644
--- a/lib/Analysis/Trace.cpp
+++ b/lib/Analysis/Trace.cpp
@@ -38,7 +38,7 @@
for (const_iterator i = begin(), e = end(); i != e; ++i) {
O << "; ";
if (O.stream())
- WriteAsOperand(*O.stream(), *i, true, true, getModule());
+ WriteAsOperand(*O.stream(), *i, true, getModule());
O << "\n";
}
O << "; Trace parent function: \n" << *F;
diff --git a/lib/Transforms/Scalar/Reassociate.cpp b/lib/Transforms/Scalar/Reassociate.cpp
index 2df52ae..b0637ba 100644
--- a/lib/Transforms/Scalar/Reassociate.cpp
+++ b/lib/Transforms/Scalar/Reassociate.cpp
@@ -60,7 +60,7 @@
std::cerr << Instruction::getOpcodeName(I->getOpcode()) << " "
<< *Ops[0].Op->getType();
for (unsigned i = 0, e = Ops.size(); i != e; ++i)
- WriteAsOperand(std::cerr << " ", Ops[i].Op, false, true, M)
+ WriteAsOperand(std::cerr << " ", Ops[i].Op, false, M)
<< "," << Ops[i].Rank;
}
diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp
index f1e14a6..4e43a0c 100644
--- a/lib/VMCore/Verifier.cpp
+++ b/lib/VMCore/Verifier.cpp
@@ -218,7 +218,7 @@
if (isa<Instruction>(V)) {
msgs << *V;
} else {
- WriteAsOperand (msgs, V, true, true, Mod);
+ WriteAsOperand(msgs, V, true, Mod);
msgs << "\n";
}
}