From 32be45d08d274b9af0a0dabb5879ae37eed82be0 Mon Sep 17 00:00:00 2001 From: Mike <45243121+tankf33der@users.noreply.github.com> Date: Mon, 28 Apr 2025 04:38:27 +0300 Subject: [PATCH] cgen: fix arm64 closure + remove stub in test (#24332) --- vlib/v/gen/c/cheaders.v | 4 ++-- vlib/v/tests/fns/closure_generator_test.v | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/vlib/v/gen/c/cheaders.v b/vlib/v/gen/c/cheaders.v index 235e763f0d..45f9326583 100644 --- a/vlib/v/gen/c/cheaders.v +++ b/vlib/v/gen/c/cheaders.v @@ -101,12 +101,12 @@ static char __CLOSURE_GET_DATA_BYTES[] = { #elif defined(__V_arm64) static char __closure_thunk[] = { - 0x11, 0x00, 0xFE, 0x58, // ldr x17, userdata + 0x11, 0x00, 0xFE, 0x5C, // ldr d17, userdata 0x30, 0x00, 0xFE, 0x58, // ldr x16, fn 0x00, 0x02, 0x1F, 0xD6 // br x16 }; static char __CLOSURE_GET_DATA_BYTES[] = { - 0xE0, 0x03, 0x11, 0xAA, // mov x0, x17 + 0x20, 0x02, 0x66, 0x9E, // fmov x0, d17 0xC0, 0x03, 0x5F, 0xD6 // ret }; #elif defined(__V_arm32) diff --git a/vlib/v/tests/fns/closure_generator_test.v b/vlib/v/tests/fns/closure_generator_test.v index 22110bf53a..1a7491eb06 100644 --- a/vlib/v/tests/fns/closure_generator_test.v +++ b/vlib/v/tests/fns/closure_generator_test.v @@ -11,10 +11,6 @@ fn get_max_params() int { } fn get_max_string_params() int { - $if macos || (clang && arm64) { - return 9 - } - return 16 }