3 files changed, 10 insertions, 13 deletions
diff --git a/llvm/lib/Analysis/AliasAnalysisCounter.cpp b/llvm/lib/Analysis/AliasAnalysisCounter.cpp
index b2b6739ae10..d3f0dd0be0f 100644
--- a/llvm/lib/Analysis/AliasAnalysisCounter.cpp
+++ b/llvm/lib/Analysis/AliasAnalysisCounter.cpp
@@ -18,7 +18,6 @@
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Streams.h"
-#include <iostream>
 using namespace llvm;
 
 namespace {
@@ -131,9 +130,9 @@ AliasAnalysisCounter::alias(const Value *V1, unsigned V1Size,
   if (PrintAll || (PrintAllFailures && R == MayAlias)) {
     cerr << AliasString << ":\t";
     cerr << "[" << V1Size << "B] ";
-    WriteAsOperand(std::cerr, V1, true, M) << ", ";
+    WriteAsOperand(*cerr.stream(), V1, true, M) << ", ";
     cerr << "[" << V2Size << "B] ";
-    WriteAsOperand(std::cerr, V2, true, M) << "\n";
+    WriteAsOperand(*cerr.stream(), V2, true, M) << "\n";
   }
 
   return R;
@@ -155,7 +154,7 @@ AliasAnalysisCounter::getModRefInfo(CallSite CS, Value *P, unsigned Size) {
   if (PrintAll || (PrintAllFailures && R == ModRef)) {
     cerr << MRString << ":  Ptr: ";
     cerr << "[" << Size << "B] ";
-    WriteAsOperand(std::cerr, P, true, M);
+    WriteAsOperand(*cerr.stream(), P, true, M);
     cerr << "\t<->" << *CS.getInstruction();
   }
   return R;
diff --git a/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp b/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
index 31875f87104..0f27974c5b3 100644
--- a/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
+++ b/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
@@ -29,7 +29,6 @@
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Streams.h"
-#include <iostream>
 #include <set>
 using namespace llvm;
 
@@ -80,8 +79,8 @@ static inline void PrintResults(const char *Msg, bool P, Value *V1, Value *V2,
                                 Module *M) {
   if (P) {
     cerr << "  " << Msg << ":\t";
-    WriteAsOperand(std::cerr, V1, true, M) << ", ";
-    WriteAsOperand(std::cerr, V2, true, M) << "\n";
+    WriteAsOperand(*cerr.stream(), V1, true, M) << ", ";
+    WriteAsOperand(*cerr.stream(), V2, true, M) << "\n";
   }
 }
 
@@ -90,7 +89,7 @@ PrintModRefResults(const char *Msg, bool P, Instruction *I, Value *Ptr,
                    Module *M) {
   if (P) {
     cerr << "  " << Msg << ":  Ptr: ";
-    WriteAsOperand(std::cerr, Ptr, true, M);
+    WriteAsOperand(*cerr.stream(), Ptr, true, M);
     cerr << "\t<->" << *I;
   }
 }
diff --git a/llvm/lib/Analysis/DataStructure/DataStructure.cpp b/llvm/lib/Analysis/DataStructure/DataStructure.cpp
index c81fd6ad341..666b615825b 100644
--- a/llvm/lib/Analysis/DataStructure/DataStructure.cpp
+++ b/llvm/lib/Analysis/DataStructure/DataStructure.cpp
@@ -26,7 +26,6 @@
 #include "llvm/ADT/SCCIterator.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/Support/Timer.h"
-#include <iostream>
 #include <algorithm>
 using namespace llvm;
 
@@ -721,10 +720,10 @@ bool DSNode::mergeTypeInfo(const Type *NewTy, unsigned Offset,
     M = getParentGraph()->retnodes_begin()->first->getParent();
 
   DOUT << "MergeTypeInfo Folding OrigTy: ";
-  DEBUG(WriteTypeSymbolic(std::cerr, Ty, M) << "\n due to:";
-        WriteTypeSymbolic(std::cerr, NewTy, M) << " @ " << Offset << "!\n"
-                                               << "SubType: ";
-        WriteTypeSymbolic(std::cerr, SubType, M) << "\n\n");
+  DEBUG(WriteTypeSymbolic(*cerr.stream(), Ty, M) << "\n due to:";
+        WriteTypeSymbolic(*cerr.stream(), NewTy, M) << " @ " << Offset << "!\n"
+                                                    << "SubType: ";
+        WriteTypeSymbolic(*cerr.stream(), SubType, M) << "\n\n");
 
   if (FoldIfIncompatible) foldNodeCompletely();
   return true;