GH-103182: use vectorcall in `_asyncio` instead of variadic calling APIs (#103175)

This commit is contained in:
Kumar Aditya 2023-04-03 18:14:32 +05:30 committed by GitHub
parent 385b5d6e09
commit e6f7d35be7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 22 deletions

View File

@ -355,33 +355,26 @@ call_soon(asyncio_state *state, PyObject *loop, PyObject *func, PyObject *arg,
PyObject *ctx)
{
PyObject *handle;
PyObject *stack[3];
Py_ssize_t nargs;
if (ctx == NULL) {
handle = PyObject_CallMethodObjArgs(
loop, &_Py_ID(call_soon), func, arg, NULL);
PyObject *stack[] = {loop, func, arg};
size_t nargsf = 3 | PY_VECTORCALL_ARGUMENTS_OFFSET;
handle = PyObject_VectorcallMethod(&_Py_ID(call_soon), stack, nargsf, NULL);
}
else {
/* Use FASTCALL to pass a keyword-only argument to call_soon */
PyObject *callable = PyObject_GetAttr(loop, &_Py_ID(call_soon));
if (callable == NULL) {
return -1;
}
/* All refs in 'stack' are borrowed. */
nargs = 1;
stack[0] = func;
PyObject *stack[4];
size_t nargs = 2;
stack[0] = loop;
stack[1] = func;
if (arg != NULL) {
stack[1] = arg;
stack[2] = arg;
nargs++;
}
stack[nargs] = (PyObject *)ctx;
EVAL_CALL_STAT_INC_IF_FUNCTION(EVAL_CALL_API, callable);
handle = PyObject_Vectorcall(callable, stack, nargs,
state->context_kwname);
Py_DECREF(callable);
size_t nargsf = nargs | PY_VECTORCALL_ARGUMENTS_OFFSET;
handle = PyObject_VectorcallMethod(&_Py_ID(call_soon), stack, nargsf,
state->context_kwname);
}
if (handle == NULL) {
@ -2359,8 +2352,9 @@ _asyncio_Task_get_stack_impl(TaskObj *self, PyTypeObject *cls,
/*[clinic end generated code: output=6774dfc10d3857fa input=8e01c9b2618ae953]*/
{
asyncio_state *state = get_asyncio_state_by_cls(cls);
return PyObject_CallFunctionObjArgs(
state->asyncio_task_get_stack_func, self, limit, NULL);
PyObject *stack[] = {(PyObject *)self, limit};
return PyObject_Vectorcall(state->asyncio_task_get_stack_func,
stack, 2, NULL);
}
/*[clinic input]
@ -2387,8 +2381,9 @@ _asyncio_Task_print_stack_impl(TaskObj *self, PyTypeObject *cls,
/*[clinic end generated code: output=b38affe9289ec826 input=150b35ba2d3a7dee]*/
{
asyncio_state *state = get_asyncio_state_by_cls(cls);
return PyObject_CallFunctionObjArgs(
state->asyncio_task_print_stack_func, self, limit, file, NULL);
PyObject *stack[] = {(PyObject *)self, limit, file};
return PyObject_Vectorcall(state->asyncio_task_print_stack_func,
stack, 3, NULL);
}
/*[clinic input]