diff options
author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2016-02-21 22:58:35 +0000 |
---|---|---|
committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2016-02-21 22:58:35 +0000 |
commit | dc0848c0293d798fecd4d02273cf98e84dc95866 (patch) | |
tree | dc64f6a8e3754c45b452e5972576f429d84dd23d /llvm/lib/Target/X86/X86FrameLowering.cpp | |
parent | e1fd99c197ede469c25d2c25e24397130a0a48f3 (diff) | |
download | bcm5719-llvm-dc0848c0293d798fecd4d02273cf98e84dc95866.tar.gz bcm5719-llvm-dc0848c0293d798fecd4d02273cf98e84dc95866.zip |
CodeGen: MachineInstr::getIterator() => getInstrIterator(), NFC
Delete MachineInstr::getIterator(), since the term "iterator" is
overloaded when talking about MachineInstr.
- Downcast to ilist_node in iplist::getNextNode() and getPrevNode() so
that ilist_node::getIterator() is still available.
- Add it back as MachineInstr::getInstrIterator(). This matches the
naming in MachineBasicBlock.
- Add MachineInstr::getBundleIterator(). This is explicitly called
"bundle" (not matching MachineBasicBlock) to disintinguish it clearly
from ilist_node::getIterator().
- Update all calls. Some of these I switched to `auto` to remove
boiler-plate, since the new name is clear about the type.
There was one call I updated that looked fishy, but it wasn't clear what
the right answer was. This was in X86FrameLowering::inlineStackProbe(),
added in r252578 in lib/Target/X86/X86FrameLowering.cpp. I opted to
leave the behaviour unchanged, but I'll reply to the original commit on
the list in a moment.
llvm-svn: 261504
Diffstat (limited to 'llvm/lib/Target/X86/X86FrameLowering.cpp')
-rw-r--r-- | llvm/lib/Target/X86/X86FrameLowering.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp index 252c81a4bb2..1856ee1820e 100644 --- a/llvm/lib/Target/X86/X86FrameLowering.cpp +++ b/llvm/lib/Target/X86/X86FrameLowering.cpp @@ -462,7 +462,9 @@ void X86FrameLowering::inlineStackProbe(MachineFunction &MF, } if (ChkStkStub != nullptr) { - MachineBasicBlock::iterator MBBI = std::next(ChkStkStub->getIterator()); + // FIXME: MBBI is a bundle iterator. Should this be getBundleIterator()? + MachineBasicBlock::iterator MBBI = + std::next(ChkStkStub->getInstrIterator()); assert(std::prev(MBBI).operator==(ChkStkStub) && "MBBI expected after __chkstk_stub."); DebugLoc DL = PrologMBB.findDebugLoc(MBBI); |