Skip to content

gh-141510: Update specializer to support frozendict with BINARY_SUBSCR #144911

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

Closed
corona10 wants to merge 13 commits into from
Closed

gh-141510: Update specializer to support frozendict with BINARY_SUBSCR #144911

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a9e4c02
gh-141510: Update specialzier to support frozendict with BINARY_SUBSCR
corona10 Feb 17, 2026
9cb3cd7
Add NEWS.d
corona10 Feb 17, 2026
1549414
fix
corona10 Feb 17, 2026
d22f149
fix
corona10 Feb 17, 2026
b4a06fd
fix for free-threading
corona10 Feb 17, 2026
c29933d
fix symbol issue
corona10 Feb 17, 2026
9f1c969
Address code review
corona10 Feb 17, 2026
acfab36
Increase _Py_MAX_MANAGED_STATIC_BUILTIN_TYPES for frozendict
corona10 Feb 17, 2026
4c7b59a
Update Include/internal/pycore_dict.h
corona10 Feb 17, 2026
805fe2e
Rename to BINARY_OP_SUBSCR_FROZENDICT
corona10 Feb 17, 2026
a608252
Merge remote-tracking branch 'origin/gh-141510-specializer' into gh-1…
corona10 Feb 17, 2026
dd616b4
Address code review
corona10 Feb 17, 2026
8311052
Address code review
corona10 Feb 17, 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
Prev Previous commit
Next Next commit
fix for free-threading
  • Loading branch information
@corona10
corona10 committed Feb 17, 2026
commit b4a06fd34899027a24a853884ea008c0b73c3d7d
3 changes: 2 additions & 1 deletion Include/internal/pycore_dict.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ extern void _PyDictKeys_DecRef(PyDictKeysObject *keys);
* -1 when no entry found, -3 when compare raises error.
*/
extern Py_ssize_t _Py_dict_lookup(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr);
extern Py_ssize_t _Py_frozendict_lookup(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr);
extern Py_ssize_t _Py_dict_lookup_threadsafe(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr);
extern Py_ssize_t _Py_dict_lookup_threadsafe_stackref(PyDictObject *mp, PyObject *key, Py_hash_t hash, _PyStackRef *value_addr);

Expand Down Expand Up @@ -148,7 +149,7 @@ extern int _PyDict_GetItemRef_KnownHash(PyDictObject *op, PyObject *key, Py_hash
extern int _PyDict_GetItemRef_Unicode_LockHeld(PyDictObject *op, PyObject *key, PyObject **result);
PyAPI_FUNC(int) _PyObjectDict_SetItem(PyTypeObject *tp, PyObject *obj, PyObject **dictptr, PyObject *name, PyObject *value);

PyAPI_FUNC(int) _PyFrozenDict_GetItemRef(PyObject *op, PyObject *key, PyObject **result);
extern int _PyFrozenDict_GetItemRef(PyObject *op, PyObject *key, PyObject **result);

extern int _PyDict_Pop_KnownHash(
PyDictObject *dict,
Expand Down
22 changes: 17 additions & 5 deletions Objects/dictobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,14 +1249,13 @@ _Py_dict_lookup() is general-purpose, and may return DKIX_ERROR if (and only if)
comparison raises an exception.
When the key isn't found a DKIX_EMPTY is returned.
*/
Py_ssize_t
_Py_dict_lookup(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr)
static inline Py_ssize_t
dict_lookup_impl(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr)
{
PyDictKeysObject *dk;
DictKeysKind kind;
Py_ssize_t ix;

_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(mp);
start:
dk = mp->ma_keys;
kind = dk->dk_kind;
Expand Down Expand Up @@ -1315,6 +1314,19 @@ _Py_dict_lookup(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **valu
return ix;
}

Py_ssize_t
_Py_dict_lookup(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr)
{
_Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(mp);
return dict_lookup_impl(mp, key, hash, value_addr);
}

Py_ssize_t
_Py_frozendict_lookup(PyDictObject *mp, PyObject *key, Py_hash_t hash, PyObject **value_addr)
{
return dict_lookup_impl(mp, key, hash, value_addr);
}

#ifdef Py_GIL_DISABLED
static inline void
ensure_shared_on_read(PyDictObject *mp)
Expand Down Expand Up @@ -2492,11 +2504,11 @@ PyDict_GetItemRef(PyObject *op, PyObject *key, PyObject **result)
* Returns 1 if the key is present, 0 if the key is missing, and -1 if an
* exception occurred.
*/
int
static inline int
_PyFrozenDict_GetItemRef_KnownHash(PyDictObject *op, PyObject *key, Py_hash_t hash, PyObject **result)
{
PyObject *value;
Py_ssize_t ix = _Py_dict_lookup(op, key, hash, &value);
Py_ssize_t ix = _Py_frozendict_lookup(op, key, hash, &value);
assert(ix >= 0 || value == NULL);
if (ix == DKIX_ERROR) {
*result = NULL;
Expand Down
Loading