diff options
| author | Cameron Zwarich <zwarich@apple.com> | 2011-02-18 04:58:10 +0000 |
|---|---|---|
| committer | Cameron Zwarich <zwarich@apple.com> | 2011-02-18 04:58:10 +0000 |
| commit | 1646953538d5faf7baf49e16bd0590f822c231de (patch) | |
| tree | 314293b4d7b56f57f31cbd9b078ea58d2d5e1a04 /lib/CodeGen/SelectionDAG/SelectionDAG.cpp | |
| parent | 78f7a25f9826ba66610b5bca83ebea71793abf59 (diff) | |
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
Diffstat (limited to 'lib/CodeGen/SelectionDAG/SelectionDAG.cpp')
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index d03f6765d5..c0aa56b522 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -5508,14 +5508,12 @@ void SelectionDAG::TransferDbgValues(SDValue From, SDValue To) { 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()); } } } |