summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
diff options
context:
space:
mode:
authorDuncan P. N. Exon Smith <dexonsmith@apple.com>2016-02-22 21:30:15 +0000
committerDuncan P. N. Exon Smith <dexonsmith@apple.com>2016-02-22 21:30:15 +0000
commitd84f60065366d99c3aca4c8f917a35ab9ce4e7f5 (patch)
tree5d1e10b9568670bb98979a943db23a092e702448 /llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
parentfb1533b3263e710f6eaa36344c6e15f6a9d8a6a2 (diff)
downloadbcm5719-llvm-d84f60065366d99c3aca4c8f917a35ab9ce4e7f5.tar.gz
bcm5719-llvm-d84f60065366d99c3aca4c8f917a35ab9ce4e7f5.zip
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
Diffstat (limited to 'llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp')
-rw-r--r--llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp b/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
index 689a43e7df4..49f32885266 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;
OpenPOWER on IntegriCloud