[llvm-branch-commits] [llvm] 9010b1b - Revert "[SystemZ] Bugfix for backchain with packed-stack"

[Jonas Paulsson via llvm-branch-commits]

Author: Jonas Paulsson
Date: 2020-03-03T15:00:31+01:00
New Revision: 9010b1b78a52e854b3dba8f0e0bc03eec5028a74

URL: https://github.com/llvm/llvm-project/commit/9010b1b78a52e854b3dba8f0e0bc03eec5028a74
DIFF: https://github.com/llvm/llvm-project/commit/9010b1b78a52e854b3dba8f0e0bc03eec5028a74.diff

LOG: Revert "[SystemZ]  Bugfix for backchain with packed-stack"

This reverts commit 594f8e72700fb1ae244793e32ee328c8c8fc3d39.

Sorry - pushed my local branch instead of on master.

Added: 
    

Modified: 
    llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp

Removed: 
    llvm/test/CodeGen/SystemZ/frame-25.ll


################################################################################
diff  --git a/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp b/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp
index 0f43ccf63097..9eeccc25e1e6 100644
--- a/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp
+++ b/llvm/lib/Target/SystemZ/SystemZFrameLowering.cpp
@@ -315,10 +315,9 @@ void SystemZFrameLowering::
 processFunctionBeforeFrameFinalized(MachineFunction &MF,
                                     RegScavenger *RS) const {
   MachineFrameInfo &MFFrame = MF.getFrameInfo();
-  bool BackChain = MF.getFunction().hasFnAttribute("backchain");
 
-  if (!usePackedStack(MF) || BackChain)
-    // Create the incoming register save area.
+  if (!usePackedStack(MF))
+    // Always create the full incoming register save area.
     getOrCreateFramePointerSaveIndex(MF);
 
   // Get the size of our stack frame to be allocated ...

diff  --git a/llvm/test/CodeGen/SystemZ/frame-25.ll b/llvm/test/CodeGen/SystemZ/frame-25.ll
deleted file mode 100644
index 64c175bd4eca..000000000000
--- a/llvm/test/CodeGen/SystemZ/frame-25.ll
+++ /dev/null
@@ -1,24 +0,0 @@
-; RUN: llc < %s -mtriple=s390x-linux-gnu | FileCheck %s
-;
-; Test that space is allocated for the incoming back chain also in cases
-; where no GPRs are saved / restored.
-
-define void @fun0() #0 {
-; CHECK-LABEL: fun0:
-; CHECK: lgr     %r1, %r15
-; CHECK-NEXT: aghi    %r15, -24
-; CHECK-NEXT: stg     %r1, 152(%r15)
-; CHECK-NEXT: #APP
-; CHECK-NEXT: stcke   160(%r15)
-; CHECK-NEXT: #NO_APP
-; CHECK-NEXT: aghi    %r15, 24
-; CHECK-NEXT: br      %r14
-
-entry:
-  %b = alloca [16 x i8], align 1
-  %0 = getelementptr inbounds [16 x i8], [16 x i8]* %b, i64 0, i64 0
-  call void asm "stcke $0", "=*Q"([16 x i8]* nonnull %b) #2
-  ret void
-}
-
-attributes #0 = { nounwind "packed-stack" "backchain" "use-soft-float"="true" }