Index: llvm/include/llvm/CodeGen/GlobalISel/InstructionSelectorImpl.h =================================================================== --- llvm/include/llvm/CodeGen/GlobalISel/InstructionSelectorImpl.h +++ llvm/include/llvm/CodeGen/GlobalISel/InstructionSelectorImpl.h @@ -57,6 +57,7 @@ uint64_t CurrentIdx = 0; SmallVector OnFailResumeAt; + uint16_t Flags = State.MIs[0]->getFlags(); enum RejectAction { RejectAndGiveUp, RejectAndResume }; auto handleReject = [&]() -> RejectAction { @@ -71,6 +72,15 @@ return RejectAndResume; }; + auto propagateFlags = [&](NewMIVector &OutMIs) { + if (Flags == MachineInstr::MIFlag::NoFlags) + return false; + for (auto MIB : OutMIs) + MIB.setMIFlags(Flags); + + return true; + }; + while (true) { assert(CurrentIdx != ~0u && "Invalid MatchTable index"); int64_t MatcherOpcode = MatchTable[CurrentIdx++]; @@ -1065,6 +1075,7 @@ case GIR_Done: DEBUG_WITH_TYPE(TgtInstructionSelector::getName(), dbgs() << CurrentIdx << ": GIR_Done\n"); + propagateFlags(OutMIs); return true; default: Index: llvm/test/CodeGen/AArch64/GlobalISel/select-jump-table-brjt.mir =================================================================== --- llvm/test/CodeGen/AArch64/GlobalISel/select-jump-table-brjt.mir +++ llvm/test/CodeGen/AArch64/GlobalISel/select-jump-table-brjt.mir @@ -71,12 +71,12 @@ ; CHECK: BR %18 ; CHECK: bb.2.sw.bb: ; CHECK: successors: %bb.4(0x80000000) - ; CHECK: [[ADDWri:%[0-9]+]]:gpr32sp = ADDWri [[COPY]], 42, 0 + ; CHECK: [[ADDWri:%[0-9]+]]:gpr32sp = nsw ADDWri [[COPY]], 42, 0 ; CHECK: B %bb.4 ; CHECK: bb.3.sw.bb1: ; CHECK: successors: %bb.4(0x80000000) ; CHECK: [[MOVi32imm:%[0-9]+]]:gpr32 = MOVi32imm 3 - ; CHECK: [[MADDWrrr:%[0-9]+]]:gpr32 = MADDWrrr [[COPY]], [[MOVi32imm]], $wzr + ; CHECK: [[MADDWrrr:%[0-9]+]]:gpr32 = nsw MADDWrrr [[COPY]], [[MOVi32imm]], $wzr ; CHECK: bb.4.return: ; CHECK: [[PHI:%[0-9]+]]:gpr32 = PHI [[MADDWrrr]], %bb.3, [[ADDWri]], %bb.2, [[COPY1]], %bb.0, [[COPY2]], %bb.1 ; CHECK: $w0 = COPY [[PHI]]