Skip to content

gh-158525: Avoid reacquiring dict lock when copying #158535

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

Open
n1snt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

gh-158525: Avoid reacquiring dict lock when copying #158535

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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2026-10-01-00-00-00.gh-issue-158525.Xw3K9a.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Avoid reacquiring the source dictionary lock when copying a sparse dictionary
in the free-threaded build.
9 changes: 8 additions & 1 deletion Objects/dictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4575,7 +4575,14 @@ copy_lock_held_untracked(PyObject *o, int as_frozendict)
}
if (copy == NULL)
return NULL;
if (dict_merge(copy, o, 1, NULL) < 0) {
int res;
if (!PyFrozenDict_Check(o) && Py_TYPE(mp)->tp_iter == dict_iter) {
res = dict_dict_merge((PyDictObject *)copy, mp, 1, NULL);
}
else {
res = dict_merge(copy, o, 1, NULL);
}
if (res < 0) {
Py_DECREF(copy);
return NULL;
}
Expand Down
Loading