Fix

Author: hoodmane

Include/internal/pycore_runtime_structs.h

@@ -276,9 +276,13 @@ struct pyruntimestate {
     struct _Py_time_runtime_state time;
 
 #if defined(__EMSCRIPTEN__) && defined(PY_CALL_TRAMPOLINE)
-    // Used in "Python/emscripten_trampoline.c" to choose between type
-    // reflection trampoline and EM_JS trampoline.
-    int (*emscripten_trampoline)(PyCFunctionWithKeywords func);
+    // Used in "Python/emscripten_trampoline.c" to choose between wasm-gc
+    // trampoline and JavaScript trampoline.
+    PyObject* (*emscripten_trampoline)(int* success,
+                                       PyCFunctionWithKeywords func,
+                                       PyObject* self,
+                                       PyObject* args,
+                                       PyObject* kw);
 #endif
 
     /* All the objects that are shared by the runtime's interpreters. */

Python/emscripten_trampoline.c

@@ -2,6 +2,7 @@
 
 #include <emscripten.h>             // EM_JS, EM_JS_DEPS
 #include <Python.h>
+#include "pycore_runtime.h"         // _PyRuntime
 
 // We use the _PyRuntime.emscripten_trampoline field to store a function pointer
 // for a wasm-gc based trampoline if it works. Otherwise fall back to JS
@@ -41,7 +42,7 @@
 EMSCRIPTEN_KEEPALIVE const int _PyEM_EMSCRIPTEN_TRAMPOLINE_OFFSET = offsetof(_PyRuntimeState, emscripten_trampoline);
 
 typedef PyObject* (*TrampolineFunc)(int* success,
-                                    void* func,
+                                    PyCFunctionWithKeywords func,
                                     PyObject* self,
                                     PyObject* args,
                                     PyObject* kw);
@@ -103,6 +104,7 @@ _PyEM_TrampolineCall(PyCFunctionWithKeywords func,
     if (trampoline == 0) {
         return _PyEM_TrampolineCall_JS(func, self, args, kw);
     }
+    int success = 1;
     PyObject *result = trampoline(&success, func, self, args, kw);
     if (!success) {
         PyErr_SetString(PyExc_SystemError, "Handler takes too many arguments");