Revert r106907, "make sure to handle dbg_value instructions in the middle of the

block, not...", it caused a bunch of nightly test regressions.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@107009 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 2 insertions, 10 deletions

diff --git a/lib/CodeGen/IfConversion.cpp b/lib/CodeGen/IfConversion.cpp
index 51fea7f94e..ea4e68dbda 100644
--- a/lib/CodeGen/IfConversion.cpp
+++ b/lib/CodeGen/IfConversion.cpp
@@ -1228,18 +1228,10 @@ bool IfConverter::IfConvertDiamond(BBInfo &BBI, IfcvtKind Kind,
     ++DI2;
   BBI1->NonPredSize -= NumDups1;
   BBI2->NonPredSize -= NumDups1;
-  
-  // Skip past the dups on each side separately since there may be
-  // differing dbg_value entries.
-  for (unsigned i = 0; i < NumDups1; ++i) {
-    ++DI1;
-    if (!DI1->isDebugValue())
-      ++i;
-  }
   while (NumDups1 != 0) {
+    ++DI1;
     ++DI2;
-    if (!DI2->isDebugValue())
-      --NumDups1;
+    --NumDups1;
   }
 
   UpdatePredRedefs(BBI1->BB->begin(), DI1, Redefs, TRI);