From 7fd9a58d8cfb0c32710701d360d116c4dbd8da9e Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Thu, 8 Feb 2018 20:27:35 +0000 Subject: Revert "WIP: [DAGCombiner] Assert that debug info is preserved" This reverts commit r324648. It was committed accidentally. llvm-svn: 324650 --- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 35 +++------------------------ 1 file changed, 4 insertions(+), 31 deletions(-) (limited to 'llvm/lib') diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 913a15ff578..9e7afed403d 100644 --- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -1026,39 +1026,12 @@ SDValue DAGCombiner::CombineTo(SDNode *N, const SDValue *To, unsigned NumTo, WorklistRemover DeadNodes(*this); DAG.ReplaceAllUsesWith(N, To); - ArrayRef ToValues{To, NumTo}; -#ifndef NDEBUG - // If the RAUW'd node has a debug value, at least one of its replacements - // should have one as well. - if (N->getHasDebugValue()) - assert(any_of(ToValues, - [](const SDValue &ToVal) { - if (SDNode *ToN = ToVal.getNode()) - return ToN->getHasDebugValue(); - return false; - }) && - "Dropped debug value"); - - // If the RAUW'd node has a debug loc, at least one of its replacements - // should have a loc as well, unless they've *all* got merged locations. - if (N->getDebugLoc()) - assert(any_of(ToValues, - [](const SDValue &ToVal) -> bool { - return ToVal.getDebugLoc(); - }) || - all_of(ToValues, - [](const SDValue &ToVal) { - return !ToVal.hasOneUse() && !ToVal.use_empty(); - }) && - "Dropped debug loc"); -#endif - if (AddTo) { // Push the new nodes and any users onto the worklist - for (const SDValue &ToVal : ToValues) { - if (SDNode *ToN = ToVal.getNode()) { - AddToWorklist(ToN); - AddUsersToWorklist(ToN); + for (unsigned i = 0, e = NumTo; i != e; ++i) { + if (To[i].getNode()) { + AddToWorklist(To[i].getNode()); + AddUsersToWorklist(To[i].getNode()); } } } -- cgit v1.2.3