[llvm-commits] [llvm] r107009 - /llvm/trunk/lib/CodeGen/IfConversion.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Mon Jun 28 10:47:17 2010
New Revision: 107009

URL: http://llvm.org/viewvc/llvm-project?rev=107009&view=rev
Log:
Revert r106907, "make sure to handle dbg_value instructions in the middle of the
block, not...", it caused a bunch of nightly test regressions.

Modified:
    llvm/trunk/lib/CodeGen/IfConversion.cpp

Modified: llvm/trunk/lib/CodeGen/IfConversion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/IfConversion.cpp?rev=107009&r1=107008&r2=107009&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/IfConversion.cpp (original)
+++ llvm/trunk/lib/CodeGen/IfConversion.cpp Mon Jun 28 10:47:17 2010
@@ -1228,18 +1228,10 @@
     ++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);