[llvm] r324650 - Revert "WIP: [DAGCombiner] Assert that debug info is preserved"

[Vedant Kumar via llvm-commits]

Author: vedantk
Date: Thu Feb  8 12:27:35 2018
New Revision: 324650

URL: http://llvm.org/viewvc/llvm-project?rev=324650&view=rev
Log:
Revert "WIP: [DAGCombiner] Assert that debug info is preserved"

This reverts commit r324648. It was committed accidentally.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=324650&r1=324649&r2=324650&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Thu Feb  8 12:27:35 2018
@@ -1026,39 +1026,12 @@ SDValue DAGCombiner::CombineTo(SDNode *N
 
   WorklistRemover DeadNodes(*this);
   DAG.ReplaceAllUsesWith(N, To);
-  ArrayRef<const SDValue> 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());
       }
     }
   }