From 5848390927f9d13c7c900f670ae9172de34969c0 Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Sun, 14 Jul 2024 11:24:09 +0200 Subject: [PATCH] gh-121700 Emscripten trampolines not quite right since #106219 (GH-121701) --- Include/internal/pycore_object.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h index fa789611133a6fe..d385b20b0e964d1 100644 --- a/Include/internal/pycore_object.h +++ b/Include/internal/pycore_object.h @@ -733,13 +733,7 @@ PyAPI_FUNC(PyObject*) _PyObject_GetState(PyObject *); * Third party code unintentionally rely on problematic fpcasts. The call * trampoline mitigates common occurrences of bad fpcasts on Emscripten. */ -#if defined(__EMSCRIPTEN__) && defined(PY_CALL_TRAMPOLINE) -#define _PyCFunction_TrampolineCall(meth, self, args) \ - _PyCFunctionWithKeywords_TrampolineCall( \ - (*(PyCFunctionWithKeywords)(void(*)(void))(meth)), (self), (args), NULL) -extern PyObject* _PyCFunctionWithKeywords_TrampolineCall( - PyCFunctionWithKeywords meth, PyObject *, PyObject *, PyObject *); -#else +#if !(defined(__EMSCRIPTEN__) && defined(PY_CALL_TRAMPOLINE)) #define _PyCFunction_TrampolineCall(meth, self, args) \ (meth)((self), (args)) #define _PyCFunctionWithKeywords_TrampolineCall(meth, self, args, kw) \