- s/DOUT/DEBUG(errs()/g
- Tidy up some headers.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77929 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp
index c1e1023..6fb051d 100644
--- a/lib/Target/X86/X86ISelDAGToDAG.cpp
+++ b/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -647,12 +647,12 @@
 
   // Codegen the basic block.
 #ifndef NDEBUG
-  DOUT << "===== Instruction selection begins:\n";
+  DEBUG(errs() << "===== Instruction selection begins:\n");
   Indent = 0;
 #endif
   SelectRoot(*CurDAG);
 #ifndef NDEBUG
-  DOUT << "===== Instruction selection ends:\n";
+  DEBUG(errs() << "===== Instruction selection ends:\n");
 #endif
 
   CurDAG->RemoveDeadNodes();
@@ -805,7 +805,7 @@
                                               unsigned Depth) {
   bool is64Bit = Subtarget->is64Bit();
   DebugLoc dl = N.getDebugLoc();
-  DOUT << "MatchAddress: "; DEBUG(AM.dump());
+  DEBUG(errs() << "MatchAddress: "); DEBUG(AM.dump());
   // Limit recursion.
   if (Depth > 5)
     return MatchAddressBase(N, AM);
@@ -1581,17 +1581,17 @@
   DebugLoc dl = Node->getDebugLoc();
   
 #ifndef NDEBUG
-  DOUT << std::string(Indent, ' ') << "Selecting: ";
+  DEBUG(errs() << std::string(Indent, ' ') << "Selecting: ");
   DEBUG(Node->dump(CurDAG));
-  DOUT << "\n";
+  DEBUG(errs() << "\n");
   Indent += 2;
 #endif
 
   if (Node->isMachineOpcode()) {
 #ifndef NDEBUG
-    DOUT << std::string(Indent-2, ' ') << "== ";
+    DEBUG(errs() << std::string(Indent-2, ' ') << "== ");
     DEBUG(Node->dump(CurDAG));
-    DOUT << "\n";
+    DEBUG(errs() << "\n");
     Indent -= 2;
 #endif
     return NULL;   // Already selected.
@@ -1689,9 +1689,9 @@
       InFlag = Result.getValue(2);
       ReplaceUses(N.getValue(0), Result);
 #ifndef NDEBUG
-      DOUT << std::string(Indent-2, ' ') << "=> ";
+      DEBUG(errs() << std::string(Indent-2, ' ') << "=> ");
       DEBUG(Result.getNode()->dump(CurDAG));
-      DOUT << "\n";
+      DEBUG(errs() << "\n");
 #endif
     }
     // Copy the high half of the result, if it is needed.
@@ -1717,9 +1717,9 @@
       }
       ReplaceUses(N.getValue(1), Result);
 #ifndef NDEBUG
-      DOUT << std::string(Indent-2, ' ') << "=> ";
+      DEBUG(errs() << std::string(Indent-2, ' ') << "=> ");
       DEBUG(Result.getNode()->dump(CurDAG));
-      DOUT << "\n";
+      DEBUG(errs() << "\n");
 #endif
     }
 
@@ -1859,9 +1859,9 @@
       InFlag = Result.getValue(2);
       ReplaceUses(N.getValue(0), Result);
 #ifndef NDEBUG
-      DOUT << std::string(Indent-2, ' ') << "=> ";
+      DEBUG(errs() << std::string(Indent-2, ' ') << "=> ");
       DEBUG(Result.getNode()->dump(CurDAG));
-      DOUT << "\n";
+      DEBUG(errs() << "\n");
 #endif
     }
     // Copy the remainder (high) result, if it is needed.
@@ -1888,9 +1888,9 @@
       }
       ReplaceUses(N.getValue(1), Result);
 #ifndef NDEBUG
-      DOUT << std::string(Indent-2, ' ') << "=> ";
+      DEBUG(errs() << std::string(Indent-2, ' ') << "=> ");
       DEBUG(Result.getNode()->dump(CurDAG));
-      DOUT << "\n";
+      DEBUG(errs() << "\n");
 #endif
     }
 
@@ -1946,12 +1946,12 @@
   SDNode *ResNode = SelectCode(N);
 
 #ifndef NDEBUG
-  DOUT << std::string(Indent-2, ' ') << "=> ";
+  DEBUG(errs() << std::string(Indent-2, ' ') << "=> ");
   if (ResNode == NULL || ResNode == N.getNode())
     DEBUG(N.getNode()->dump(CurDAG));
   else
     DEBUG(ResNode->dump(CurDAG));
-  DOUT << "\n";
+  DEBUG(errs() << "\n");
   Indent -= 2;
 #endif