From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Sun, 14 Jul 2024 09:24:09 +0000 (+0200)
Subject: gh-121700 Emscripten trampolines not quite right since #106219 (GH-121701)
X-Git-Tag: v3.14.0a1~1142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3086b86cfda829e23a71569908edbfbcdc16327f;p=thirdparty%2FPython%2Fcpython.git

gh-121700 Emscripten trampolines not quite right since #106219 (GH-121701)
---

diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h
index fa789611133a..d385b20b0e96 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) \