summaryrefslogtreecommitdiffstats
path: root/Objects/call.c
diff options
context:
space:
mode:
authorJeroen Demeyer <J.Demeyer@UGent.be>2019-07-23 10:39:51 (GMT)
committerƁukasz Langa <lukasz@langa.pl>2019-07-23 10:39:51 (GMT)
commitbf8e82f976b37856c7d35cdf88a238cb6f57fe65 (patch)
treeeef98efc9b9f0206ff2ee927e697434003405796 /Objects/call.c
parent5dab5e7d24c790d54b8d1eca0568e798bfda2c68 (diff)
downloadcpython-bf8e82f976b37856c7d35cdf88a238cb6f57fe65.zip
cpython-bf8e82f976b37856c7d35cdf88a238cb6f57fe65.tar.gz
cpython-bf8e82f976b37856c7d35cdf88a238cb6f57fe65.tar.bz2
[3.8] bpo-36974: separate vectorcall functions for each calling convention (GH-13781) (#14782)
Diffstat (limited to 'Objects/call.c')
-rw-r--r--Objects/call.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/Objects/call.c b/Objects/call.c
index 1f41f5c..c663898 100644
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -206,7 +206,7 @@ PyVectorcall_Call(PyObject *callable, PyObject *tuple, PyObject *kwargs)
Py_DECREF(kwnames);
}
- return result;
+ return _Py_CheckFunctionResult(callable, result, NULL);
}
@@ -723,25 +723,6 @@ exit:
}
-PyObject *
-_PyCFunction_Vectorcall(PyObject *func,
- PyObject *const *args, size_t nargsf,
- PyObject *kwnames)
-{
- PyObject *result;
-
- assert(func != NULL);
- assert(PyCFunction_Check(func));
- Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
-
- result = _PyMethodDef_RawFastCallKeywords(((PyCFunctionObject*)func)->m_ml,
- PyCFunction_GET_SELF(func),
- args, nargs, kwnames);
- result = _Py_CheckFunctionResult(func, result, NULL);
- return result;
-}
-
-
static PyObject *
cfunction_call_varargs(PyObject *func, PyObject *args, PyObject *kwargs)
{