https://github.com/python/cpython/commit/5bd72912a1a85be96092de302608a4298741c6cd
commit: 5bd72912a1a85be96092de302608a4298741c6cd
branch: main
author: Mark Shannon <[email protected]>
committer: markshannon <[email protected]>
date: 2024-08-05T16:27:48+01:00
summary:
GH-122616: Simplify LOAD_ATTR_WITH_HINT and STORE_ATTR_WITH_HINT (GH-122620)
files:
M Python/bytecodes.c
M Python/executor_cases.c.h
M Python/generated_cases.c.h
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 48b74f93b92ce8..996f997d0ca8de 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -2053,16 +2053,10 @@ dummy_func(
PyDictObject *dict = _PyObject_GetManagedDict(owner_o);
DEOPT_IF(hint >= (size_t)dict->ma_keys->dk_nentries);
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg>>1);
- if (DK_IS_UNICODE(dict->ma_keys)) {
- PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) +
hint;
- DEOPT_IF(ep->me_key != name);
- attr_o = ep->me_value;
- }
- else {
- PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + hint;
- DEOPT_IF(ep->me_key != name);
- attr_o = ep->me_value;
- }
+ DEOPT_IF(!DK_IS_UNICODE(dict->ma_keys));
+ PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) + hint;
+ DEOPT_IF(ep->me_key != name);
+ attr_o = ep->me_value;
DEOPT_IF(attr_o == NULL);
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(attr_o);
@@ -2214,23 +2208,14 @@ dummy_func(
DEOPT_IF(hint >= (size_t)dict->ma_keys->dk_nentries);
PyObject *old_value;
uint64_t new_version;
- if (DK_IS_UNICODE(dict->ma_keys)) {
- PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) +
hint;
- DEOPT_IF(ep->me_key != name);
- old_value = ep->me_value;
- DEOPT_IF(old_value == NULL);
- new_version = _PyDict_NotifyEvent(tstate->interp,
PyDict_EVENT_MODIFIED, dict, name, PyStackRef_AsPyObjectBorrow(value));
- ep->me_value = PyStackRef_AsPyObjectSteal(value);
- }
- else {
- PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + hint;
- DEOPT_IF(ep->me_key != name);
- old_value = ep->me_value;
- DEOPT_IF(old_value == NULL);
- new_version = _PyDict_NotifyEvent(tstate->interp,
PyDict_EVENT_MODIFIED, dict, name, PyStackRef_AsPyObjectBorrow(value));
- ep->me_value = PyStackRef_AsPyObjectSteal(value);
- }
- Py_DECREF(old_value);
+ DEOPT_IF(!DK_IS_UNICODE(dict->ma_keys));
+ PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) + hint;
+ DEOPT_IF(ep->me_key != name);
+ old_value = ep->me_value;
+ PyDict_WatchEvent event = old_value == NULL ? PyDict_EVENT_ADDED :
PyDict_EVENT_MODIFIED;
+ new_version = _PyDict_NotifyEvent(tstate->interp, event, dict,
name, PyStackRef_AsPyObjectBorrow(value));
+ ep->me_value = PyStackRef_AsPyObjectSteal(value);
+ Py_XDECREF(old_value);
STAT_INC(STORE_ATTR, hit);
/* Ensure dict is GC tracked if it needs to be */
if (!_PyObject_GC_IS_TRACKED(dict) &&
_PyObject_GC_MAY_BE_TRACKED(PyStackRef_AsPyObjectBorrow(value))) {
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 7f89196192504b..cbee77d5cf67fc 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -2367,22 +2367,16 @@
JUMP_TO_JUMP_TARGET();
}
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg>>1);
- if (DK_IS_UNICODE(dict->ma_keys)) {
- PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) +
hint;
- if (ep->me_key != name) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
- attr_o = ep->me_value;
+ if (!DK_IS_UNICODE(dict->ma_keys)) {
+ UOP_STAT_INC(uopcode, miss);
+ JUMP_TO_JUMP_TARGET();
}
- else {
- PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + hint;
- if (ep->me_key != name) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
- attr_o = ep->me_value;
+ PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) + hint;
+ if (ep->me_key != name) {
+ UOP_STAT_INC(uopcode, miss);
+ JUMP_TO_JUMP_TARGET();
}
+ attr_o = ep->me_value;
if (attr_o == NULL) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
@@ -2601,35 +2595,20 @@
}
PyObject *old_value;
uint64_t new_version;
- if (DK_IS_UNICODE(dict->ma_keys)) {
- PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) +
hint;
- if (ep->me_key != name) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
- old_value = ep->me_value;
- if (old_value == NULL) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
- new_version = _PyDict_NotifyEvent(tstate->interp,
PyDict_EVENT_MODIFIED, dict, name, PyStackRef_AsPyObjectBorrow(value));
- ep->me_value = PyStackRef_AsPyObjectSteal(value);
+ if (!DK_IS_UNICODE(dict->ma_keys)) {
+ UOP_STAT_INC(uopcode, miss);
+ JUMP_TO_JUMP_TARGET();
}
- else {
- PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + hint;
- if (ep->me_key != name) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
- old_value = ep->me_value;
- if (old_value == NULL) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
- new_version = _PyDict_NotifyEvent(tstate->interp,
PyDict_EVENT_MODIFIED, dict, name, PyStackRef_AsPyObjectBorrow(value));
- ep->me_value = PyStackRef_AsPyObjectSteal(value);
+ PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) + hint;
+ if (ep->me_key != name) {
+ UOP_STAT_INC(uopcode, miss);
+ JUMP_TO_JUMP_TARGET();
}
- Py_DECREF(old_value);
+ old_value = ep->me_value;
+ PyDict_WatchEvent event = old_value == NULL ? PyDict_EVENT_ADDED :
PyDict_EVENT_MODIFIED;
+ new_version = _PyDict_NotifyEvent(tstate->interp, event, dict,
name, PyStackRef_AsPyObjectBorrow(value));
+ ep->me_value = PyStackRef_AsPyObjectSteal(value);
+ Py_XDECREF(old_value);
STAT_INC(STORE_ATTR, hit);
/* Ensure dict is GC tracked if it needs to be */
if (!_PyObject_GC_IS_TRACKED(dict) &&
_PyObject_GC_MAY_BE_TRACKED(PyStackRef_AsPyObjectBorrow(value))) {
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index bed194e34d5376..879c40ab0cb6ba 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -4907,16 +4907,10 @@
PyDictObject *dict = _PyObject_GetManagedDict(owner_o);
DEOPT_IF(hint >= (size_t)dict->ma_keys->dk_nentries,
LOAD_ATTR);
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg>>1);
- if (DK_IS_UNICODE(dict->ma_keys)) {
- PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys)
+ hint;
- DEOPT_IF(ep->me_key != name, LOAD_ATTR);
- attr_o = ep->me_value;
- }
- else {
- PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + hint;
- DEOPT_IF(ep->me_key != name, LOAD_ATTR);
- attr_o = ep->me_value;
- }
+ DEOPT_IF(!DK_IS_UNICODE(dict->ma_keys), LOAD_ATTR);
+ PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys) +
hint;
+ DEOPT_IF(ep->me_key != name, LOAD_ATTR);
+ attr_o = ep->me_value;
DEOPT_IF(attr_o == NULL, LOAD_ATTR);
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(attr_o);
@@ -6411,23 +6405,14 @@
DEOPT_IF(hint >= (size_t)dict->ma_keys->dk_nentries,
STORE_ATTR);
PyObject *old_value;
uint64_t new_version;
- if (DK_IS_UNICODE(dict->ma_keys)) {
- PyDictUnicodeEntry *ep = DK_UNICODE_ENTRIES(dict->ma_keys)
+ hint;
- DEOPT_IF(ep->me_key != name, STORE_ATTR);
- old_value = ep->me_value;
- DEOPT_IF(old_value == NULL, STORE_ATTR);
- new_version = _PyDict_NotifyEvent(tstate->interp,
PyDict_EVENT_MODIFIED, dict, name, PyStackRef_AsPyObjectBorrow(value));
- ep->me_value = PyStackRef_AsPyObjectSteal(value);
- }
- else {
- PyDictKeyEntry *ep = DK_ENTRIES(dict->ma_keys) + hint;
- DEOPT_IF(ep->me_key != name, STORE_ATTR);
- old_value = ep->me_value;
- DEOPT_IF(old_value == NULL, STORE_ATTR);
- new_version = _PyDict_NotifyEvent(tstate->interp,
PyDict_EVENT_MODIFIED, dict, name, PyStackRef_AsPyObjectBorrow(value));
- ep->me_value = PyStackRef_AsPyObjectSteal(value);
- }
- Py_DECREF(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);
+ old_value = ep->me_value;
+ PyDict_WatchEvent event = old_value == NULL ?
PyDict_EVENT_ADDED : PyDict_EVENT_MODIFIED;
+ new_version = _PyDict_NotifyEvent(tstate->interp, event, dict,
name, PyStackRef_AsPyObjectBorrow(value));
+ ep->me_value = PyStackRef_AsPyObjectSteal(value);
+ Py_XDECREF(old_value);
STAT_INC(STORE_ATTR, hit);
/* Ensure dict is GC tracked if it needs to be */
if (!_PyObject_GC_IS_TRACKED(dict) &&
_PyObject_GC_MAY_BE_TRACKED(PyStackRef_AsPyObjectBorrow(value))) {
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
