Roll out r125794 to help diagnose the llvm-gcc-i386-linux-selfhost failure.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@125830 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index d03f676..c0aa56b 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/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());
}
}
}