summaryrefslogtreecommitdiffstats
path: root/Python
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 /Python
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 'Python')
-rw-r--r--Python/ceval.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index eddcc8d..546a426 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4943,7 +4943,7 @@ trace_call_function(PyThreadState *tstate,
{
PyObject *x;
if (PyCFunction_Check(func)) {
- C_TRACE(x, _PyCFunction_Vectorcall(func, args, nargs, kwnames));
+ C_TRACE(x, _PyObject_Vectorcall(func, args, nargs, kwnames));
return x;
}
else if (Py_TYPE(func) == &PyMethodDescr_Type && nargs > 0) {
@@ -4959,9 +4959,9 @@ trace_call_function(PyThreadState *tstate,
if (func == NULL) {
return NULL;
}
- C_TRACE(x, _PyCFunction_Vectorcall(func,
- args+1, nargs-1,
- kwnames));
+ C_TRACE(x, _PyObject_Vectorcall(func,
+ args+1, nargs-1,
+ kwnames));
Py_DECREF(func);
return x;
}
@@ -5023,10 +5023,10 @@ do_call_core(PyThreadState *tstate, PyObject *func, PyObject *callargs, PyObject
return NULL;
}
- C_TRACE(result, _PyCFunction_FastCallDict(func,
- &_PyTuple_ITEMS(callargs)[1],
- nargs - 1,
- kwdict));
+ C_TRACE(result, _PyObject_FastCallDict(func,
+ &_PyTuple_ITEMS(callargs)[1],
+ nargs - 1,
+ kwdict));
Py_DECREF(func);
return result;
}