Index: include/llvm/CodeGen/MachineInstr.h
===================================================================
--- include/llvm/CodeGen/MachineInstr.h
+++ include/llvm/CodeGen/MachineInstr.h
@@ -296,6 +296,7 @@
   /// iterator/begin/end - Iterate over all operands of a machine instruction.
   using mop_iterator = MachineOperand *;
   using const_mop_iterator = const MachineOperand *;
+  using const_iterator  = const MachineOperand *;
 
   mop_iterator operands_begin() { return Operands; }
   mop_iterator operands_end() { return Operands + NumOperands; }
@@ -303,6 +304,9 @@
   const_mop_iterator operands_begin() const { return Operands; }
   const_mop_iterator operands_end() const { return Operands + NumOperands; }
 
+  const_iterator begin() const { return Operands; }
+  const_iterator end() const { return Operands + NumOperands; }
+
   iterator_range<mop_iterator> operands() {
     return make_range(operands_begin(), operands_end());
   }
Index: lib/Target/ARM/ARMMCInstLower.cpp
===================================================================
--- lib/Target/ARM/ARMMCInstLower.cpp
+++ lib/Target/ARM/ARMMCInstLower.cpp
@@ -153,9 +153,7 @@
     break;
   }
 
-  for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
-    const MachineOperand &MO = MI->getOperand(i);
-
+  for (auto MO : *MI) {
     MCOperand MCOp;
     if (AP.lowerOperand(MO, MCOp)) {
       if (MCOp.isImm() && EncodeImms) {