[llvm] r261567 - Revert "CodeGen: MachineInstr::getIterator() => getInstrIterator(), NFC"

[Duncan P. N. Exon Smith via llvm-commits]

> On 2016-Feb-22, at 12:50, Duncan P. N. Exon Smith via llvm-commits <llvm-commits at lists.llvm.org> wrote:
> 
> Author: dexonsmith
> Date: Mon Feb 22 14:49:58 2016
> New Revision: 261567
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=261567&view=rev
> Log:
> Revert "CodeGen: MachineInstr::getIterator() => getInstrIterator(), NFC"
> 
> This reverts commit r261504, since it's not obvious the new name is
> better:
> http://lists.llvm.org/pipermail/llvm-commits/Week-of-Mon-20160222/334298.html
> 
> I'll recommit if we get consensus that it's the right direction.
> 
> Modified:
>    llvm/trunk/include/llvm/ADT/ilist.h
>    llvm/trunk/include/llvm/CodeGen/MachineBasicBlock.h
>    llvm/trunk/include/llvm/CodeGen/MachineInstr.h
>    llvm/trunk/include/llvm/CodeGen/MachineInstrBuilder.h
>    llvm/trunk/include/llvm/CodeGen/MachineInstrBundle.h
>    llvm/trunk/include/llvm/CodeGen/MachineInstrBundleIterator.h
>    llvm/trunk/lib/CodeGen/DFAPacketizer.cpp
>    llvm/trunk/lib/CodeGen/MachineCopyPropagation.cpp
>    llvm/trunk/lib/CodeGen/MachineInstr.cpp
>    llvm/trunk/lib/CodeGen/ProcessImplicitDefs.cpp
>    llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp
>    llvm/trunk/lib/Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp
>    llvm/trunk/lib/Target/AArch64/AArch64RedundantCopyElimination.cpp
>    llvm/trunk/lib/Target/AMDGPU/AMDGPUMCInstLower.cpp
>    llvm/trunk/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp
>    llvm/trunk/lib/Target/AMDGPU/R600Packetizer.cpp
>    llvm/trunk/lib/Target/ARM/ARMBaseInstrInfo.cpp
>    llvm/trunk/lib/Target/ARM/ARMExpandPseudoInsts.cpp
>    llvm/trunk/lib/Target/ARM/Thumb2ITBlockPass.cpp
>    llvm/trunk/lib/Target/Hexagon/HexagonAsmPrinter.cpp
>    llvm/trunk/lib/Target/Hexagon/HexagonFrameLowering.cpp
>    llvm/trunk/lib/Target/Hexagon/HexagonHardwareLoops.cpp
>    llvm/trunk/lib/Target/Hexagon/HexagonInstrInfo.cpp
>    llvm/trunk/lib/Target/Hexagon/HexagonVLIWPacketizer.cpp
>    llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp
>    llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp
>    llvm/trunk/lib/Target/X86/X86FrameLowering.cpp
> 
> 

[snip]

> 
> Modified: llvm/trunk/include/llvm/CodeGen/MachineInstrBundleIterator.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineInstrBundleIterator.h?rev=261567&r1=261566&r2=261567&view=diff
> ==============================================================================
> --- llvm/trunk/include/llvm/CodeGen/MachineInstrBundleIterator.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/MachineInstrBundleIterator.h Mon Feb 22 14:49:58 2016
> @@ -44,7 +44,7 @@ public:
>   // Template allows conversion from const to nonconst.
>   template <class OtherTy>
>   MachineInstrBundleIterator(const MachineInstrBundleIterator<OtherTy> &I)
> -      : MII(I.getInstrIterator()) {}
> +      : MII(I.getIterator()) {}
>   MachineInstrBundleIterator() : MII(nullptr) {}
> 
>   Ty &operator*() const { return *MII; }
> @@ -84,7 +84,7 @@ public:
>     return Temp;
>   }
> 
> -  instr_iterator getInstrIterator() const { return MII; }
> +  instr_iterator getIterator() const { return MII; }

This part was accidental, and not really a revert.

Fixed in r261577.

> };
> 
> } // end namespace llvm