commit 0a1a36dc46e85f83cf778c9fd695ff9286f070c1
author Cameron Zwarich <zwarich@apple.com> Fri Feb 18 04:58:10 2011 +0000
committer Cameron Zwarich <zwarich@apple.com> Fri Feb 18 04:58:10 2011 +0000
tree 81f9b313f4e48eb027a991190c2e2666cc6dfbb2
parent 1a924e770ad01b524d7477473a1ded63c90242aa

Roll out r125794 to help diagnose the llvm-gcc-i386-linux-selfhost failure.

llvm-svn: 125830

llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp

diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index 49c862c..def0c69 100644
--- a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -87,9 +87,6 @@
     // If someone requests legalization of the new node, return itself.
     if (From != To)
       LegalizedNodes.insert(std::make_pair(To, To));
-    
-    // Transfer SDDbgValues.
-    DAG.TransferDbgValues(From, To);
   }
 
 public:

llvm/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h

diff --git a/llvm/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h b/llvm/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h
index 2dcb229..e5cd23a 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h
+++ b/llvm/lib/CodeGen/SelectionDAG/SDNodeDbgValue.h
@@ -83,6 +83,14 @@
   // Returns the SDNode* for a register ref
   SDNode *getSDNode() { assert (kind==SDNODE); return u.s.Node; }
 
+  // setSDNode - If underlying SDNode is replaced by another node then
+  // SelectionDAG can use this to transfer DbgValue.
+  void setSDNode(SDNode *N, unsigned R) { 
+    assert (kind==SDNODE); 
+    u.s.Node = N; 
+    u.s.ResNo = R;
+  }
+
   // Returns the ResNo for a register ref
   unsigned getResNo() { assert (kind==SDNODE); return u.s.ResNo; }
 

llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp

diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index d03f676..c0aa56b 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -5508,14 +5508,12 @@
   SDNode *FromNode = From.getNode();
   SDNode *ToNode = To.getNode();
   SmallVector<SDDbgValue*,2> &DVs = GetDbgValues(FromNode);
+  DbgInfo->removeSDDbgValues(FromNode);
   for (SmallVector<SDDbgValue *, 2>::iterator I = DVs.begin(), E = DVs.end();
        I != E; ++I) {
-    SDDbgValue *Dbg = *I;
-    if (Dbg->getKind() == SDDbgValue::SDNODE) {
-      SDDbgValue *Clone = getDbgValue(Dbg->getMDPtr(), ToNode, To.getResNo(),
-                                      Dbg->getOffset(), Dbg->getDebugLoc(),
-                                      Dbg->getOrder());
-      AddDbgValue(Clone, ToNode, false);
+    if ((*I)->getKind() == SDDbgValue::SDNODE) {
+      AddDbgValue(*I, ToNode, false);
+      (*I)->setSDNode(ToNode, To.getResNo());
     }
   }
 }

llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
index 452f561..fc283a3 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -4287,7 +4287,7 @@
                                 N.getResNo(), Offset, dl, SDNodeOrder);
           DAG.AddDbgValue(SDV, N.getNode(), false);
         }
-      } else if (!V->use_empty() ) {
+      } else if (isa<PHINode>(V) && !V->use_empty() ) {
         // Do not call getValue(V) yet, as we don't want to generate code.
         // Remember it for later.
         DanglingDebugInfo DDI(&DI, dl, SDNodeOrder);