[PATCH] D42535: [ARM] Accept a subset of Thumb GPR register class when emitting an SP-relative load instruction

[Momchil Velikov via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL323514: [ARM] Accept a subset of Thumb GPR register class when emitting an SP-relative (authored by chill, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D42535?vs=131442&id=131560#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D42535

Files:
  llvm/trunk/lib/Target/ARM/Thumb1InstrInfo.cpp
  llvm/trunk/test/CodeGen/ARM/v8m-tail-call.ll


Index: llvm/trunk/test/CodeGen/ARM/v8m-tail-call.ll
===================================================================
--- llvm/trunk/test/CodeGen/ARM/v8m-tail-call.ll
+++ llvm/trunk/test/CodeGen/ARM/v8m-tail-call.ll
@@ -103,3 +103,28 @@
 }
 
 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
Index: llvm/trunk/lib/Target/ARM/Thumb1InstrInfo.cpp
===================================================================
--- llvm/trunk/lib/Target/ARM/Thumb1InstrInfo.cpp
+++ llvm/trunk/lib/Target/ARM/Thumb1InstrInfo.cpp
@@ -109,11 +109,11 @@
                      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;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D42535.131560.patch
Type: text/x-patch
Size: 1929 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180126/f29ff9dd/attachment.bin>