commit 7b4c18e8f38a0139e1f2ece643df9f7c21246b39
author Duncan P. N. Exon Smith <dexonsmith@apple.com> Tue Jul 12 03:18:50 2016 +0000
committer Duncan P. N. Exon Smith <dexonsmith@apple.com> Tue Jul 12 03:18:50 2016 +0000
tree 219505b2f5c6f43af05c1c1f45aeeffa54774d4b
parent 99933f1b51d314d4eb7813f59911e14ecc07d4ff

X86: Avoid implicit iterator conversions, NFC

Avoid implicit conversions from MachineInstrBundleIterator to
MachineInstr*, mainly by preferring MachineInstr& over MachineInstr* and
using range-based for loops.

llvm-svn: 275149

llvm/lib/Target/X86/X86OptimizeLEAs.cpp

diff --git a/llvm/lib/Target/X86/X86OptimizeLEAs.cpp b/llvm/lib/Target/X86/X86OptimizeLEAs.cpp
index 22762db..4da0fdd 100644
--- a/llvm/lib/Target/X86/X86OptimizeLEAs.cpp
+++ b/llvm/lib/Target/X86/X86OptimizeLEAs.cpp
@@ -503,9 +503,10 @@
       InstrPos[DefMI] = InstrPos[&MI] - 1;
 
       // Make sure the instructions' position numbers are sane.
-      assert(((InstrPos[DefMI] == 1 && DefMI == MBB->begin()) ||
+      assert(((InstrPos[DefMI] == 1 &&
+               MachineBasicBlock::iterator(DefMI) == MBB->begin()) ||
               InstrPos[DefMI] >
-                  InstrPos[std::prev(MachineBasicBlock::iterator(DefMI))]) &&
+                  InstrPos[&*std::prev(MachineBasicBlock::iterator(DefMI))]) &&
              "Instruction positioning is broken");
     }