diff options
author | Jeroen Demeyer <J.Demeyer@UGent.be> | 2019-07-05 12:48:24 (GMT) |
---|---|---|
committer | Petr Viktorin <encukou@gmail.com> | 2019-07-05 12:48:24 (GMT) |
commit | 0d722f3cd602e5f5492f9c65c8af57ea9d3743b6 (patch) | |
tree | e64e73f12cbad55824a13f3e7871051b9b34d98c /Objects/call.c | |
parent | 6e43d07324ca799118e805751a10a7eff71d5a04 (diff) | |
download | cpython-0d722f3cd602e5f5492f9c65c8af57ea9d3743b6.zip cpython-0d722f3cd602e5f5492f9c65c8af57ea9d3743b6.tar.gz cpython-0d722f3cd602e5f5492f9c65c8af57ea9d3743b6.tar.bz2 |
bpo-36974: separate vectorcall functions for each calling convention (GH-13781)
Diffstat (limited to 'Objects/call.c')
-rw-r--r-- | Objects/call.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/Objects/call.c b/Objects/call.c index 8e0d271..861ab87 100644 --- a/Objects/call.c +++ b/Objects/call.c @@ -216,7 +216,7 @@ PyVectorcall_Call(PyObject *callable, PyObject *tuple, PyObject *kwargs) PyObject *result = func(callable, args, nargs | PY_VECTORCALL_ARGUMENTS_OFFSET, kwnames); _PyStack_UnpackDict_Free(args, nargs, kwnames); - return result; + return _Py_CheckFunctionResult(callable, result, NULL); } @@ -625,26 +625,6 @@ exit: return result; } - -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) { |