1 files changed, 10 insertions, 15 deletions

diff --git a/lib/Analysis/DataStructure/TopDownClosure.cpp b/lib/Analysis/DataStructure/TopDownClosure.cpp
index d0bb7e1e07..57a8924ae4 100644
--- a/lib/Analysis/DataStructure/TopDownClosure.cpp
+++ b/lib/Analysis/DataStructure/TopDownClosure.cpp
@@ -21,7 +21,6 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Timer.h"
 #include "llvm/ADT/Statistic.h"
-#include <iostream>
 using namespace llvm;
 
 #if 0
@@ -241,8 +240,7 @@ void TDDataStructures::InlineCallersIntoGraph(DSGraph &DSG) {
       RC.getClonedNH(GG.getNodeForValue(*GI));
   }
 
-  DEBUG(std::cerr << "[TD] Inlining callers into '" << DSG.getFunctionNames()
-        << "'\n");
+  DOUT << "[TD] Inlining callers into '" << DSG.getFunctionNames() << "'\n";
 
   // Iteratively inline caller graphs into this graph.
   while (!EdgesFromCaller.empty()) {
@@ -258,16 +256,13 @@ void TDDataStructures::InlineCallersIntoGraph(DSGraph &DSG) {
     do {
       const DSCallSite &CS = *EdgesFromCaller.back().CS;
       Function &CF = *EdgesFromCaller.back().CalledFunction;
-      DEBUG(std::cerr << "   [TD] Inlining graph into Fn '"
-            << CF.getName() << "' from ");
+      DOUT << "   [TD] Inlining graph into Fn '" << CF.getName() << "' from ";
       if (CallerGraph.getReturnNodes().empty())
-        DEBUG(std::cerr << "SYNTHESIZED INDIRECT GRAPH");
+        DOUT << "SYNTHESIZED INDIRECT GRAPH";
       else
-        DEBUG (std::cerr << "Fn '"
-               << CS.getCallSite().getInstruction()->
-               getParent()->getParent()->getName() << "'");
-      DEBUG(std::cerr << ": " << CF.getFunctionType()->getNumParams()
-            << " args\n");
+        DOUT << "Fn '" << CS.getCallSite().getInstruction()->
+                            getParent()->getParent()->getName() << "'";
+      DOUT << ": " << CF.getFunctionType()->getNumParams() << " args\n";
 
       // Get the formal argument and return nodes for the called function and
       // merge them with the cloned subgraph.
@@ -371,8 +366,8 @@ void TDDataStructures::InlineCallersIntoGraph(DSGraph &DSG) {
 
     // If we already have this graph, recycle it.
     if (IndCallRecI != IndCallMap.end() && IndCallRecI->first == Callees) {
-      DEBUG(std::cerr << "  [TD] *** Reuse of indcall graph for " << Callees.size()
-            << " callees!\n");
+      DOUT << "  [TD] *** Reuse of indcall graph for " << Callees.size()
+           << " callees!\n";
       IndCallGraph = IndCallRecI->second;
     } else {
       // Otherwise, create a new DSGraph to represent this.
@@ -464,8 +459,8 @@ void TDDataStructures::copyValue(Value *From, Value *To) {
     return;
   }
 
-  std::cerr << *From;
-  std::cerr << *To;
+  DOUT << *From;
+  DOUT << *To;
   assert(0 && "Do not know how to copy this yet!");
   abort();
 }