diff options
| author | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-07-15 13:54:20 +0000 |
|---|---|---|
| committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-07-15 13:54:20 +0000 |
| commit | db5e6663044fe40f6479abf7efafd604ef8bdc42 (patch) | |
| tree | 1b3e489f20c684e5669bcca2a5a8b828c6cb39a5 /llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp | |
| parent | 4177480aadb312dcd79772554d7653c4ba0b7080 (diff) | |
| download | bcm5719-llvm-db5e6663044fe40f6479abf7efafd604ef8bdc42.tar.gz bcm5719-llvm-db5e6663044fe40f6479abf7efafd604ef8bdc42.zip | |
Revert r275141 - Mips: Avoid implicit iterator conversions, NFC
It appears to have caused some failures in our buildbots.
llvm-svn: 275562
Diffstat (limited to 'llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp')
| -rw-r--r-- | llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp b/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp index 5ec1717e48a..76361b85bf4 100644 --- a/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp +++ b/llvm/lib/Target/Mips/MipsDelaySlotFiller.cpp @@ -600,9 +600,9 @@ bool Filler::runOnMachineBasicBlock(MachineBasicBlock &MBB) { if (Filled) { // Get instruction with delay slot. - MachineBasicBlock::instr_iterator DSI = I.getInstrIterator(); + MachineBasicBlock::instr_iterator DSI(I); - if (InMicroMipsMode && TII->GetInstSizeInBytes(*std::next(DSI)) == 2 && + if (InMicroMipsMode && TII->GetInstSizeInBytes(&*std::next(DSI)) == 2 && DSI->isCall()) { // If instruction in delay slot is 16b change opcode to // corresponding instruction with short delay slot. @@ -692,7 +692,7 @@ bool Filler::searchRange(MachineBasicBlock &MBB, IterTy Begin, IterTy End, bool InMicroMipsMode = STI.inMicroMipsMode(); const MipsInstrInfo *TII = STI.getInstrInfo(); unsigned Opcode = (*Slot).getOpcode(); - if (InMicroMipsMode && TII->GetInstSizeInBytes(*CurrI) == 2 && + if (InMicroMipsMode && TII->GetInstSizeInBytes(&(*CurrI)) == 2 && (Opcode == Mips::JR || Opcode == Mips::PseudoIndirectBranch || Opcode == Mips::PseudoReturn)) continue; |
