Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-04-14 07:41:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-145866: Convert SET_UPDATE to leave its inputs on the stack to be cleaned up by _POP_TOP (GH-145979)

Browse source
This commit is contained in:
Sacul 2026-03-19 19:17:58 +08:00 • committed by GitHub
parent 982459132b
commit 0d37e423d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 1030 additions and 981 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Python/bytecodes.c
View file

@ -2181,13 +2181,18 @@ dummy_func(
PyStackRef_CLOSE(iterable_st);
}
inst(SET_UPDATE, (set, unused[oparg-1], iterable -- set, unused[oparg-1])) {
op(_SET_UPDATE, (set, unused[oparg-1], iterable -- set, unused[oparg-1], i)) {
int err = _PySet_Update(PyStackRef_AsPyObjectBorrow(set),
PyStackRef_AsPyObjectBorrow(iterable));
PyStackRef_CLOSE(iterable);
ERROR_IF(err < 0);
if (err < 0) {
ERROR_NO_POP();
}
i = iterable;
DEAD(iterable);
}
macro(SET_UPDATE) = _SET_UPDATE + POP_TOP;
inst(BUILD_SET, (values[oparg] -- set)) {
PyObject *set_o = PySet_New(NULL);
if (set_o == NULL) {

15
Python/executor_cases.c.h generated
View file

@ -8571,11 +8571,12 @@
break;
}
case _SET_UPDATE_r10: {
case _SET_UPDATE_r11: {
CHECK_CURRENT_CACHED_VALUES(1);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
_PyStackRef iterable;
_PyStackRef set;
_PyStackRef i;
_PyStackRef _stack_item_0 = _tos_cache0;
oparg = CURRENT_OPARG();
iterable = _stack_item_0;
@ -8587,19 +8588,17 @@
int err = _PySet_Update(PyStackRef_AsPyObjectBorrow(set),
PyStackRef_AsPyObjectBorrow(iterable));
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(iterable);
stack_pointer = _PyFrame_GetStackPointer(frame);
if (err < 0) {
SET_CURRENT_CACHED_VALUES(0);
JUMP_TO_ERROR();
}
_tos_cache0 = PyStackRef_ZERO_BITS;
i = iterable;
_tos_cache0 = i;
_tos_cache1 = PyStackRef_ZERO_BITS;
_tos_cache2 = PyStackRef_ZERO_BITS;
SET_CURRENT_CACHED_VALUES(0);
SET_CURRENT_CACHED_VALUES(1);
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
break;
}

34
Python/generated_cases.c.h generated
View file

@ -11001,19 +11001,29 @@
INSTRUCTION_STATS(SET_UPDATE);
_PyStackRef set;
_PyStackRef iterable;
iterable = stack_pointer[-1];
set = stack_pointer[-2 - (oparg-1)];
_PyFrame_SetStackPointer(frame, stack_pointer);
int err = _PySet_Update(PyStackRef_AsPyObjectBorrow(set),
_PyStackRef i;
_PyStackRef value;
// _SET_UPDATE
{
iterable = stack_pointer[-1];
set = stack_pointer[-2 - (oparg-1)];
_PyFrame_SetStackPointer(frame, stack_pointer);
int err = _PySet_Update(PyStackRef_AsPyObjectBorrow(set),
PyStackRef_AsPyObjectBorrow(iterable));
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(iterable);
stack_pointer = _PyFrame_GetStackPointer(frame);
if (err < 0) {
JUMP_TO_LABEL(error);
stack_pointer = _PyFrame_GetStackPointer(frame);
if (err < 0) {
JUMP_TO_LABEL(error);
}
i = iterable;
}
// _POP_TOP
{
value = i;
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_XCLOSE(value);
stack_pointer = _PyFrame_GetStackPointer(frame);
}
DISPATCH();
}

5
Python/optimizer_bytecodes.c
View file

@ -1326,6 +1326,11 @@ dummy_func(void) {
set = sym_new_type(ctx, &PySet_Type);
}
op(_SET_UPDATE, (set, unused[oparg-1], iterable -- set, unused[oparg-1], i)) {
(void)set;
i = iterable;
}
op(_UNPACK_SEQUENCE_TWO_TUPLE, (seq -- val1, val0)) {
val0 = sym_tuple_getitem(ctx, seq, 0);
val1 = sym_tuple_getitem(ctx, seq, 1);

11
Python/optimizer_cases.c.h generated
View file

@ -1823,9 +1823,14 @@
}
case _SET_UPDATE: {
CHECK_STACK_BOUNDS(-1);
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
JitOptRef iterable;
JitOptRef set;
JitOptRef i;
iterable = stack_pointer[-1];
set = stack_pointer[-2 - (oparg-1)];
(void)set;
i = iterable;
stack_pointer[-1] = i;
break;
}