diff options
| -rw-r--r-- | llvm/lib/Target/AMDGPU/SIInstrInfo.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/CodeGen/AMDGPU/phi-elimination-assertion.mir | 26 |
2 files changed, 30 insertions, 2 deletions
diff --git a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp index c8410d27301..fe57435204a 100644 --- a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp +++ b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp @@ -6415,11 +6415,13 @@ MachineInstr *SIInstrInfo::createPHIDestinationCopy( MachineBasicBlock &MBB, MachineBasicBlock::iterator LastPHIIt, const DebugLoc &DL, Register Src, Register Dst) const { auto Cur = MBB.begin(); - do { + while (Cur != MBB.end()) { if (!Cur->isPHI() && Cur->readsRegister(Dst)) return BuildMI(MBB, Cur, DL, get(TargetOpcode::COPY), Dst).addReg(Src); ++Cur; - } while (Cur != MBB.end() && Cur != LastPHIIt); + if (Cur == LastPHIIt) + break; + } return TargetInstrInfo::createPHIDestinationCopy(MBB, LastPHIIt, DL, Src, Dst); diff --git a/llvm/test/CodeGen/AMDGPU/phi-elimination-assertion.mir b/llvm/test/CodeGen/AMDGPU/phi-elimination-assertion.mir index 094d2eede05..e2e6ea76103 100644 --- a/llvm/test/CodeGen/AMDGPU/phi-elimination-assertion.mir +++ b/llvm/test/CodeGen/AMDGPU/phi-elimination-assertion.mir @@ -67,3 +67,29 @@ body: | # CHECK-NEXT: dead %3:sreg_32_xm0 = IMPLICIT_DEF # CHECK-NEXT: %2:sreg_32_xm0 = COPY killed %4 # CHECK-NEXT: S_NOP 0, implicit killed %2 + + +# The following test crashes in phi-elimination hooks. +# + +--- +name: bax +tracksRegLiveness: true +body: | + bb.0: + S_CBRANCH_SCC0 %bb.2, implicit undef $scc + + bb.1: + %1:sreg_32_xm0 = S_MOV_B32 255 + S_BRANCH %bb.3 + + bb.2: + %2:sreg_32_xm0 = S_MOV_B32 254 + + bb.3: + %3:sreg_32_xm0 = PHI %2, %bb.2, %1, %bb.1 +... + +# CHECK-LABEL: name: bax +# CHECK: bb.3: +# CHECK-NEXT: %2:sreg_32_xm0 = COPY killed %3 |
