1 files changed, 3 insertions, 5 deletions
diff --git a/llvm/lib/CodeGen/OptimizePHIs.cpp b/llvm/lib/CodeGen/OptimizePHIs.cpp
index 02a70ab801e9..8a6cf47c0d89 100644
--- a/llvm/lib/CodeGen/OptimizePHIs.cpp
+++ b/llvm/lib/CodeGen/OptimizePHIs.cpp
@@ -83,8 +83,8 @@ bool OptimizePHIs::runOnMachineFunction(MachineFunction &Fn) {
   // introduce new opportunities, e.g., when i64 values are split up for
   // 32-bit targets.
   bool Changed = false;
-  for (MachineFunction::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I)
-    Changed |= OptimizeBB(*I);
+  for (MachineBasicBlock &MBB : Fn)
+    Changed |= OptimizeBB(MBB);
 
   return Changed;
 }
@@ -195,9 +195,7 @@ bool OptimizePHIs::OptimizeBB(MachineBasicBlock &MBB) {
     // Check for dead PHI cycles.
     PHIsInCycle.clear();
     if (IsDeadPHICycle(MI, PHIsInCycle)) {
-      for (InstrSetIterator PI = PHIsInCycle.begin(), PE = PHIsInCycle.end();
-           PI != PE; ++PI) {
-        MachineInstr *PhiMI = *PI;
+      for (MachineInstr *PhiMI : PHIsInCycle) {
         if (MII == PhiMI)
           ++MII;
         PhiMI->eraseFromParent();