Skip to content

gh-139103: Use borrowed references for positional args in _PyStack_UnpackDict #144407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
colesbury merged 1 commit into from
Feb 3, 2026
Merged

gh-139103: Use borrowed references for positional args in _PyStack_UnpackDict #144407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
gh-139103: Use borrowed references for positional args in _PyStack_Un… 
…packDict

The positional arguments passed to _PyStack_UnpackDict are already
kept alive by the caller, so we can avoid the extra reference count
operations by using borrowed references instead of creating new ones.

This reduces reference count contention in the free-threaded build
when calling functions with keyword arguments. In particular, this
avoids contention on the type argument to `__new__` when instantiating
namedtuples with keyword arguments.
  • Loading branch information
@colesbury
colesbury committed Feb 2, 2026
commit 42d8d7ee671208ae0ef0ba9b1f33a477ee173ecf
15 changes: 10 additions & 5 deletions Objects/call.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,10 @@ _PyStack_AsDict(PyObject *const *values, PyObject *kwnames)

The newly allocated argument vector supports PY_VECTORCALL_ARGUMENTS_OFFSET.

The positional arguments are borrowed references from the input array
(which must be kept alive by the caller). The keyword argument values
are new references.

When done, you must call _PyStack_UnpackDict_Free(stack, nargs, kwnames) */
PyObject *const *
_PyStack_UnpackDict(PyThreadState *tstate,
Expand Down Expand Up @@ -970,9 +974,9 @@ _PyStack_UnpackDict(PyThreadState *tstate,

stack++; /* For PY_VECTORCALL_ARGUMENTS_OFFSET */

/* Copy positional arguments */
/* Copy positional arguments (borrowed references) */
for (Py_ssize_t i = 0; i < nargs; i++) {
stack[i] = Py_NewRef(args[i]);
stack[i] = args[i];
}

PyObject **kwstack = stack + nargs;
Expand Down Expand Up @@ -1009,9 +1013,10 @@ void
_PyStack_UnpackDict_Free(PyObject *const *stack, Py_ssize_t nargs,
PyObject *kwnames)
{
Py_ssize_t n = PyTuple_GET_SIZE(kwnames) + nargs;
for (Py_ssize_t i = 0; i < n; i++) {
Py_DECREF(stack[i]);
/* Only decref kwargs values, positional args are borrowed */
Py_ssize_t nkwargs = PyTuple_GET_SIZE(kwnames);
for (Py_ssize_t i = 0; i < nkwargs; i++) {
Py_DECREF(stack[nargs + i]);
}
_PyStack_UnpackDict_FreeNoDecRef(stack, kwnames);
}
Expand Down
11 changes: 8 additions & 3 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2000,11 +2000,16 @@ _PyEvalFramePushAndInit_Ex(PyThreadState *tstate, _PyStackRef func,
PyStackRef_CLOSE(func);
goto error;
}
size_t total_args = nargs + PyDict_GET_SIZE(kwargs);
size_t nkwargs = PyDict_GET_SIZE(kwargs);
assert(sizeof(PyObject *) == sizeof(_PyStackRef));
newargs = (_PyStackRef *)object_array;
for (size_t i = 0; i < total_args; i++) {
newargs[i] = PyStackRef_FromPyObjectSteal(object_array[i]);
/* Positional args are borrowed from callargs tuple, need new reference */
for (Py_ssize_t i = 0; i < nargs; i++) {
newargs[i] = PyStackRef_FromPyObjectNew(object_array[i]);
}
/* Keyword args are owned by _PyStack_UnpackDict, steal them */
for (size_t i = 0; i < nkwargs; i++) {
newargs[nargs + i] = PyStackRef_FromPyObjectSteal(object_array[nargs + i]);
}
}
else {
Expand Down
Loading