A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
aarch64: Fix ABI layout calculation for apple_aarch64 (#12982)
Alex Crichtonb3df2959036e
diff --git a/cranelift/codegen/src/isa/aarch64/abi.rs b/cranelift/codegen/src/isa/aarch64/abi.rsindex cd312d43e7..51b91b3d1d 100644--- a/cranelift/codegen/src/isa/aarch64/abi.rs+++ b/cranelift/codegen/src/isa/aarch64/abi.rs@@ -347,15 +347,21 @@ impl ABIMachineSpec for AArch64MachineDeps {// Compute the stack slot's size.let size = (ty_bits(param.value_type) / 8) as u32;- let size = if is_apple_cc || is_winch_return {- // MacOS and Winch aarch64 allows stack slots with- // sizes less than 8 bytes. They still need to be- // properly aligned on their natural data alignment,- // though.+ // MacOS and Winch aarch64 allows stack slots with sizes less than 8+ // bytes. They still need to be properly aligned on their natural+ // data alignment, though, and this additionally is only applicable+ // for arguments or when there's no argument extension in play.+ // Stack slots for return values with argument extension get their+ // full machine-word-width loaded or stored.+ //+ // Otherwise every arg takes a minimum slot of 8 bytes. (16-byte+ // stack alignment happens separately after all args.)+ let size = if (is_apple_cc || is_winch_return)+ && (args_or_rets == ArgsOrRets::Args+ || param.extension == ir::ArgumentExtension::None)+ {size} else {- // Every arg takes a minimum slot of 8 bytes. (16-byte stack- // alignment happens separately after all args.)core::cmp::max(size, 8)};diff --git a/cranelift/filetests/filetests/isa/aarch64/stack-return-abi.clif b/cranelift/filetests/filetests/isa/aarch64/stack-return-abi.clifnew file mode 100644index 0000000000..14b3e04edb--- /dev/null+++ b/cranelift/filetests/filetests/isa/aarch64/stack-return-abi.clif@@ -0,0 +1,73 @@+test compile precise-output+set opt_level=speed_and_size+set enable_nan_canonicalization=true+set enable_multi_ret_implicit_sret=true+target aarch64++function %a(i8, i8 uext, i8 uext, i8, i128 uext, i128 uext, i128 uext, f32, i16x8, i16x8, i16x8, f64, i8 uext, f32, f32) -> i128, i128, i128, i128, i128, i128, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8 uext apple_aarch64 {+block0(v0: i8, v1: i8, v2: i8, v3: i8, v4: i128, v5: i128, v6: i128, v7: f32, v8: i16x8, v9: i16x8, v10: i16x8, v11: f64, v12: i8, v13: f32, v14: f32):+ v16 = iconst.i8 0+ v17 = iconst.i16 0+ v18 = iconst.i32 0+ v19 = iconst.i64 0+ v20 = uextend.i128 v19+ return v4, v4, v4, v4, v4, v4, v0, v0, v0, v0, v0, v0, v0, v0, v0, v0+}++; VCode:+; stp fp, lr, [sp, #-16]!+; mov fp, sp+; block0:+; str x4, [x8]+; str x5, [x8, #8]+; str x4, [x8, #16]+; str x5, [x8, #24]+; strb w0, [x8, #32]+; strb w0, [x8, #33]+; strb w0, [x8, #34]+; strb w0, [x8, #35]+; strb w0, [x8, #36]+; strb w0, [x8, #37]+; strb w0, [x8, #38]+; strb w0, [x8, #39]+; strb w0, [x8, #40]+; uxtb w1, w0+; str x0, [x8, #48]+; mov x6, x4+; mov x7, x5+; mov x0, x6+; mov x1, x7+; mov x2, x6+; mov x3, x7+; ldp fp, lr, [sp], #16+; ret+;+; Disassembled:+; block0: ; offset 0x0+; stp x29, x30, [sp, #-0x10]!+; mov x29, sp+; block1: ; offset 0x8+; stur x4, [x8]+; stur x5, [x8, #8]+; stur x4, [x8, #0x10]+; stur x5, [x8, #0x18]+; sturb w0, [x8, #0x20]+; sturb w0, [x8, #0x21]+; sturb w0, [x8, #0x22]+; sturb w0, [x8, #0x23]+; sturb w0, [x8, #0x24]+; sturb w0, [x8, #0x25]+; sturb w0, [x8, #0x26]+; sturb w0, [x8, #0x27]+; sturb w0, [x8, #0x28]+; uxtb w1, w0+; stur x0, [x8, #0x30]+; mov x6, x4+; mov x7, x5+; mov x0, x6+; mov x1, x7+; mov x2, x6+; mov x3, x7+; ldp x29, x30, [sp], #0x10+; ret+diff --git a/cranelift/filetests/filetests/runtests/aarch64-apple-stack-return-abi.clif b/cranelift/filetests/filetests/runtests/aarch64-apple-stack-return-abi.clifnew file mode 100644index 0000000000..be810c52c1--- /dev/null+++ b/cranelift/filetests/filetests/runtests/aarch64-apple-stack-return-abi.clif@@ -0,0 +1,17 @@+test run+set opt_level=speed_and_size+set enable_nan_canonicalization=true+set enable_multi_ret_implicit_sret=true+target aarch64++function %a(i8, i8 uext, i8 uext, i8, i128 uext, i128 uext, i128 uext, f32, i16x8, i16x8, i16x8, f64, i8 uext, f32, f32) -> i128, i128, i128, i128, i128, i128, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8 uext apple_aarch64 {+block0(v0: i8, v1: i8, v2: i8, v3: i8, v4: i128, v5: i128, v6: i128, v7: f32, v8: i16x8, v9: i16x8, v10: i16x8, v11: f64, v12: i8, v13: f32, v14: f32):+ v16 = iconst.i8 0+ v17 = iconst.i16 0+ v18 = iconst.i32 0+ v19 = iconst.i64 0+ v20 = uextend.i128 v19 ; v19 = 0+ return v4, v4, v4, v4, v4, v4, v0, v0, v0, v0, v0, v0, v0, v0, v0, v0+}++; run: %a(0, 0, 0, 0, 0, 0, 0, 0.0, 0x00000000000000000000000000000000, 0x00000000000000000000000000000000, 0x00000000000000000000000000000000, 0.0, 0, 0.0, 0.0) == [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]