koffi 2.15.2 → 2.15.4

package/CHANGELOG.md

@@ -7,6 +7,21 @@
 
 ### Koffi 2.15
 
+#### Koffi 2.15.4
+
+*Released on 2026-04-03*
+
+- Fix ABI issue with variadic parameters that are passed on the stack on Apple ARM64 platforms
+- Remove erroneous assertion from debug builds
+
+#### Koffi 2.15.3
+
+*Released on 2026-04-03*
+
+- Fix *IsOnCentralStack()* assertion/crash when using callbacks in recent Node versions
+- Support SetUnhandledExceptionFilter on Windows x64 and x86 ([@longhun12346](https://github.com/longhun12346))
+- Fix incorrect stack alignment when relaying callbacks on 32-bit x86 platforms
+
 #### Koffi 2.15.2
 
 *Released on 2026-03-11*

package/index.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod3) => function __require() {
   return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
 };
 
-// package/src/cnoke/src/tools.js
+// ../../bin/Koffi/package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "package/src/cnoke/src/tools.js"(exports2, module2) {
+  "../../bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
     "use strict";
     var crypto = require("crypto");
     var fs2 = require("fs");
@@ -393,12 +393,12 @@ var require_tools = __commonJS({
   }
 });
 
-// package/src/koffi/package.json
+// ../../bin/Koffi/package/src/koffi/package.json
 var require_package = __commonJS({
-  "package/src/koffi/package.json"(exports2, module2) {
+  "../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.15.2",
+      version: "2.15.4",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -440,9 +440,9 @@ var require_package = __commonJS({
   }
 });
 
-// package/src/koffi/src/init.js
+// ../../bin/Koffi/package/src/koffi/src/init.js
 var require_init = __commonJS({
-  "package/src/koffi/src/init.js"(exports, module) {
+  "../../bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
     var fs = require("fs");
     var path = require("path");
     var util = require("util");
@@ -526,7 +526,7 @@ var require_init = __commonJS({
   }
 });
 
-// package/src/koffi/index.js
+// ../../bin/Koffi/package/src/koffi/index.js
 var { detect: detect2, init: init2 } = require_init();
 var triplet2 = detect2();
 var native2 = null;

package/indirect.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod3) => function __require() {
   return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
 };
 
-// package/src/cnoke/src/tools.js
+// ../../bin/Koffi/package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "package/src/cnoke/src/tools.js"(exports2, module2) {
+  "../../bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
     "use strict";
     var crypto = require("crypto");
     var fs2 = require("fs");
@@ -393,12 +393,12 @@ var require_tools = __commonJS({
   }
 });
 
-// package/src/koffi/package.json
+// ../../bin/Koffi/package/src/koffi/package.json
 var require_package = __commonJS({
-  "package/src/koffi/package.json"(exports2, module2) {
+  "../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.15.2",
+      version: "2.15.4",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -440,9 +440,9 @@ var require_package = __commonJS({
   }
 });
 
-// package/src/koffi/src/init.js
+// ../../bin/Koffi/package/src/koffi/src/init.js
 var require_init = __commonJS({
-  "package/src/koffi/src/init.js"(exports, module) {
+  "../../bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
     var fs = require("fs");
     var path = require("path");
     var util = require("util");
@@ -526,7 +526,7 @@ var require_init = __commonJS({
   }
 });
 
-// package/src/koffi/indirect.js
+// ../../bin/Koffi/package/src/koffi/indirect.js
 var { detect: detect2, init: init2 } = require_init();
 var triplet2 = detect2();
 var mod2 = init2(triplet2, null);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koffi",
-    "version": "2.15.2",
+    "version": "2.15.4",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",

package/src/koffi/src/abi_arm32.cc

@@ -38,10 +38,6 @@ extern "C" uint64_t ForwardCallXGG(const void *func, uint8_t *sp, uint8_t **out_
 extern "C" float ForwardCallXF(const void *func, uint8_t *sp, uint8_t **out_old_sp);
 extern "C" HfaRet ForwardCallXDDDD(const void *func, uint8_t *sp, uint8_t **out_old_sp);
 
-extern "C" napi_value CallSwitchStack(Napi::Function *func, size_t argc, napi_value *argv,
-                                      uint8_t *old_sp, Span<uint8_t> *new_stack,
-                                      napi_value (*call)(Napi::Function *func, size_t argc, napi_value *argv));
-
 #include "trampolines/prototypes.inc"
 
 static int IsHFA(const TypeInfo *type)
@@ -543,8 +539,12 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
     K_UNREACHABLE();
 }
 
-void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_stack, BackRegisters *out_reg)
+void CallData::Relay(Size idx, uint8_t *sp)
 {
+    uint8_t *own_sp = sp;
+    uint8_t *caller_sp = sp + 128;
+    BackRegisters *out_reg = (BackRegisters *)(sp + 80);
+
     if (env.IsExceptionPending()) [[unlikely]]
         return;
 
@@ -810,15 +810,8 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
 
     const TypeInfo *type = proto->ret.type;
 
-    // Make the call
-    napi_value ret;
-    if (switch_stack) {
-        ret = CallSwitchStack(&func, (size_t)arguments.len, arguments.data, old_sp, &mem->stack,
-                              [](Napi::Function *func, size_t argc, napi_value *argv) { return (napi_value)func->Call(argv[0], argc - 1, argv + 1); });
-    } else {
-        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
-    }
-    Napi::Value value(env, ret);
+    // Make the call!
+    Napi::Value value = func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
 
     if (env.IsExceptionPending()) [[unlikely]]
         return;

package/src/koffi/src/abi_arm32_asm.S

@@ -91,7 +91,8 @@ ForwardCallXDDDD:
 # ----------------------------
 
 .global RelayCallback
-.global CallSwitchStack
+.global SwitchAndRelay
+.global RelayDirect
 
 # First, make a copy of the GPR argument registers (r0 to r7).
 # Then call the C function RelayCallback with the following arguments:
@@ -107,11 +108,9 @@ ForwardCallXDDDD:
     sub sp, sp, #120
     .cfi_def_cfa sp, 128
     add r12, sp, 64
-    stmia r12!, {r0-r3}
+    stmia r12, {r0-r3}
     mov r0, \id
     mov r1, sp
-    add r2, sp, #128
-    mov r3, r12
     bl RelayCallback
     add sp, sp, #80
     ldmia sp!, {r0-r1}
@@ -136,11 +135,9 @@ ForwardCallXDDDD:
     .cfi_def_cfa sp, 128
     mov r12, sp
     vstmia r12!, {d0-d7}
-    stmia r12!, {r0-r3}
+    stmia r12, {r0-r3}
     mov r0, \id
     mov r1, sp
-    add r2, sp, #128
-    mov r3, r12
     bl RelayCallback
     add sp, sp, #80
     ldmia sp!, {r0-r1}
@@ -159,7 +156,7 @@ ForwardCallXDDDD:
 # probably misdetect this as a "stack overflow". We have to restore the old
 # stack pointer, call Node.js/V8 and go back to ours.
 # The first three parameters (r0, r1, r2) are passed through untouched.
-CallSwitchStack:
+SwitchAndRelay:
     .cfi_startproc
     push {fp, lr}
     .cfi_def_cfa sp, 8
@@ -173,9 +170,8 @@ CallSwitchStack:
     sub r5, sp, r5
     and r5, r5, #-16
     str r5, [r4, 4]
-    ldr r4, [sp, 20]
     mov sp, r3
-    blx r4
+    bl RelayDirect
     mov sp, fp
     .cfi_def_cfa sp, 16
     pop {r4, r5}

package/src/koffi/src/abi_arm64.cc

@@ -48,10 +48,6 @@ extern "C" X0X1Ret ForwardCallXGG(const void *func, uint8_t *sp, uint8_t **out_o
 extern "C" float ForwardCallXF(const void *func, uint8_t *sp, uint8_t **out_old_sp);
 extern "C" HfaRet ForwardCallXDDDD(const void *func, uint8_t *sp, uint8_t **out_old_sp);
 
-extern "C" napi_value CallSwitchStack(Napi::Function *func, size_t argc, napi_value *argv,
-                                      uint8_t *old_sp, Span<uint8_t> *new_stack,
-                                      napi_value (*call)(Napi::Function *func, size_t argc, napi_value *argv));
-
 #include "trampolines/prototypes.inc"
 
 static HfaInfo IsHFA(const TypeInfo *type)
@@ -290,7 +286,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             if (param.gpr_count) [[likely]] { \
                 *(gpr_ptr++) = (uint64_t)v; \
             } else { \
-                args_ptr = AlignUp(args_ptr, param.type->align); \
+                args_ptr = AlignUp(args_ptr, param.variadic ? 8 : param.type->align); \
                 *args_ptr = (uint64_t)v; \
                 args_ptr = (uint64_t *)((uint8_t *)args_ptr + param.type->size); \
             } \
@@ -307,7 +303,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
             if (param.gpr_count) [[likely]] { \
                 *(gpr_ptr++) = (uint64_t)ReverseBytes(v); \
             } else { \
-                args_ptr = AlignUp(args_ptr, param.type->align); \
+                args_ptr = AlignUp(args_ptr, param.variadic ? 8 : param.type->align); \
                 *args_ptr = (uint64_t)ReverseBytes(v); \
                 args_ptr = (uint64_t *)((uint8_t *)args_ptr + param.type->size); \
             } \
@@ -357,6 +353,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
                 if (param.gpr_count) [[likely]] {
                     *(gpr_ptr++) = (uint64_t)b;
                 } else {
+                    args_ptr = AlignUp(args_ptr, param.variadic ? 8 : 1);
                     *(uint8_t *)args_ptr = b;
                     args_ptr = (uint64_t *)((uint8_t *)args_ptr + 1);
                 }
@@ -488,7 +485,7 @@ bool CallData::Prepare(const FunctionInfo *func, const Napi::CallbackInfo &info)
 #endif
                 } else {
 #if defined(__APPLE__)
-                    args_ptr = AlignUp(args_ptr, 4);
+                    args_ptr = AlignUp(args_ptr, param.variadic ? 8 : 4);
                     *(float *)args_ptr = f;
                     args_ptr = (uint64_t *)((uint8_t *)args_ptr + 4);
 #else
@@ -691,8 +688,12 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
     K_UNREACHABLE();
 }
 
-void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_stack, BackRegisters *out_reg)
+void CallData::Relay(Size idx, uint8_t *sp)
 {
+    uint8_t *own_sp = sp;
+    uint8_t *caller_sp = sp + 208;
+    BackRegisters *out_reg = (BackRegisters *)(sp + 136);
+
     if (env.IsExceptionPending()) [[unlikely]]
         return;
 
@@ -1133,15 +1134,8 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
 
     const TypeInfo *type = proto->ret.type;
 
-    // Make the call
-    napi_value ret;
-    if (switch_stack) {
-        ret = CallSwitchStack(&func, (size_t)arguments.len, arguments.data, old_sp, &mem->stack,
-                              [](Napi::Function *func, size_t argc, napi_value *argv) { return (napi_value)func->Call(argv[0], argc - 1, argv + 1); });
-    } else {
-        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
-    }
-    Napi::Value value(env, ret);
+    // Make the call!
+    Napi::Value value = func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
 
     if (env.IsExceptionPending()) [[unlikely]]
         return;

package/src/koffi/src/abi_arm64_asm.S

@@ -112,7 +112,8 @@ SYMBOL(ForwardCallXDDDD):
 # ----------------------------
 
 .global SYMBOL(RelayCallback)
-.global SYMBOL(CallSwitchStack)
+.global SYMBOL(SwitchAndRelay)
+.global SYMBOL(RelayDirect)
 
 # First, make a copy of the GPR argument registers (x0 to x7).
 # Then call the C function RelayCallback with the following arguments:
@@ -135,8 +136,6 @@ SYMBOL(ForwardCallXDDDD):
     str x8, [sp, 64]
     mov x0, \id
     mov x1, sp
-    add x2, sp, #208
-    add x3, sp, #136
     bl SYMBOL(RelayCallback)
     ldp x0, x1, [sp, 136]
     add sp, sp, #192
@@ -170,8 +169,6 @@ SYMBOL(ForwardCallXDDDD):
     stp d6, d7, [sp, 120]
     mov x0, \id
     mov x1, sp
-    add x2, sp, #208
-    add x3, sp, #136
     bl SYMBOL(RelayCallback)
     ldp x0, x1, [sp, 136]
     ldp d0, d1, [sp, 152]
@@ -191,7 +188,7 @@ SYMBOL(ForwardCallXDDDD):
 # probably misdetect this as a "stack overflow". We have to restore the old
 # stack pointer, call Node.js/V8 and go back to ours.
 # The first three parameters (x0, x1, x2) are passed through untouched.
-SYMBOL(CallSwitchStack):
+SYMBOL(SwitchAndRelay):
     .cfi_startproc
     hint #34
     stp x29, x30, [sp, -16]!
@@ -204,7 +201,7 @@ SYMBOL(CallSwitchStack):
     and x9, x9, #-16
     str x9, [x4, 8]
     mov sp, x3
-    blr x5
+    bl SYMBOL(RelayDirect)
     mov sp, x29
     .cfi_def_cfa sp, 16
     ldp x29, x30, [sp], 16

package/src/koffi/src/abi_arm64_asm.asm

@@ -106,7 +106,9 @@ ForwardCallXDDDD PROC
 
     EXPORT RelayCallback
     EXTERN RelayCallback
-    EXPORT CallSwitchStack
+    EXPORT SwitchAndRelay
+    EXPORT RelayDirect
+    EXTERN RelayDirect
 
     ; First, make a copy of the GPR argument registers (x0 to x7).
     ; Then call the C function RelayCallback with the following arguments:
@@ -125,8 +127,6 @@ ForwardCallXDDDD PROC
     str x8, [sp, 64]
     mov x0, $ID
     mov x1, sp
-    add x2, sp, #208
-    add x3, sp, #136
     bl RelayCallback
     ldp x0, x1, [sp, 136]
     add sp, sp, #192
@@ -151,8 +151,6 @@ ForwardCallXDDDD PROC
     stp d6, d7, [sp, 120]
     mov x0, $ID
     mov x1, sp
-    add x2, sp, #208
-    add x3, sp, #136
     bl RelayCallback
     ldp x0, x1, [sp, 136]
     ldp d0, d1, [sp, 152]
@@ -167,7 +165,7 @@ ForwardCallXDDDD PROC
 ; probably misdetect this as a "stack overflow". We have to restore the old
 ; stack pointer, call Node.js/V8 and go back to ours.
 ; The first three parameters (x0, x1, x2) are passed through untouched.
-CallSwitchStack PROC
+SwitchAndRelay PROC
     stp x29, x30, [sp, -16]!
     mov x29, sp
     ldr x9, [x4, 0]
@@ -175,7 +173,7 @@ CallSwitchStack PROC
     and x9, x9, #-16
     str x9, [x4, 8]
     mov sp, x3
-    blr x5
+    bl RelayDirect
     mov sp, x29
     ldp x29, x30, [sp], 16
     ret

package/src/koffi/src/abi_loong64_asm.S

@@ -129,7 +129,8 @@ ForwardCallXDD:
 # ----------------------------
 
 .global RelayCallback
-.global CallSwitchStack
+.global SwitchAndRelay
+.global RelayDirect
 
 # First, make a copy of the GPR argument registers (a0 to a7).
 # Then call the C function RelayCallback with the following arguments:
@@ -149,8 +150,6 @@ ForwardCallXDD:
     st.d $a7, $sp, 64
     li.d $a0, \id
     addi.d $a1, $sp, 8
-    addi.d $a2, $sp, 176
-    addi.d $a3, $sp, 136
     bl RelayCallback
     ld.d $ra, $sp, 0
     ld.d $a0, $sp, 136
@@ -181,8 +180,6 @@ ForwardCallXDD:
     fst.d $fa7, $sp, 128
     li.d $a0, \id
     addi.d $a1, $sp, 8
-    addi.d $a2, $sp, 176
-    addi.d $a3, $sp, 136
     bl RelayCallback
     ld.d $ra, $sp, 0
     ld.d $a0, $sp, 136
@@ -198,7 +195,7 @@ ForwardCallXDD:
 # probably misdetect this as a "stack overflow". We have to restore the old
 # stack pointer, call Node.js/V8 and go back to ours.
 # The first three parameters (a0, a1, a2) are passed through untouched.
-CallSwitchStack:
+SwitchAndRelay:
     addi.d $sp, $sp, -16
     st.d $ra, $sp, 0
     st.d $fp, $sp, 8
@@ -209,7 +206,7 @@ CallSwitchStack:
     and $t0, $t0, $t1
     st.d $t0, $a4, 8
     move $sp, $a3
-    jirl $ra, $a5, 0
+    bl RelayDirect
     move $sp, $fp
     ld.d $ra, $sp, 0
     ld.d $fp, $sp, 8

package/src/koffi/src/abi_riscv64.cc

@@ -48,10 +48,6 @@ extern "C" Fa0A0Ret ForwardCallXDG(const void *func, uint8_t *sp, uint8_t **out_
 extern "C" A0Fa0Ret ForwardCallXGD(const void *func, uint8_t *sp, uint8_t **out_old_sp);
 extern "C" Fa0Fa1Ret ForwardCallXDD(const void *func, uint8_t *sp, uint8_t **out_old_sp);
 
-extern "C" napi_value CallSwitchStack(Napi::Function *func, size_t argc, napi_value *argv,
-                                      uint8_t *old_sp, Span<uint8_t> *new_stack,
-                                      napi_value (*call)(Napi::Function *func, size_t argc, napi_value *argv));
-
 #include "trampolines/prototypes.inc"
 
 static inline void ExpandPair(const uint8_t raw[16], int size1, int size2, uint64_t out_regs[2])
@@ -484,8 +480,12 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
     K_UNREACHABLE();
 }
 
-void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_stack, BackRegisters *out_reg)
+void CallData::Relay(Size idx, uint8_t *sp)
 {
+    uint8_t *own_sp = sp;
+    uint8_t *caller_sp = sp + 168;
+    BackRegisters *out_reg = (BackRegisters *)(sp + 128);
+
     if (env.IsExceptionPending()) [[unlikely]]
         return;
 
@@ -722,15 +722,8 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
 
     const TypeInfo *type = proto->ret.type;
 
-    // Make the call
-    napi_value ret;
-    if (switch_stack) {
-        ret = CallSwitchStack(&func, (size_t)arguments.len, arguments.data, old_sp, &mem->stack,
-                              [](Napi::Function *func, size_t argc, napi_value *argv) { return (napi_value)func->Call(argv[0], argc - 1, argv + 1); });
-    } else {
-        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
-    }
-    Napi::Value value(env, ret);
+    // Make the call!
+    Napi::Value value = func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
 
     if (env.IsExceptionPending()) [[unlikely]]
         return;

package/src/koffi/src/abi_riscv64_asm.S

@@ -129,7 +129,8 @@ ForwardCallXDD:
 # ----------------------------
 
 .global RelayCallback
-.global CallSwitchStack
+.global SwitchAndRelay
+.global RelayDirect
 
 # First, make a copy of the GPR argument registers (a0 to a7).
 # Then call the C function RelayCallback with the following arguments:
@@ -149,8 +150,6 @@ ForwardCallXDD:
     sd a7, 64(sp)
     li a0, \id
     addi a1, sp, 8
-    addi a2, sp, 176
-    addi a3, sp, 136
     call RelayCallback
     ld ra, 0(sp)
     ld a0, 136(sp)
@@ -181,8 +180,6 @@ ForwardCallXDD:
     fsd fa7, 128(sp)
     li a0, \id
     addi a1, sp, 8
-    addi a2, sp, 176
-    addi a3, sp, 136
     call RelayCallback
     ld ra, 0(sp)
     ld a0, 136(sp)
@@ -198,7 +195,7 @@ ForwardCallXDD:
 # probably misdetect this as a "stack overflow". We have to restore the old
 # stack pointer, call Node.js/V8 and go back to ours.
 # The first three parameters (a0, a1, a2) are passed through untouched.
-CallSwitchStack:
+SwitchAndRelay:
     addi sp, sp, -16
     sd ra, 0(sp)
     sd s1, 8(sp)
@@ -208,7 +205,7 @@ CallSwitchStack:
     andi t0, t0, -16
     sd t0, 8(a4)
     mv sp, a3
-    jalr a5
+    call RelayDirect
     mv sp, s1
     ld ra, 0(sp)
     ld s1, 8(sp)

package/src/koffi/src/abi_x64_sysv.cc

@@ -55,10 +55,6 @@ extern "C" Xmm0RaxRet ForwardCallXDG(const void *func, uint8_t *sp, uint8_t **ou
 extern "C" RaxXmm0Ret ForwardCallXGD(const void *func, uint8_t *sp, uint8_t **out_old_sp);
 extern "C" Xmm0Xmm1Ret ForwardCallXDD(const void *func, uint8_t *sp, uint8_t **out_old_sp);
 
-extern "C" napi_value CallSwitchStack(Napi::Function *func, size_t argc, napi_value *argv,
-                                      uint8_t *old_sp, Span<uint8_t> *new_stack,
-                                      napi_value (*call)(Napi::Function *func, size_t argc, napi_value *argv));
-
 #include "trampolines/prototypes.inc"
 
 static inline RegisterClass MergeClasses(RegisterClass cls1, RegisterClass cls2)
@@ -520,8 +516,12 @@ Napi::Value CallData::Complete(const FunctionInfo *func)
     K_UNREACHABLE();
 }
 
-void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_stack, BackRegisters *out_reg)
+void CallData::Relay(Size idx, uint8_t *sp)
 {
+    uint8_t *own_sp = sp;
+    uint8_t *caller_sp = sp + 160;
+    BackRegisters *out_reg = (BackRegisters *)(sp + 112);
+
     if (env.IsExceptionPending()) [[unlikely]]
         return;
 
@@ -747,15 +747,8 @@ void CallData::Relay(Size idx, uint8_t *own_sp, uint8_t *caller_sp, bool switch_
 
     const TypeInfo *type = proto->ret.type;
 
-    // Make the call
-    napi_value ret;
-    if (switch_stack) {
-        ret = CallSwitchStack(&func, (size_t)arguments.len, arguments.data, old_sp, &mem->stack,
-                              [](Napi::Function *func, size_t argc, napi_value *argv) { return (napi_value)func->Call(argv[0], argc - 1, argv + 1); });
-    } else {
-        ret = (napi_value)func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
-    }
-    Napi::Value value(env, ret);
+    // Make the call!
+    Napi::Value value = func.Call(arguments[0], arguments.len - 1, arguments.data + 1);
 
     if (env.IsExceptionPending()) [[unlikely]]
         return;

package/src/koffi/src/abi_x64_sysv_asm.S

@@ -146,7 +146,8 @@ SYMBOL(ForwardCallXDD):
 # ----------------------------
 
 .global SYMBOL(RelayCallback)
-.global SYMBOL(CallSwitchStack)
+.global SYMBOL(SwitchAndRelay)
+.global SYMBOL(RelayDirect)
 
 # First, make a copy of the GPR argument registers (rdi, rsi, rdx, rcx, r8, r9).
 # Then call the C function RelayCallback with the following arguments:
@@ -167,8 +168,6 @@ SYMBOL(ForwardCallXDD):
     movq %r9, 40(%rsp)
     movq $\id, %rdi
     movq %rsp, %rsi
-    leaq 160(%rsp), %rdx
-    leaq 112(%rsp), %rcx
 #if defined(__linux__)
     call *RelayCallback@GOTPCREL(%rip)
 #else
@@ -205,8 +204,6 @@ SYMBOL(ForwardCallXDD):
     movsd %xmm7, 104(%rsp)
     movq $\id, %rdi
     movq %rsp, %rsi
-    leaq 160(%rsp), %rdx
-    leaq 112(%rsp), %rcx
 #if defined(__linux__)
     call *RelayCallback@GOTPCREL(%rip)
 #else
@@ -227,7 +224,7 @@ SYMBOL(ForwardCallXDD):
 # probably misdetect this as a "stack overflow". We have to restore the old
 # stack pointer, call Node.js/V8 and go back to ours.
 # The first three parameters (rdi, rsi, rdx) are passed through untouched.
-SYMBOL(CallSwitchStack):
+SYMBOL(SwitchAndRelay):
     .cfi_startproc
     .cfi_def_cfa rsp, 8
     ENDBR64
@@ -240,7 +237,7 @@ SYMBOL(CallSwitchStack):
     movq %r10, 8(%r8)
     movq %rcx, %rsp
     .cfi_def_cfa rsp, 16
-    call *%r9
+    call SYMBOL(RelayDirect)
     mov %rbp, %rsp
     .cfi_def_cfa rsp, 16
     pop %rbp