Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-117826: Remove lookdict_index from delitemif_lock_held (gh-117869)

This commit is contained in:
Donghee Na 2024-04-15 14:26:59 +09:00 committed by GitHub
parent 74b0658e6a
commit 7bcc257e97
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Objects/dictobject.c
View File

@ -2603,7 +2603,7 @@ static int
delitemif_lock_held(PyObject *op, PyObject *key, delitemif_lock_held(PyObject *op, PyObject *key,
int (*predicate)(PyObject *value)) int (*predicate)(PyObject *value))
{ {
Py_ssize_t hashpos, ix; Py_ssize_t ix;
PyDictObject *mp; PyDictObject *mp;
Py_hash_t hash; Py_hash_t hash;
PyObject *old_value; PyObject *old_value;
@ -2632,14 +2632,11 @@ delitemif_lock_held(PyObject *op, PyObject *key,
if (res == -1) if (res == -1)
return -1; return -1;
hashpos = lookdict_index(mp->ma_keys, hash, ix);
assert(hashpos >= 0);
if (res > 0) { if (res > 0) {
PyInterpreterState *interp = _PyInterpreterState_GET(); PyInterpreterState *interp = _PyInterpreterState_GET();
uint64_t new_version = _PyDict_NotifyEvent( uint64_t new_version = _PyDict_NotifyEvent(
interp, PyDict_EVENT_DELETED, mp, key, NULL); interp, PyDict_EVENT_DELETED, mp, key, NULL);
return delitem_common(mp, hashpos, ix, old_value, new_version); return delitem_common(mp, hash, ix, old_value, new_version);
} else { } else {
return 0; return 0;
} }