From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Wed, 16 Nov 2022 23:50:50 +0000 (-0800) Subject: gh-99443: `descr_set_trampoline_call` return type should be `int` not `PyObject*... X-Git-Tag: v3.11.1~83 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbac9a8bcc4d7c0692e8b4f62a955f7ca107b496;p=thirdparty%2FPython%2Fcpython.git gh-99443: `descr_set_trampoline_call` return type should be `int` not `PyObject*` (GH-99444) (cherry picked from commit bc390dd93574c3c6773958c6a7e68adc83d0bf3f) Co-authored-by: Hood Chatham --- diff --git a/Objects/descrobject.c b/Objects/descrobject.c index 73ac14d2a84b..6a5c2a4cf999 100644 --- a/Objects/descrobject.c +++ b/Objects/descrobject.c @@ -16,7 +16,7 @@ class property "propertyobject *" "&PyProperty_Type" // see pycore_object.h #if defined(__EMSCRIPTEN__) && defined(PY_CALL_TRAMPOLINE) #include -EM_JS(PyObject*, descr_set_trampoline_call, (setter set, PyObject *obj, PyObject *value, void *closure), { +EM_JS(int, descr_set_trampoline_call, (setter set, PyObject *obj, PyObject *value, void *closure), { return wasmTable.get(set)(obj, value, closure); });