From: Duncan P. N. Exon Smith Date: Mon, 22 Feb 2016 21:30:15 +0000 (+0000) Subject: CodeGen: Bring back MachineBasicBlock::iterator::getInstrIterator()... X-Git-Tag: llvmorg-3.9.0-rc1~13517 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d84f60065366d99c3aca4c8f917a35ab9ce4e7f5;p=platform%2Fupstream%2Fllvm.git CodeGen: Bring back MachineBasicBlock::iterator::getInstrIterator()... This is a little embarrassing. When I reverted r261504 (getIterator() => getInstrIterator()) in r261567, I did a `git grep` to see if there were new calls to `getInstrIterator()` that I needed to migrate. There were 10-20 hits, and I blindly did a `sed ...` before calling `ninja check`. However, these were `MachineInstrBundleIterator::getInstrIterator()`, which predated r261567. Perhaps coincidentally, these had an identical name and return type. This commit undoes my careless sed and restores `MachineBasicBlock::iterator::getInstrIterator()`. llvm-svn: 261577 --- diff --git a/llvm/include/llvm/CodeGen/MachineBasicBlock.h b/llvm/include/llvm/CodeGen/MachineBasicBlock.h index e9dfbb8..47aff93 100644 --- a/llvm/include/llvm/CodeGen/MachineBasicBlock.h +++ b/llvm/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/llvm/include/llvm/CodeGen/MachineInstrBuilder.h b/llvm/include/llvm/CodeGen/MachineInstrBuilder.h index 925443a..c8afa37 100644 --- a/llvm/include/llvm/CodeGen/MachineInstrBuilder.h +++ b/llvm/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/llvm/include/llvm/CodeGen/MachineInstrBundleIterator.h b/llvm/include/llvm/CodeGen/MachineInstrBundleIterator.h index ddff20c..45a9a188 100644 --- a/llvm/include/llvm/CodeGen/MachineInstrBundleIterator.h +++ b/llvm/include/llvm/CodeGen/MachineInstrBundleIterator.h @@ -44,7 +44,7 @@ public: // Template allows conversion from const to nonconst. template MachineInstrBundleIterator(const MachineInstrBundleIterator &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/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp b/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp index b17b002..bb4bda2 100644 --- a/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp +++ b/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp @@ -397,7 +397,7 @@ private: std::vector 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/llvm/lib/Target/AMDGPU/R600Packetizer.cpp b/llvm/lib/Target/AMDGPU/R600Packetizer.cpp index 63fba1f..2126961 100644 --- a/llvm/lib/Target/AMDGPU/R600Packetizer.cpp +++ b/llvm/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/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp index 689a43e..49f3288 100644 --- a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp +++ b/llvm/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/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp b/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp index c28ebe9c..bf0498d 100644 --- a/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp +++ b/llvm/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/llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp b/llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp index a1e58e9..5294266 100644 --- a/llvm/lib/Target/Hexagon/HexagonFrameLowering.cpp +++ b/llvm/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/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp b/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp index 9a92f99..32088f3 100644 --- a/llvm/lib/Target/Hexagon/HexagonInstrInfo.cpp +++ b/llvm/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/llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp b/llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp index 1ce385e..8185054 100644 --- a/llvm/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp +++ b/llvm/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