diff options
author | Alex Bradbury <asb@lowrisc.org> | 2019-03-11 20:43:29 +0000 |
---|---|---|
committer | Alex Bradbury <asb@lowrisc.org> | 2019-03-11 20:43:29 +0000 |
commit | 2c6c84e52c452e3d4a94ecf0e85c1cb526603580 (patch) | |
tree | 6e6bc0029bbda681e2333c9055a08ad1f07d5a74 /llvm | |
parent | 7bc83564357eb805c90b7d941103732ddfa221bb (diff) | |
download | bcm5719-llvm-2c6c84e52c452e3d4a94ecf0e85c1cb526603580.tar.gz bcm5719-llvm-2c6c84e52c452e3d4a94ecf0e85c1cb526603580.zip |
[RISCV][NFC] Convert some MachineBaiscBlock::iterator(MI) to MI.getIterator()
llvm-svn: 355864
Diffstat (limited to 'llvm')
-rw-r--r-- | llvm/lib/Target/RISCV/RISCVISelLowering.cpp | 4 | ||||
-rw-r--r-- | llvm/lib/Target/RISCV/RISCVInstrInfo.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp index 60041da0694..9b4193e53e1 100644 --- a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp +++ b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp @@ -813,8 +813,8 @@ static MachineBasicBlock *emitSelectPseudo(MachineInstr &MI, F->insert(I, IfFalseMBB); F->insert(I, TailMBB); // Move all remaining instructions to TailMBB. - TailMBB->splice(TailMBB->begin(), HeadMBB, - std::next(MachineBasicBlock::iterator(MI)), HeadMBB->end()); + TailMBB->splice(TailMBB->begin(), HeadMBB, std::next(MI.getIterator()), + HeadMBB->end()); // Update machine-CFG edges by transferring all successors of the current // block to the new block which will contain the Phi node for the select. TailMBB->transferSuccessorsAndUpdatePHIs(HeadMBB); diff --git a/llvm/lib/Target/RISCV/RISCVInstrInfo.cpp b/llvm/lib/Target/RISCV/RISCVInstrInfo.cpp index ddb976b47fb..dc63c51b4bc 100644 --- a/llvm/lib/Target/RISCV/RISCVInstrInfo.cpp +++ b/llvm/lib/Target/RISCV/RISCVInstrInfo.cpp @@ -382,8 +382,8 @@ unsigned RISCVInstrInfo::insertIndirectBranch(MachineBasicBlock &MBB, .addMBB(&DestBB, RISCVII::MO_LO); RS->enterBasicBlockEnd(MBB); - unsigned Scav = RS->scavengeRegisterBackwards( - RISCV::GPRRegClass, MachineBasicBlock::iterator(LuiMI), false, 0); + unsigned Scav = RS->scavengeRegisterBackwards(RISCV::GPRRegClass, + LuiMI.getIterator(), false, 0); MRI.replaceRegWith(ScratchReg, Scav); MRI.clearVirtRegs(); RS->setRegUsed(Scav); |