SIL: remove dump and print from SILValue

If you want to dump a SILValue from the debugger, use Value->dump()
pyrtsa · Jan 25, 2016 · d3c9753 · d3c9753
1 parent 845b3fe
commit d3c9753
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 16 deletions.
diff --git a/include/swift/SIL/SILValue.h b/include/swift/SIL/SILValue.h
@@ -170,9 +170,6 @@ class SILValue {
     return Value < RHS.Value;
   }
 
-  void dump() const;
-  void print(raw_ostream &os) const;
-
   /// Return true if underlying ValueBase of this SILValue is non-null. Return
   /// false otherwise.
   explicit operator bool() const { return getDef() != nullptr; }
@@ -586,7 +583,7 @@ static inline llvm::hash_code hash_value(SILValue V) {
 }
 
 inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, SILValue V) {
-  V.print(OS);
+  V->print(OS);
   return OS;
 }
 

diff --git a/lib/SIL/SILPrinter.cpp b/lib/SIL/SILPrinter.cpp
@@ -1510,14 +1510,6 @@ void SILBasicBlock::printAsOperand(raw_ostream &OS, bool PrintType) {
 // Printing for SILInstruction, SILBasicBlock, SILFunction, and SILModule
 //===----------------------------------------------------------------------===//
 
-void SILValue::dump() const {
-  print(llvm::errs());
-}
-
-void SILValue::print(raw_ostream &OS) const {
-  SILPrinter(OS).print(*this);
-}
-
 void ValueBase::dump() const {
   print(llvm::errs());
 }

diff --git a/lib/SILGen/SILGenApply.cpp b/lib/SILGen/SILGenApply.cpp
@@ -1713,7 +1713,7 @@ static SILValue emitRawApply(SILGenFunction &gen,
       out << "TYPE MISMATCH IN ARGUMENT " << i << " OF APPLY AT ";
       printSILLocationDescription(out, loc, gen.getASTContext());
       out << "  argument value: ";
-      argValue.print(out);
+      argValue->print(out);
       out << "  parameter type: ";
       inputTypes[i].print(out);
       out << "\n";

diff --git a/lib/SILGen/SILGenPoly.cpp b/lib/SILGen/SILGenPoly.cpp
@@ -1108,7 +1108,7 @@ namespace {
         llvm::errs() << "inout writeback in abstraction difference thunk "
                         "not yet implemented\n";
         llvm::errs() << "input value ";
-        input.getValue().dump();
+        input.getValue()->dump();
         llvm::errs() << "output type " << result.getSILType() << "\n";
         abort();
       }

diff --git a/lib/SILOptimizer/Analysis/EscapeAnalysis.cpp b/lib/SILOptimizer/Analysis/EscapeAnalysis.cpp
@@ -651,7 +651,7 @@ std::string CGForDotView::getNodeLabel(const Node *Node) const {
     default: {
       std::string Inst;
       llvm::raw_string_ostream OI(Inst);
-      SILValue(Node->OrigNode->V).print(OI);
+      SILValue(Node->OrigNode->V)->print(OI);
       size_t start = Inst.find(" = ");
       if (start != std::string::npos) {
         start += 3;

diff --git a/lib/SILOptimizer/Transforms/SimplifyCFG.cpp b/lib/SILOptimizer/Transforms/SimplifyCFG.cpp
@@ -2825,7 +2825,7 @@ getSILValueFromCaseResult(SILBuilder &B, SILLocation Loc,
       return B.createIntegerLiteral(Loc, Type, Value.getBoolValue());
   } else {
     llvm::errs() << "Non IntegerLiteralInst switch case result\n";
-    Val.dump();
+    Val->dump();
     return Val;
   }
 }