[llvm-branch-commits] [llvm-branch] r105555 - in /llvm/branches/Apple/Troughton: ./ lib/CodeGen/IfConversion.cpp
Jim Grosbach
grosbach at apple.com
Mon Jun 7 14:31:16 PDT 2010
Author: grosbach
Date: Mon Jun 7 16:31:16 2010
New Revision: 105555
URL: http://llvm.org/viewvc/llvm-project?rev=105555&view=rev
Log:
merge 105554
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 16:31:16 2010
@@ -1 +1 @@
-/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105481,105498,105541
+/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105481,105498,105541,105554
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=105555&r1=105554&r2=105555&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/lib/CodeGen/IfConversion.cpp (original)
+++ llvm/branches/Apple/Troughton/lib/CodeGen/IfConversion.cpp Mon Jun 7 16:31:16 2010
@@ -514,15 +514,14 @@
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;
-
+ MachineBasicBlock::iterator TIE = TrueBBI.BB->end();
+ MachineBasicBlock::iterator FIE = FalseBBI.BB->end();
+ // Skip dbg_value instructions
+ while (TI != TIE && TI->isDebugValue())
+ ++TI;
+ while (FI != FIE && FI->isDebugValue())
+ ++FI;
+ while (TI != TIE && FI != FIE) {
if (!TI->isIdenticalTo(FI))
break;
++Dups1;
@@ -532,15 +531,14 @@
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;
-
+ MachineBasicBlock::iterator TIB = TrueBBI.BB->begin();
+ MachineBasicBlock::iterator FIB = FalseBBI.BB->begin();
+ // Skip dbg_value instructions
+ while (TI != TIB && TI->isDebugValue())
+ --TI;
+ while (FI != FIB && FI->isDebugValue())
+ --FI;
+ while (TI != TIB && FI != FIB) {
if (!TI->isIdenticalTo(FI))
break;
++Dups2;
More information about the llvm-branch-commits
mailing list