Skip to content

Commit e40b2d4

Browse files
authored
[RISCV] Use range-based for loops in RISCVOptWInstrs. NFC (llvm#69647)
1 parent f2801a5 commit e40b2d4

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

llvm/lib/Target/RISCV/RISCVOptWInstrs.cpp

+7-11
Original file line numberDiff line numberDiff line change
@@ -602,25 +602,23 @@ bool RISCVOptWInstrs::removeSExtWInstrs(MachineFunction &MF,
602602

603603
bool MadeChange = false;
604604
for (MachineBasicBlock &MBB : MF) {
605-
for (auto I = MBB.begin(), IE = MBB.end(); I != IE;) {
606-
MachineInstr *MI = &*I++;
607-
605+
for (MachineInstr &MI : llvm::make_early_inc_range(MBB)) {
608606
// We're looking for the sext.w pattern ADDIW rd, rs1, 0.
609-
if (!RISCV::isSEXT_W(*MI))
607+
if (!RISCV::isSEXT_W(MI))
610608
continue;
611609

612-
Register SrcReg = MI->getOperand(1).getReg();
610+
Register SrcReg = MI.getOperand(1).getReg();
613611

614612
SmallPtrSet<MachineInstr *, 4> FixableDefs;
615613

616614
// If all users only use the lower bits, this sext.w is redundant.
617615
// Or if all definitions reaching MI sign-extend their output,
618616
// then sext.w is redundant.
619-
if (!hasAllWUsers(*MI, ST, MRI) &&
617+
if (!hasAllWUsers(MI, ST, MRI) &&
620618
!isSignExtendedW(SrcReg, ST, MRI, FixableDefs))
621619
continue;
622620

623-
Register DstReg = MI->getOperand(0).getReg();
621+
Register DstReg = MI.getOperand(0).getReg();
624622
if (!MRI.constrainRegClass(SrcReg, MRI.getRegClass(DstReg)))
625623
continue;
626624

@@ -638,7 +636,7 @@ bool RISCVOptWInstrs::removeSExtWInstrs(MachineFunction &MF,
638636
LLVM_DEBUG(dbgs() << "Removing redundant sign-extension\n");
639637
MRI.replaceRegWith(DstReg, SrcReg);
640638
MRI.clearKillFlags(SrcReg);
641-
MI->eraseFromParent();
639+
MI.eraseFromParent();
642640
++NumRemovedSExtW;
643641
MadeChange = true;
644642
}
@@ -656,9 +654,7 @@ bool RISCVOptWInstrs::stripWSuffixes(MachineFunction &MF,
656654

657655
bool MadeChange = false;
658656
for (MachineBasicBlock &MBB : MF) {
659-
for (auto I = MBB.begin(), IE = MBB.end(); I != IE; ++I) {
660-
MachineInstr &MI = *I;
661-
657+
for (MachineInstr &MI : MBB) {
662658
unsigned Opc;
663659
switch (MI.getOpcode()) {
664660
default:

0 commit comments

Comments
 (0)