bpo-37151: remove _PyCFunction_FastCallDict (GH-14269)

This commit is contained in:
Jeroen Demeyer 2019-06-20 17:38:46 +02:00 committed by Inada Naoki
parent 8713aa6dfb
commit 7e1a9aacff
4 changed files with 5 additions and 29 deletions

View File

@ -42,11 +42,6 @@ PyAPI_FUNC(int) PyCFunction_GetFlags(PyObject *);
PyAPI_FUNC(PyObject *) PyCFunction_Call(PyObject *, PyObject *, PyObject *);
#ifndef Py_LIMITED_API
PyAPI_FUNC(PyObject *) _PyCFunction_FastCallDict(PyObject *func,
PyObject *const *args,
Py_ssize_t nargs,
PyObject *kwargs);
PyAPI_FUNC(PyObject *) _PyCFunction_Vectorcall(PyObject *func,
PyObject *const *stack,
size_t nargsf,

View File

@ -495,24 +495,6 @@ exit:
}
PyObject *
_PyCFunction_FastCallDict(PyObject *func,
PyObject *const *args, Py_ssize_t nargs,
PyObject *kwargs)
{
PyObject *result;
assert(func != NULL);
assert(PyCFunction_Check(func));
result = _PyMethodDef_RawFastCallDict(((PyCFunctionObject*)func)->m_ml,
PyCFunction_GET_SELF(func),
args, nargs, kwargs);
result = _Py_CheckFunctionResult(func, result, NULL);
return result;
}
PyObject *
_PyMethodDef_RawFastCallKeywords(PyMethodDef *method, PyObject *self,
PyObject *const *args, Py_ssize_t nargs,

View File

@ -5018,10 +5018,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;
}

View File

@ -1563,8 +1563,7 @@ class Frame(object):
if not caller:
return False
if caller in ('_PyCFunction_FastCallDict',
'_PyCFunction_Vectorcall',
if caller in ('_PyCFunction_Vectorcall',
'cfunction_call_varargs'):
arg_name = 'func'
# Within that frame: