diff options
| author | Mark Shannon <mark@hotpy.org> | 2024-10-24 11:57:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-24 11:57:02 +0100 |
| commit | b61fece8523d0fa6d9cc6ad3fd855a136c34f0cd (patch) | |
| tree | fca2bb236a57eb38d8e2b30052b9dc56fac8e96b /Python/executor_cases.c.h | |
| parent | c35b33bfb7c491dfbdd40195d70dcfc4618265db (diff) | |
| download | cpython-b61fece8523d0fa6d9cc6ad3fd855a136c34f0cd.tar.gz cpython-b61fece8523d0fa6d9cc6ad3fd855a136c34f0cd.zip | |
GH-125868: Fix STORE_ATTR_WITH_HINT specialization (GH-125876)
Diffstat (limited to 'Python/executor_cases.c.h')
| -rw-r--r-- | Python/executor_cases.c.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 5df4986cd83..3a7015ccb78 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -2815,7 +2815,6 @@ UOP_STAT_INC(uopcode, miss); JUMP_TO_JUMP_TARGET(); } - PyObject *old_value; if (!DK_IS_UNICODE(dict->ma_keys)) { UOP_STAT_INC(uopcode, miss); JUMP_TO_JUMP_TARGET(); @@ -2825,14 +2824,17 @@ UOP_STAT_INC(uopcode, miss); JUMP_TO_JUMP_TARGET(); } + PyObject *old_value = ep->me_value; + if (old_value == NULL) { + UOP_STAT_INC(uopcode, miss); + JUMP_TO_JUMP_TARGET(); + } /* 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, |