8 files changed, 2 insertions, 14 deletions
diff --git a/clang/lib/AST/APValue.cpp b/clang/lib/AST/APValue.cpp
index 23e9e980c56..4df7671c5a9 100644
--- a/clang/lib/AST/APValue.cpp
+++ b/clang/lib/AST/APValue.cpp
@@ -67,7 +67,6 @@ void APValue::MakeUninit() {
 void APValue::dump() const {
   print(llvm::errs());
   llvm::errs() << '\n';
-  llvm::errs().flush();
 }
 
 static double GetApproxValue(const llvm::APFloat &F) {
diff --git a/clang/lib/AST/StmtPrinter.cpp b/clang/lib/AST/StmtPrinter.cpp
index bcd1a86ca62..c52eb7e84ef 100644
--- a/clang/lib/AST/StmtPrinter.cpp
+++ b/clang/lib/AST/StmtPrinter.cpp
@@ -1223,9 +1223,7 @@ void StmtPrinter::VisitBlockDeclRefExpr(BlockDeclRefExpr *Node) {
 //===----------------------------------------------------------------------===//
 
 void Stmt::dumpPretty() const {
-  llvm::raw_ostream &OS = llvm::errs();
-  printPretty(OS);
-  OS.flush();
+  printPretty(llvm::errs());
 }
 
 void Stmt::printPretty(llvm::raw_ostream &OS, PrinterHelper* Helper,
diff --git a/clang/lib/Analysis/SVals.cpp b/clang/lib/Analysis/SVals.cpp
index c12c2d27700..cca0e94191d 100644
--- a/clang/lib/Analysis/SVals.cpp
+++ b/clang/lib/Analysis/SVals.cpp
@@ -350,7 +350,7 @@ Loc Loc::MakeVal(SymbolRef sym) { return loc::SymbolVal(sym); }
 // Pretty-Printing.
 //===----------------------------------------------------------------------===//
 
-void SVal::printStdErr() const { print(llvm::errs()); llvm::errs().flush(); }
+void SVal::printStdErr() const { print(llvm::errs()); }
 
 void SVal::print(std::ostream& Out) const {
   llvm::raw_os_ostream out(Out);
diff --git a/clang/lib/Basic/SourceLocation.cpp b/clang/lib/Basic/SourceLocation.cpp
index dc1dceb7248..82e24d00a2a 100644
--- a/clang/lib/Basic/SourceLocation.cpp
+++ b/clang/lib/Basic/SourceLocation.cpp
@@ -69,7 +69,6 @@ void SourceLocation::print(llvm::raw_ostream &OS, const SourceManager &SM)const{
 
 void SourceLocation::dump(const SourceManager &SM) const {
   print(llvm::errs(), SM);
-  llvm::errs().flush();
 }
 
 void SourceRange::Emit(llvm::Serializer& S) const {
diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp
index 1ae4a87606c..e9ac5c9751e 100644
--- a/clang/lib/CodeGen/CGCall.cpp
+++ b/clang/lib/CodeGen/CGCall.cpp
@@ -127,8 +127,6 @@ void ABIArgInfo::dump() const {
   case Coerce: 
     fprintf(stderr, "Coerce Type=");
     getCoerceToType()->print(llvm::errs());
-    // FIXME: This is ridiculous.
-    llvm::errs().flush();
     break;
   case Indirect: 
     fprintf(stderr, "Indirect Align=%d", getIndirectAlign());
diff --git a/clang/lib/Driver/Arg.cpp b/clang/lib/Driver/Arg.cpp
index 16efda8ecfa..625e7845798 100644
--- a/clang/lib/Driver/Arg.cpp
+++ b/clang/lib/Driver/Arg.cpp
@@ -47,8 +47,6 @@ void Arg::dump() const {
     llvm::errs() << " NumValues:" << getNumValues();
 
   llvm::errs() << ">\n";
-
-  llvm::errs().flush(); // FIXME
 }
 
 FlagArg::FlagArg(const Option *Opt, unsigned Index)
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 541a6d8eeba..5750154a09b 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -59,8 +59,6 @@ Compilation *Driver::BuildCompilation(int argc, const char **argv) {
       llvm::errs() << '"' << A->getValue(*Args, j) << '"';
     }
     llvm::errs() << "}\n";
-
-    llvm::errs().flush(); // FIXME
   }
 
   return new Compilation();
diff --git a/clang/lib/Driver/Option.cpp b/clang/lib/Driver/Option.cpp
index 73cef25a55d..f92e7aab265 100644
--- a/clang/lib/Driver/Option.cpp
+++ b/clang/lib/Driver/Option.cpp
@@ -69,8 +69,6 @@ void Option::dump() const {
     llvm::errs() << " NumArgs:" << MOA->getNumArgs();
 
   llvm::errs() << ">\n";
-
-  llvm::errs().flush(); // FIXME
 }
 
 bool Option::matches(const Option *Opt) const {