From 909a78b3a430f99518a04ae0bced8f0b9ba6e02a Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Wed, 1 Jun 2022 15:37:48 -0700 Subject: [PATCH] [RISCV] Use MachineRegisterInfo::use_instr_begin instead of use_begin+getParent. NFCI --- llvm/lib/Target/RISCV/RISCVMergeBaseOffset.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/lib/Target/RISCV/RISCVMergeBaseOffset.cpp b/llvm/lib/Target/RISCV/RISCVMergeBaseOffset.cpp index 0868fd8..921f2a9 100644 --- a/llvm/lib/Target/RISCV/RISCVMergeBaseOffset.cpp +++ b/llvm/lib/Target/RISCV/RISCVMergeBaseOffset.cpp @@ -95,7 +95,7 @@ bool RISCVMergeBaseOffsetOpt::detectLuiAddiGlobal(MachineInstr &HiLUI, !MRI->hasOneUse(HiLUI.getOperand(0).getReg())) return false; Register HiLuiDestReg = HiLUI.getOperand(0).getReg(); - LoADDI = MRI->use_begin(HiLuiDestReg)->getParent(); + LoADDI = &*MRI->use_instr_begin(HiLuiDestReg); if (LoADDI->getOpcode() != RISCV::ADDI || LoADDI->getOperand(2).getTargetFlags() != RISCVII::MO_LO || LoADDI->getOperand(2).getType() != MachineOperand::MO_GlobalAddress || @@ -197,7 +197,7 @@ bool RISCVMergeBaseOffsetOpt::detectAndFoldOffset(MachineInstr &HiLUI, Register DestReg = LoADDI.getOperand(0).getReg(); assert(MRI->hasOneUse(DestReg) && "expected one use for LoADDI"); // LoADDI has only one use. - MachineInstr &Tail = *MRI->use_begin(DestReg)->getParent(); + MachineInstr &Tail = *MRI->use_instr_begin(DestReg); switch (Tail.getOpcode()) { default: LLVM_DEBUG(dbgs() << "Don't know how to get offset from this instr:" -- 2.7.4