diff --git a/include/llvm/CodeGen/MachineBasicBlock.h b/include/llvm/CodeGen/MachineBasicBlock.h
index e9dfbb8d30d..47aff93eba4 100644
--- a/include/llvm/CodeGen/MachineBasicBlock.h
+++ b/include/llvm/CodeGen/MachineBasicBlock.h
@@ -517,7 +517,7 @@ public:
   void insert(iterator I, IT S, IT E) {
     assert((I == end() || I->getParent() == this) &&
            "iterator points outside of basic block");
-    Insts.insert(I.getIterator(), S, E);
+    Insts.insert(I.getInstrIterator(), S, E);
   }
 
   /// Insert MI into the instruction list before I.
@@ -526,7 +526,7 @@ public:
            "iterator points outside of basic block");
     assert(!MI->isBundledWithPred() && !MI->isBundledWithSucc() &&
            "Cannot insert instruction with bundle flags");
-    return Insts.insert(I.getIterator(), MI);
+    return Insts.insert(I.getInstrIterator(), MI);
   }
 
   /// Insert MI into the instruction list after I.
@@ -535,7 +535,7 @@ public:
            "iterator points outside of basic block");
     assert(!MI->isBundledWithPred() && !MI->isBundledWithSucc() &&
            "Cannot insert instruction with bundle flags");
-    return Insts.insertAfter(I.getIterator(), MI);
+    return Insts.insertAfter(I.getInstrIterator(), MI);
   }
 
   /// Remove an instruction from the instruction list and delete it.
@@ -554,7 +554,7 @@ public:
 
   /// Remove a range of instructions from the instruction list and delete them.
   iterator erase(iterator I, iterator E) {
-    return Insts.erase(I.getIterator(), E.getIterator());
+    return Insts.erase(I.getInstrIterator(), E.getInstrIterator());
   }
 
   /// Remove an instruction or bundle from the instruction list and delete it.
@@ -610,8 +610,8 @@ public:
   /// instructions to move.
   void splice(iterator Where, MachineBasicBlock *Other,
               iterator From, iterator To) {
-    Insts.splice(Where.getIterator(), Other->Insts, From.getIterator(),
-                 To.getIterator());
+    Insts.splice(Where.getInstrIterator(), Other->Insts,
+                 From.getInstrIterator(), To.getInstrIterator());
   }
 
   /// This method unlinks 'this' from the containing function, and returns it,
@@ -639,7 +639,7 @@ public:
   /// instructions.  Return UnknownLoc if there is none.
   DebugLoc findDebugLoc(instr_iterator MBBI);
   DebugLoc findDebugLoc(iterator MBBI) {
-    return findDebugLoc(MBBI.getIterator());
+    return findDebugLoc(MBBI.getInstrIterator());
   }
 
   /// Possible outcome of a register liveness query to computeRegisterLiveness()
diff --git a/include/llvm/CodeGen/MachineInstrBuilder.h b/include/llvm/CodeGen/MachineInstrBuilder.h
index 925443a11a1..c8afa3715e0 100644
--- a/include/llvm/CodeGen/MachineInstrBuilder.h
+++ b/include/llvm/CodeGen/MachineInstrBuilder.h
@@ -429,12 +429,12 @@ public:
   /// Create an MIBundleBuilder that inserts instructions into a new bundle in
   /// BB above the bundle or instruction at Pos.
   MIBundleBuilder(MachineBasicBlock &BB, MachineBasicBlock::iterator Pos)
-      : MBB(BB), Begin(Pos.getIterator()), End(Begin) {}
+      : MBB(BB), Begin(Pos.getInstrIterator()), End(Begin) {}
 
   /// Create a bundle from the sequence of instructions between B and E.
   MIBundleBuilder(MachineBasicBlock &BB, MachineBasicBlock::iterator B,
                   MachineBasicBlock::iterator E)
-      : MBB(BB), Begin(B.getIterator()), End(E.getIterator()) {
+      : MBB(BB), Begin(B.getInstrIterator()), End(E.getInstrIterator()) {
     assert(B != E && "No instructions to bundle");
     ++B;
     while (B != E) {
diff --git a/include/llvm/CodeGen/MachineInstrBundleIterator.h b/include/llvm/CodeGen/MachineInstrBundleIterator.h
index ddff20c70e8..45a9a188f90 100644
--- a/include/llvm/CodeGen/MachineInstrBundleIterator.h
+++ b/include/llvm/CodeGen/MachineInstrBundleIterator.h
@@ -44,7 +44,7 @@ public:
   // Template allows conversion from const to nonconst.
   template <class OtherTy>
   MachineInstrBundleIterator(const MachineInstrBundleIterator<OtherTy> &I)
-      : MII(I.getIterator()) {}
+      : MII(I.getInstrIterator()) {}
   MachineInstrBundleIterator() : MII(nullptr) {}
 
   Ty &operator*() const { return *MII; }
@@ -84,7 +84,7 @@ public:
     return Temp;
   }
 
-  instr_iterator getIterator() const { return MII; }
+  instr_iterator getInstrIterator() const { return MII; }
 };
 
 } // end namespace llvm
diff --git a/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp b/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp
index b17b002f3b5..bb4bda25470 100644
--- a/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp
+++ b/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp
@@ -397,7 +397,7 @@ private:
       std::vector<int64_t> Literals;
       if (I->isBundle()) {
         MachineInstr *DeleteMI = I;
-        MachineBasicBlock::instr_iterator BI = I.getIterator();
+        MachineBasicBlock::instr_iterator BI = I.getInstrIterator();
         while (++BI != E && BI->isBundledWithPred()) {
           BI->unbundleFromPred();
           for (unsigned i = 0, e = BI->getNumOperands(); i != e; ++i) {
diff --git a/lib/Target/AMDGPU/R600Packetizer.cpp b/lib/Target/AMDGPU/R600Packetizer.cpp
index 63fba1fd061..21269613a30 100644
--- a/lib/Target/AMDGPU/R600Packetizer.cpp
+++ b/lib/Target/AMDGPU/R600Packetizer.cpp
@@ -75,7 +75,7 @@ private:
     I--;
     if (!TII->isALUInstr(I->getOpcode()) && !I->isBundle())
       return Result;
-    MachineBasicBlock::instr_iterator BI = I.getIterator();
+    MachineBasicBlock::instr_iterator BI = I.getInstrIterator();
     if (I->isBundle())
       BI++;
     int LastDstChan = -1;
diff --git a/lib/Target/ARM/ARMBaseInstrInfo.cpp b/lib/Target/ARM/ARMBaseInstrInfo.cpp
index 689a43e7df4..49f32885266 100644
--- a/lib/Target/ARM/ARMBaseInstrInfo.cpp
+++ b/lib/Target/ARM/ARMBaseInstrInfo.cpp
@@ -3410,7 +3410,7 @@ static const MachineInstr *getBundledDefMI(const TargetRegisterInfo *TRI,
   Dist = 0;
 
   MachineBasicBlock::const_iterator I = MI; ++I;
-  MachineBasicBlock::const_instr_iterator II = std::prev(I.getIterator());
+  MachineBasicBlock::const_instr_iterator II = std::prev(I.getInstrIterator());
   assert(II->isInsideBundle() && "Empty bundle?");
 
   int Idx = -1;
diff --git a/lib/Target/ARM/Thumb2ITBlockPass.cpp b/lib/Target/ARM/Thumb2ITBlockPass.cpp
index c28ebe9cb26..bf0498dfda6 100644
--- a/lib/Target/ARM/Thumb2ITBlockPass.cpp
+++ b/lib/Target/ARM/Thumb2ITBlockPass.cpp
@@ -256,7 +256,8 @@ bool Thumb2ITBlockPass::InsertITInstructions(MachineBasicBlock &MBB) {
     LastITMI->findRegisterUseOperand(ARM::ITSTATE)->setIsKill();
 
     // Finalize the bundle.
-    finalizeBundle(MBB, InsertPos.getIterator(), ++LastITMI->getIterator());
+    finalizeBundle(MBB, InsertPos.getInstrIterator(),
+                   ++LastITMI->getIterator());
 
     Modified = true;
     ++NumITs;
diff --git a/lib/Target/Hexagon/HexagonFrameLowering.cpp b/lib/Target/Hexagon/HexagonFrameLowering.cpp
index a1e58e95371..5294266d35f 100644
--- a/lib/Target/Hexagon/HexagonFrameLowering.cpp
+++ b/lib/Target/Hexagon/HexagonFrameLowering.cpp
@@ -582,7 +582,7 @@ namespace {
     if (!It->isBundle())
       return It->getOpcode() == Hexagon::S2_allocframe;
     auto End = It->getParent()->instr_end();
-    MachineBasicBlock::const_instr_iterator I = It.getIterator();
+    MachineBasicBlock::const_instr_iterator I = It.getInstrIterator();
     while (++I != End && I->isBundled())
       if (I->getOpcode() == Hexagon::S2_allocframe)
         return true;
diff --git a/lib/Target/Hexagon/HexagonInstrInfo.cpp b/lib/Target/Hexagon/HexagonInstrInfo.cpp
index 9a92f996069..32088f31836 100644
--- a/lib/Target/Hexagon/HexagonInstrInfo.cpp
+++ b/lib/Target/Hexagon/HexagonInstrInfo.cpp
@@ -4071,7 +4071,7 @@ unsigned HexagonInstrInfo::nonDbgBBSize(const MachineBasicBlock *BB) const {
 unsigned HexagonInstrInfo::nonDbgBundleSize(
       MachineBasicBlock::const_iterator BundleHead) const {
   assert(BundleHead->isBundle() && "Not a bundle header");
-  auto MII = BundleHead.getIterator();
+  auto MII = BundleHead.getInstrIterator();
   // Skip the bundle header.
   return nonDbgMICount(++MII, getBundleEnd(BundleHead));
 }
diff --git a/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp b/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp
index 1ce385ee68e..81850548bb6 100644
--- a/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp
+++ b/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp
@@ -126,9 +126,9 @@ static MachineBasicBlock::iterator moveInstrOut(MachineInstr *MI,
       MachineBasicBlock::iterator BundleIt, bool Before) {
   MachineBasicBlock::instr_iterator InsertPt;
   if (Before)
-    InsertPt = BundleIt.getIterator();
+    InsertPt = BundleIt.getInstrIterator();
   else
-    InsertPt = std::next(BundleIt).getIterator();
+    InsertPt = std::next(BundleIt).getInstrIterator();
 
   MachineBasicBlock &B = *MI->getParent();
   // The instruction should at least be bundled with the preceding instruction