diff options
| -rw-r--r-- | llvm/lib/Target/ARM/Thumb1InstrInfo.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/CodeGen/ARM/v8m-tail-call.ll | 25 |
2 files changed, 27 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp b/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp index 49645834e2d..f9e7ecbb7c5 100644 --- a/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp +++ b/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp @@ -109,11 +109,11 @@ loadRegFromStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator I, unsigned DestReg, int FI, const TargetRegisterClass *RC, const TargetRegisterInfo *TRI) const { - assert((RC == &ARM::tGPRRegClass || + assert((RC->hasSuperClassEq(&ARM::tGPRRegClass) || (TargetRegisterInfo::isPhysicalRegister(DestReg) && isARMLowRegister(DestReg))) && "Unknown regclass!"); - if (RC == &ARM::tGPRRegClass || + if (RC->hasSuperClassEq(&ARM::tGPRRegClass) || (TargetRegisterInfo::isPhysicalRegister(DestReg) && isARMLowRegister(DestReg))) { DebugLoc DL; diff --git a/llvm/test/CodeGen/ARM/v8m-tail-call.ll b/llvm/test/CodeGen/ARM/v8m-tail-call.ll index 96438dc5e64..f4d3a454c70 100644 --- a/llvm/test/CodeGen/ARM/v8m-tail-call.ll +++ b/llvm/test/CodeGen/ARM/v8m-tail-call.ll @@ -103,3 +103,28 @@ define i32 @test7() { } declare i32 @bar(i32, i32, i32, i32) + +; Regression test for failure to load indirect branch target (class tcGPR) from +; a stack slot. +%struct.S = type { i32 } + +define void @test8(i32 (i32, i32, i32)* nocapture %fn, i32 %x) local_unnamed_addr { +entry: + %call = tail call %struct.S* bitcast (%struct.S* (...)* @test8_u to %struct.S* ()*)() + %a = getelementptr inbounds %struct.S, %struct.S* %call, i32 0, i32 0 + %0 = load i32, i32* %a, align 4 + %call1 = tail call i32 @test8_h(i32 0) + %call2 = tail call i32 @test8_g(i32 %0, i32 %call1, i32 0) + store i32 %x, i32* %a, align 4 + %call4 = tail call i32 %fn(i32 1, i32 2, i32 3) + ret void +} + +declare %struct.S* @test8_u(...) + +declare i32 @test8_g(i32, i32, i32) + +declare i32 @test8_h(i32) +; CHECK: str r0, [sp] @ 4-byte Spill +; CHECK: ldr r3, [sp] @ 4-byte Reload +; CHECK: bx r3 |
