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 CALL_INTRINSIC_1 to leave its inputs on the stack to be cleaned up by _POP_TOP. (GH-145964)

Browse source
This commit is contained in:
Sacul 2026-03-16 19:58:12 +08:00 • committed by GitHub
parent 36b5284f04
commit 37121ef77e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 1257 additions and 1215 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Python/bytecodes.c
View file

@ -1246,14 +1246,19 @@ dummy_func(
ERROR_IF(err);
}
inst(CALL_INTRINSIC_1, (value -- res)) {
op(_CALL_INTRINSIC_1, (value -- res, v)) {
assert(oparg <= MAX_INTRINSIC_1);
PyObject *res_o = _PyIntrinsics_UnaryFunctions[oparg].func(tstate, PyStackRef_AsPyObjectBorrow(value));
PyStackRef_CLOSE(value);
ERROR_IF(res_o == NULL);
if (res_o == NULL) {
ERROR_NO_POP();
}
v = value;
DEAD(value);
res = PyStackRef_FromPyObjectSteal(res_o);
}
macro(CALL_INTRINSIC_1) = _CALL_INTRINSIC_1 + POP_TOP;
inst(CALL_INTRINSIC_2, (value2_st, value1_st -- res)) {
assert(oparg <= MAX_INTRINSIC_2);
PyObject *value1 = PyStackRef_AsPyObjectBorrow(value1_st);

15
Python/executor_cases.c.h generated
View file

@ -6833,11 +6833,12 @@
break;
}
case _CALL_INTRINSIC_1_r11: {
case _CALL_INTRINSIC_1_r12: {
CHECK_CURRENT_CACHED_VALUES(1);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
_PyStackRef value;
_PyStackRef res;
_PyStackRef v;
_PyStackRef _stack_item_0 = _tos_cache0;
oparg = CURRENT_OPARG();
value = _stack_item_0;
@ -6848,20 +6849,18 @@
_PyFrame_SetStackPointer(frame, stack_pointer);
PyObject *res_o = _PyIntrinsics_UnaryFunctions[oparg].func(tstate, PyStackRef_AsPyObjectBorrow(value));
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(value);
stack_pointer = _PyFrame_GetStackPointer(frame);
if (res_o == NULL) {
SET_CURRENT_CACHED_VALUES(0);
JUMP_TO_ERROR();
}
v = value;
res = PyStackRef_FromPyObjectSteal(res_o);
_tos_cache1 = v;
_tos_cache0 = res;
_tos_cache1 = PyStackRef_ZERO_BITS;
_tos_cache2 = PyStackRef_ZERO_BITS;
SET_CURRENT_CACHED_VALUES(1);
SET_CURRENT_CACHED_VALUES(2);
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
break;
}

37
Python/generated_cases.c.h generated
View file

@ -2982,23 +2982,28 @@
INSTRUCTION_STATS(CALL_INTRINSIC_1);
_PyStackRef value;
_PyStackRef res;
value = stack_pointer[-1];
assert(oparg <= MAX_INTRINSIC_1);
_PyFrame_SetStackPointer(frame, stack_pointer);
PyObject *res_o = _PyIntrinsics_UnaryFunctions[oparg].func(tstate, PyStackRef_AsPyObjectBorrow(value));
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(value);
stack_pointer = _PyFrame_GetStackPointer(frame);
if (res_o == NULL) {
JUMP_TO_LABEL(error);
_PyStackRef v;
// _CALL_INTRINSIC_1
{
value = stack_pointer[-1];
assert(oparg <= MAX_INTRINSIC_1);
_PyFrame_SetStackPointer(frame, stack_pointer);
PyObject *res_o = _PyIntrinsics_UnaryFunctions[oparg].func(tstate, PyStackRef_AsPyObjectBorrow(value));
stack_pointer = _PyFrame_GetStackPointer(frame);
if (res_o == NULL) {
JUMP_TO_LABEL(error);
}
v = value;
res = PyStackRef_FromPyObjectSteal(res_o);
}
// _POP_TOP
{
value = v;
stack_pointer[-1] = res;
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_XCLOSE(value);
stack_pointer = _PyFrame_GetStackPointer(frame);
}
res = PyStackRef_FromPyObjectSteal(res_o);
stack_pointer[0] = res;
stack_pointer += 1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
DISPATCH();
}

5
Python/optimizer_bytecodes.c
View file

@ -1177,6 +1177,11 @@ dummy_func(void) {
}
}
op(_CALL_INTRINSIC_1, (value -- res, v)) {
res = sym_new_not_null(ctx);
v = value;
}
op(_GUARD_IS_TRUE_POP, (flag -- )) {
sym_apply_predicate_narrowing(ctx, flag, true);

8
Python/optimizer_cases.c.h generated
View file

@ -1293,9 +1293,17 @@
}
case _CALL_INTRINSIC_1: {
JitOptRef value;
JitOptRef res;
JitOptRef v;
value = stack_pointer[-1];
res = sym_new_not_null(ctx);
v = value;
CHECK_STACK_BOUNDS(1);
stack_pointer[-1] = res;
stack_pointer[0] = v;
stack_pointer += 1;
ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
break;
}