bpo-37233: use _PY_FASTCALL_SMALL_STACK in method_vectorcall (GH-13974)

This commit is contained in:
Jeroen Demeyer 2019-06-18 10:56:53 +02:00 committed by Inada Naoki
parent c78fe320db
commit 988e6aa322
1 changed files with 13 additions and 5 deletions

View File

@ -64,10 +64,16 @@ method_vectorcall(PyObject *method, PyObject *const *args,
Py_ssize_t nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames);
PyObject **newargs;
Py_ssize_t totalargs = nargs + nkwargs;
newargs = PyMem_Malloc((totalargs+1) * sizeof(PyObject *));
if (newargs == NULL) {
PyErr_NoMemory();
return NULL;
PyObject *newargs_stack[_PY_FASTCALL_SMALL_STACK];
if (totalargs <= (Py_ssize_t)Py_ARRAY_LENGTH(newargs_stack) - 1) {
newargs = newargs_stack;
}
else {
newargs = PyMem_Malloc((totalargs+1) * sizeof(PyObject *));
if (newargs == NULL) {
PyErr_NoMemory();
return NULL;
}
}
/* use borrowed references */
newargs[0] = self;
@ -77,7 +83,9 @@ method_vectorcall(PyObject *method, PyObject *const *args,
memcpy(newargs + 1, args, totalargs * sizeof(PyObject *));
}
result = _PyObject_Vectorcall(func, newargs, nargs+1, kwnames);
PyMem_Free(newargs);
if (newargs != newargs_stack) {
PyMem_Free(newargs);
}
}
return result;
}