From bc1d2ba1ab9ecd5f6d5b9e1c1b902ee6233fc22d Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 14 Jan 2025 15:18:47 -0800
Subject: [PATCH] pulley: Fix prologue for large stack frames

This fixes a mistake from #9999 which was discovered in the testing
of #9837 where the prologue was generated in the wrong order.
---
 .../codegen/src/isa/pulley_shared/abi.rs      |  2 +-
 .../filetests/isa/pulley64/call.clif          | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/cranelift/codegen/src/isa/pulley_shared/abi.rs b/cranelift/codegen/src/isa/pulley_shared/abi.rs
index 08eb936f1f3e..92fc102cbe86 100644
--- a/cranelift/codegen/src/isa/pulley_shared/abi.rs
+++ b/cranelift/codegen/src/isa/pulley_shared/abi.rs
@@ -320,10 +320,10 @@ where
         match &style {
             FrameStyle::None => {}
             FrameStyle::PulleyBasicSetup { frame_size } => {
+                insts.push(RawInst::PushFrame.into());
                 insts.extend(Self::gen_sp_reg_adjust(
                     -i32::try_from(*frame_size).unwrap(),
                 ));
-                insts.push(RawInst::PushFrame.into());
             }
             FrameStyle::PulleySetupAndSaveClobbers {
                 frame_size,
diff --git a/cranelift/filetests/filetests/isa/pulley64/call.clif b/cranelift/filetests/filetests/isa/pulley64/call.clif
index 1b4ac0278d4e..1d8ec843a4b1 100644
--- a/cranelift/filetests/filetests/isa/pulley64/call.clif
+++ b/cranelift/filetests/filetests/isa/pulley64/call.clif
@@ -383,3 +383,40 @@ block0:
 ; pop_frame_restore 64, 
 ; ret
 
+function %very_large_stack_frame(i32) -> i32 {
+    fn0 = colocated %g() -> i32
+    ss0 = explicit_slot 1000000
+
+block0(v0: i32):
+    v1 = call fn0()
+    v2 = iadd v0, v1
+    return v2
+}
+
+; VCode:
+;   push_frame
+;   stack_alloc32 1000016
+;   xstore64 sp+1000008, x20 // flags =  notrap aligned
+; block0:
+;   xmov x20, x0
+;   call CallInfo { dest: PulleyCall { name: TestCase(%g), args: [] }, uses: [], defs: [CallRetPair { vreg: Writable { reg: p0i }, preg: p0i }], clobbers: PRegSet { bits: [65534, 65535, 4294967295, 0] }, callee_conv: Fast, caller_conv: Fast, callee_pop_size: 0 }
+;   xmov x5, x20
+;   xadd32 x0, x5, x0
+;   x20 = xload64 sp+1000008 // flags = notrap aligned
+;   stack_free32 1000016
+;   pop_frame
+;   ret
+;
+; Disassembled:
+; push_frame
+; stack_alloc32 1000016
+; xstore64le_offset32 sp, 1000008, x20
+; xmov x20, x0
+; call 0x0    // target = 0x10
+; xmov x5, x20
+; xadd32 x0, x5, x0
+; xload64le_offset32 x20, sp, 1000008
+; stack_free32 1000016
+; pop_frame
+; ret
+