2 files changed, 6 insertions, 19 deletions
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 211f708c79..d2afe1e46d 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -1774,19 +1774,6 @@ void AsmPrinter::EmitComments(const MCInst &MI) const
   }
 }
 
-/// Indent - Insert spaces into the character output stream.  The
-/// "level" is multiplied by the "scale" to calculate the number of
-/// spaces to insert.  "level" can represent something like loop
-/// nesting level, for example.
-///
-static formatted_raw_ostream &
-Indent(formatted_raw_ostream &out, int level, int scale = 2) {
-  for(int i = 0; i < level*scale; ++i) {
-    out << " ";
-  }
-  return out;
-}
-
 /// PrintChildLoopComment - Print comments about child loops within
 /// the loop for this basic block, with nesting.
 ///
@@ -1806,7 +1793,7 @@ static void PrintChildLoopComment(formatted_raw_ostream &O,
     O.PadToColumn(MAI->getCommentColumn());
 
     O << MAI->getCommentString();
-    Indent(O, (*cl)->getLoopDepth()-1)
+    O.indent(((*cl)->getLoopDepth()-1)*2)
       << " Child Loop BB" << FunctionNumber << "_"
       << Header->getNumber() << " Depth " << (*cl)->getLoopDepth();
 
@@ -1858,7 +1845,7 @@ void AsmPrinter::EmitComments(const MachineBasicBlock &MBB) const
         O << '\n';
         O.PadToColumn(MAI->getCommentColumn());
         O << MAI->getCommentString();
-        Indent(O, CurLoop->getLoopDepth()-1)
+        O.indent((CurLoop->getLoopDepth()-1)*2)
           << " Inside Loop BB" << getFunctionNumber() << "_"
           << Header->getNumber() << " Depth " << CurLoop->getLoopDepth();
       }
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 358281045f..83a7772206 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -183,10 +183,10 @@ public:
 
 #ifndef NDEBUG
 void DbgScope::dump() const {
-  std::string Indent(IndentLevel, ' ');
-
-  cerr << Indent; Desc.dump();
-  cerr << " [" << StartLabelID << ", " << EndLabelID << "]\n";
+  raw_ostream &err = errs();
+  err.indent(IndentLevel);
+  Desc.dump();
+  err << " [" << StartLabelID << ", " << EndLabelID << "]\n";
 
   IndentLevel += 2;