Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

gh-132657: Add maybe_enable_deferred_ref_count().#142843

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.

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

Already on GitHub?Sign in to your account

Draft
nascheme wants to merge4 commits intopython:main
base:main
Choose a base branch
Loading
fromnascheme:specialize-enable-deferred
Draft
Show file tree
Hide file tree
Changes from1 commit
Commits
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
PrevPrevious commit
NextNext commit
Enable deferred counting for more types.
Also, avoid PyDict_GetItemRef() call by returning the value when theindex is looked up (as previously discarded).
  • Loading branch information
@nascheme
nascheme committedDec 18, 2025
commit03977d9f258f3513307b7e620ead0fe805cf1ea6
1 change: 1 addition & 0 deletionsInclude/internal/pycore_dict.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,7 @@ extern Py_ssize_t _Py_dict_lookup_threadsafe_stackref(PyDictObject *mp, PyObject

extern int _PyDict_GetMethodStackRef(PyDictObject *dict, PyObject *name, _PyStackRef *method);

extern Py_ssize_t _PyDict_LookupIndexAndValue(PyDictObject *, PyObject *, PyObject **);
extern Py_ssize_t _PyDict_LookupIndex(PyDictObject *, PyObject *);
extern Py_ssize_t _PyDictKeys_StringLookup(PyDictKeysObject* dictkeys, PyObject *key);

Expand Down
12 changes: 9 additions & 3 deletionsObjects/dictobject.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2346,10 +2346,9 @@ dict_unhashable_type(PyObject *key)
}

Py_ssize_t
_PyDict_LookupIndex(PyDictObject *mp, PyObject *key)
_PyDict_LookupIndexAndValue(PyDictObject *mp, PyObject *key, PyObject **value)
{
// TODO: Thread safety
PyObject *value;
assert(PyDict_CheckExact((PyObject*)mp));
assert(PyUnicode_CheckExact(key));

Expand All@@ -2359,7 +2358,14 @@ _PyDict_LookupIndex(PyDictObject *mp, PyObject *key)
return -1;
}

return _Py_dict_lookup(mp, key, hash, &value);
return _Py_dict_lookup(mp, key, hash, value);
}

Py_ssize_t
_PyDict_LookupIndex(PyDictObject *mp, PyObject *key)
{
PyObject *value; // discarded
return _PyDict_LookupIndexAndValue(mp, key, &value);
}

/* Same as PyDict_GetItemWithError() but with hash supplied by caller.
Expand Down
27 changes: 11 additions & 16 deletionsPython/specialize.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -357,22 +357,11 @@ static uint32_t function_get_version(PyObject *o, int opcode);

#ifdef Py_GIL_DISABLED
static void
maybe_enable_deferred_ref_count(PyObject *dict, PyObject *name)
maybe_enable_deferred_ref_count(PyObject *op)
{
PyObject *op;
if (PyDict_GetItemRef(dict, name, &op) != 1) {
return;
}
if (_Py_IsOwnedByCurrentThread(op) ||
!PyType_IS_GC(Py_TYPE(op)) ||
_PyObject_HasDeferredRefcount(op)) {
Py_DECREF(op);
return;
}
if (PyFrozenSet_Check(op) || PyTuple_Check(op) || PyType_Check(op)) {
if (!_Py_IsOwnedByCurrentThread(op)) {
PyUnstable_Object_EnableDeferredRefcount(op);
}
Py_DECREF(op);
}
#endif

Expand All@@ -391,7 +380,8 @@ specialize_module_load_attr_lock_held(PyDictObject *dict, _Py_CODEUNIT *instr, P
SPECIALIZATION_FAIL(LOAD_ATTR, SPEC_FAIL_ATTR_MODULE_ATTR_NOT_FOUND);
return -1;
}
index = _PyDict_LookupIndex(dict, name);
PyObject *value;
index = _PyDict_LookupIndexAndValue(dict, name, &value);
assert (index != DKIX_ERROR);
if (index != (uint16_t)index) {
SPECIALIZATION_FAIL(LOAD_ATTR,
Expand All@@ -407,7 +397,7 @@ specialize_module_load_attr_lock_held(PyDictObject *dict, _Py_CODEUNIT *instr, P
return -1;
}
#ifdef Py_GIL_DISABLED
maybe_enable_deferred_ref_count((PyObject *)dict, name);
maybe_enable_deferred_ref_count(value);
#endif
write_u32(cache->version, keys_version);
cache->index = (uint16_t)index;
Expand DownExpand Up@@ -1308,7 +1298,12 @@ specialize_load_global_lock_held(
SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_LOAD_GLOBAL_NON_STRING_OR_SPLIT);
goto fail;
}
#ifdef Py_GIL_DISABLED
PyObject *value;
Py_ssize_t index = _PyDict_LookupIndexAndValue((PyDictObject *)globals, name, &value);
#else
Py_ssize_t index = _PyDictKeys_StringLookup(globals_keys, name);
#endif
if (index == DKIX_ERROR) {
SPECIALIZATION_FAIL(LOAD_GLOBAL, SPEC_FAIL_EXPECTED_ERROR);
goto fail;
Expand All@@ -1330,7 +1325,7 @@ specialize_load_global_lock_held(
goto fail;
}
#ifdef Py_GIL_DISABLED
maybe_enable_deferred_ref_count(globals, name);
maybe_enable_deferred_ref_count(value);
#endif
cache->index = (uint16_t)index;
cache->module_keys_version = (uint16_t)keys_version;
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp