diff options
author | Mark Shannon <mark@hotpy.org> | 2024-10-24 10:57:02 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-10-24 10:57:02 (GMT) |
commit | b61fece8523d0fa6d9cc6ad3fd855a136c34f0cd (patch) | |
tree | fca2bb236a57eb38d8e2b30052b9dc56fac8e96b /Python/generated_cases.c.h | |
parent | c35b33bfb7c491dfbdd40195d70dcfc4618265db (diff) | |
download | cpython-b61fece8523d0fa6d9cc6ad3fd855a136c34f0cd.zip cpython-b61fece8523d0fa6d9cc6ad3fd855a136c34f0cd.tar.gz cpython-b61fece8523d0fa6d9cc6ad3fd855a136c34f0cd.tar.bz2 |
GH-125868: Fix STORE_ATTR_WITH_HINT specialization (GH-125876)
Diffstat (limited to 'Python/generated_cases.c.h')
-rw-r--r-- | Python/generated_cases.c.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index efbf2fb..f658ae5 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -7443,18 +7443,17 @@ assert(PyDict_CheckExact((PyObject *)dict)); PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); DEOPT_IF(hint >= (size_t)dict->ma_keys->dk_nentries, STORE_ATTR); - PyObject *old_value; DEOPT_IF(!DK_IS_UNICODE(dict->ma_keys), STORE_ATTR); PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) + hint; DEOPT_IF(ep->me_key != name, STORE_ATTR); + PyObject *old_value = ep->me_value; + DEOPT_IF(old_value == NULL, STORE_ATTR); /* Ensure dict is GC tracked if it needs to be */ if (!_PyObject_GC_IS_TRACKED(dict) && _PyObject_GC_MAY_BE_TRACKED(PyStackRef_AsPyObjectBorrow(value))) { _PyObject_GC_TRACK(dict); } - old_value = ep->me_value; - PyDict_WatchEvent event = old_value == NULL ? PyDict_EVENT_ADDED : PyDict_EVENT_MODIFIED; _PyFrame_SetStackPointer(frame, stack_pointer); - _PyDict_NotifyEvent(tstate->interp, event, dict, name, PyStackRef_AsPyObjectBorrow(value)); + _PyDict_NotifyEvent(tstate->interp, PyDict_EVENT_MODIFIED, dict, name, PyStackRef_AsPyObjectBorrow(value)); stack_pointer = _PyFrame_GetStackPointer(frame); ep->me_value = PyStackRef_AsPyObjectSteal(value); // old_value should be DECREFed after GC track checking is done, if not, it could raise a segmentation fault, |