Skip to content

gh-145481: Optimize frozendict lookup in free threading #145482

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
vstinner wants to merge 2 commits into
base: main
Choose a base branch
from
+12 −3
Open

gh-145481: Optimize frozendict lookup in free threading #145482

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6b7551
gh-145481: Optimize frozendict lookup in free threading
vstinner Mar 3, 2026
d8e9678
Update _Py_dict_lookup() assertion
vstinner Mar 3, 2026
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
15 changes: 12 additions & 3 deletions Objects/dictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,10 @@ _Py_dict_lookup(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **valu
DictKeysKind kind;
Py_ssize_t ix;

_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(mp);
if (!PyFrozenDict_CheckExact(mp)) {
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(mp);
}

start:
dk = mp->ma_keys;
kind = dk->dk_kind;
Expand Down Expand Up @@ -1518,13 +1521,19 @@ dictkeys_generic_lookup_threadsafe(PyDictObject *mp, PyDictKeysObject* dk, PyObj
Py_ssize_t
_Py_dict_lookup_threadsafe(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr)
{
ensure_shared_on_read(mp);

if (PyFrozenDict_CheckExact(mp)) {
Py_ssize_t ix = _Py_dict_lookup(mp, key, hash, value_addr);
Py_XNewRef(*value_addr);
return ix;
}

PyDictKeysObject *dk;
DictKeysKind kind;
Py_ssize_t ix;
PyObject *value;

ensure_shared_on_read(mp);

dk = _Py_atomic_load_ptr(&mp->ma_keys);
kind = dk->dk_kind;

Expand Down
Loading