Pass a SelectionDAG into SDNode::dump everywhere it's used, in prepration

for needing the DAG node to print pre-legalize extended value types, and
to get better debug messages with target-specific nodes.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@37656 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index 8cc4036347943ad73b5235a3200e5273489eb9ca..d4b633259d25f10044769f79ee8af320a2c4578d 100644 (file)
--- a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -113,7 +113,7 @@ namespace {
                         bool AddTo = true) {
       assert(N->getNumValues() == NumTo && "Broken CombineTo call!");
       ++NodesCombined;
-      DOUT << "\nReplacing.1 "; DEBUG(N->dump());
+      DOUT << "\nReplacing.1 "; DEBUG(N->dump(&DAG));
       DOUT << "\nWith: "; DEBUG(To[0].Val->dump(&DAG));
       DOUT << " and " << NumTo-1 << " other values\n";
       std::vector<SDNode*> NowDead;
@@ -164,7 +164,7 @@ namespace {
       
       // Replace the old value with the new one.
       ++NodesCombined;
-      DOUT << "\nReplacing.2 "; DEBUG(TLO.Old.Val->dump());
+      DOUT << "\nReplacing.2 "; DEBUG(TLO.Old.Val->dump(&DAG));
       DOUT << "\nWith: "; DEBUG(TLO.New.Val->dump(&DAG));
       DOUT << '\n';
 
@@ -592,7 +592,7 @@ void DAGCombiner::Run(bool RunningAfterLegalize) {
                RV.Val->getOpcode() != ISD::DELETED_NODE &&
                "Node was deleted but visit returned new node!");
 
-        DOUT << "\nReplacing.3 "; DEBUG(N->dump());
+        DOUT << "\nReplacing.3 "; DEBUG(N->dump(&DAG));
         DOUT << "\nWith: "; DEBUG(RV.Val->dump(&DAG));
         DOUT << '\n';
         std::vector<SDNode*> NowDead;
@@ -3314,7 +3314,7 @@ bool DAGCombiner::CombineToPreIndexedLoadStore(SDNode *N) {
     Result = DAG.getIndexedStore(SDOperand(N,0), BasePtr, Offset, AM);
   ++PreIndexedNodes;
   ++NodesCombined;
-  DOUT << "\nReplacing.4 "; DEBUG(N->dump());
+  DOUT << "\nReplacing.4 "; DEBUG(N->dump(&DAG));
   DOUT << "\nWith: "; DEBUG(Result.Val->dump(&DAG));
   DOUT << '\n';
   std::vector<SDNode*> NowDead;
@@ -3445,7 +3445,7 @@ bool DAGCombiner::CombineToPostIndexedLoadStore(SDNode *N) {
           : DAG.getIndexedStore(SDOperand(N,0), BasePtr, Offset, AM);
         ++PostIndexedNodes;
         ++NodesCombined;
-        DOUT << "\nReplacing.5 "; DEBUG(N->dump());
+        DOUT << "\nReplacing.5 "; DEBUG(N->dump(&DAG));
         DOUT << "\nWith: "; DEBUG(Result.Val->dump(&DAG));
         DOUT << '\n';
         std::vector<SDNode*> NowDead;

diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
index 06544bfaf6cdb046d080598b4629a13cebe4dda2..624cb339af9b00eb0af75e48d7cdcd095ae3bbdf 100644 (file)
--- a/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
@@ -476,7 +476,7 @@ void ScheduleDAG::EmitNode(SDNode *Node,
     switch (Node->getOpcode()) {
     default:
 #ifndef NDEBUG
-      Node->dump();
+      Node->dump(&DAG);
 #endif
       assert(0 && "This target-independent node should have been selected!");
     case ISD::EntryToken: // fall thru

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 5c24b931e1717a4bcd4f2c9c3cd169bf00b395ef..0ac77f99a3056f3973cde803cafe74c68b4e2525 100644 (file)
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -512,7 +512,7 @@ void SelectionDAG::RemoveNodeFromCSEMaps(SDNode *N) {
   // not subject to CSE.
   if (!Erased && N->getValueType(N->getNumValues()-1) != MVT::Flag &&
       !N->isTargetOpcode()) {
-    N->dump();
+    N->dump(this);
     cerr << "\n";
     assert(0 && "Node is not in map!");
   }

diff --git a/lib/Target/Alpha/AlphaISelDAGToDAG.cpp b/lib/Target/Alpha/AlphaISelDAGToDAG.cpp
index 2f1eb480685bb83ded9c2238e357f099c1237136..e82e24b80d2310a1ebbc5bca144da305cf204f47 100644 (file)
--- a/lib/Target/Alpha/AlphaISelDAGToDAG.cpp
+++ b/lib/Target/Alpha/AlphaISelDAGToDAG.cpp
@@ -356,7 +356,7 @@ SDNode *AlphaDAGToDAGISel::Select(SDOperand Op) {
       bool rev = false;
       bool inv = false;
       switch(CC) {
-      default: DEBUG(N->dump()); assert(0 && "Unknown FP comparison!");
+      default: DEBUG(N->dump(CurDAG)); assert(0 && "Unknown FP comparison!");
       case ISD::SETEQ: case ISD::SETOEQ: case ISD::SETUEQ:
         Opc = Alpha::CMPTEQ; break;
       case ISD::SETLT: case ISD::SETOLT: case ISD::SETULT: 

diff --git a/lib/Target/IA64/IA64ISelDAGToDAG.cpp b/lib/Target/IA64/IA64ISelDAGToDAG.cpp
index f71a3ea893ac347aeb77dc2a1c50b714d68adc4e..53b704eb9efb98c0ecb8a4d3e45857573ad0e23c 100644 (file)
--- a/lib/Target/IA64/IA64ISelDAGToDAG.cpp
+++ b/lib/Target/IA64/IA64ISelDAGToDAG.cpp
@@ -470,7 +470,7 @@ SDNode *IA64DAGToDAGISel::Select(SDOperand Op) {
     switch (TypeBeingLoaded) {
     default:
 #ifndef NDEBUG
-      N->dump();
+      N->dump(CurDAG);
 #endif
       assert(0 && "Cannot load this type!");
     case MVT::i1: { // this is a bool