[llvm-branch-commits] [llvm-branch] r105543 - in /llvm/branches/Apple/Troughton: ./ lib/CodeGen/IfConversion.cpp

[Jim Grosbach]

Author: grosbach
Date: Mon Jun  7 14:13:10 2010
New Revision: 105543

URL: http://llvm.org/viewvc/llvm-project?rev=105543&view=rev
Log:
merge 105541

Modified:
    llvm/branches/Apple/Troughton/   (props changed)
    llvm/branches/Apple/Troughton/lib/CodeGen/IfConversion.cpp

Propchange: llvm/branches/Apple/Troughton/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun  7 14:13:10 2010
@@ -1 +1 @@
-/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105481,105498
+/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105481,105498,105541

Modified: llvm/branches/Apple/Troughton/lib/CodeGen/IfConversion.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/lib/CodeGen/IfConversion.cpp?rev=105543&r1=105542&r2=105543&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/lib/CodeGen/IfConversion.cpp (original)
+++ llvm/branches/Apple/Troughton/lib/CodeGen/IfConversion.cpp Mon Jun  7 14:13:10 2010
@@ -515,13 +515,13 @@
   MachineBasicBlock::iterator TI = TrueBBI.BB->begin();
   MachineBasicBlock::iterator FI = FalseBBI.BB->begin();
   while (1) {
+    if (TI == TrueBBI.BB->end() || FI == FalseBBI.BB->end())
+      break;
     // Skip dbg_value instructions
     if (TI->isDebugValue())
       ++TI;
     if (FI->isDebugValue())
       ++FI;
-    if (TI == TrueBBI.BB->end() || FI == FalseBBI.BB->end())
-      break;
 
     if (!TI->isIdenticalTo(FI))
       break;
@@ -533,13 +533,13 @@
   TI = firstNonBranchInst(TrueBBI.BB, TII);
   FI = firstNonBranchInst(FalseBBI.BB, TII);
   while (1) {
+    if (TI == TrueBBI.BB->begin() || FI == FalseBBI.BB->begin())
+      break;
     // Skip dbg_value instructions
     if (TI->isDebugValue())
       --TI;
     if (FI->isDebugValue())
       --FI;
-    if (TI == TrueBBI.BB->begin() || FI == FalseBBI.BB->begin())
-      break;
 
     if (!TI->isIdenticalTo(FI))
       break;