https://github.com/python/cpython/commit/674a50ef2f8909c1c5d812e166bcc12ae6377908
commit: 674a50ef2f8909c1c5d812e166bcc12ae6377908
branch: main
author: Sam Gross <[email protected]>
committer: kumaraditya303 <[email protected]>
date: 2024-08-07T19:06:19+05:30
summary:
gh-117139: Fix an incorrect borrow in bytecodes.c (#122318)
`_PyDict_SetItem_Take2` steals both the key (i.e., `sub`) and the value.
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 9a1af0e920188b..e4c97dee1f80ea 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -862,13 +862,14 @@ dummy_func(
PyStackRef_CLOSE(list_st);
}
- inst(STORE_SUBSCR_DICT, (unused/1, value, dict_st, sub_st -- )) {
- PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
+ inst(STORE_SUBSCR_DICT, (unused/1, value, dict_st, sub -- )) {
PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st);
DEOPT_IF(!PyDict_CheckExact(dict));
STAT_INC(STORE_SUBSCR, hit);
- int err = _PyDict_SetItem_Take2((PyDictObject *)dict, sub,
PyStackRef_AsPyObjectSteal(value));
+ int err = _PyDict_SetItem_Take2((PyDictObject *)dict,
+ PyStackRef_AsPyObjectSteal(sub),
+ PyStackRef_AsPyObjectSteal(value));
PyStackRef_CLOSE(dict_st);
ERROR_IF(err, error);
}
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index afc7786c9e434d..4def11c515fd3c 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -1105,20 +1105,21 @@
}
case _STORE_SUBSCR_DICT: {
- _PyStackRef sub_st;
+ _PyStackRef sub;
_PyStackRef dict_st;
_PyStackRef value;
- sub_st = stack_pointer[-1];
+ sub = stack_pointer[-1];
dict_st = stack_pointer[-2];
value = stack_pointer[-3];
- PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st);
if (!PyDict_CheckExact(dict)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
STAT_INC(STORE_SUBSCR, hit);
- int err = _PyDict_SetItem_Take2((PyDictObject *)dict, sub,
PyStackRef_AsPyObjectSteal(value));
+ int err = _PyDict_SetItem_Take2((PyDictObject *)dict,
+ PyStackRef_AsPyObjectSteal(sub),
+ PyStackRef_AsPyObjectSteal(value));
PyStackRef_CLOSE(dict_st);
if (err) JUMP_TO_ERROR();
stack_pointer += -3;
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index f670353cdbde56..e560372a5f983e 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -6625,16 +6625,17 @@
static_assert(INLINE_CACHE_ENTRIES_STORE_SUBSCR == 1, "incorrect
cache size");
_PyStackRef value;
_PyStackRef dict_st;
- _PyStackRef sub_st;
+ _PyStackRef sub;
/* Skip 1 cache entry */
- sub_st = stack_pointer[-1];
+ sub = stack_pointer[-1];
dict_st = stack_pointer[-2];
value = stack_pointer[-3];
- PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st);
DEOPT_IF(!PyDict_CheckExact(dict), STORE_SUBSCR);
STAT_INC(STORE_SUBSCR, hit);
- int err = _PyDict_SetItem_Take2((PyDictObject *)dict, sub,
PyStackRef_AsPyObjectSteal(value));
+ int err = _PyDict_SetItem_Take2((PyDictObject *)dict,
+ PyStackRef_AsPyObjectSteal(sub),
+ PyStackRef_AsPyObjectSteal(value));
PyStackRef_CLOSE(dict_st);
if (err) goto pop_3_error;
stack_pointer += -3;
_______________________________________________
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]
