Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-05-09 12:00:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-149049: Fix jit binary op stack underflow (GH-149076)

Browse source
This commit is contained in:
Pieter Eendebak 2026-04-30 11:36:04 +02:00 • committed by GitHub
parent a94c7900be
commit 7fe51ceae8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Python/optimizer_bytecodes.c
View file

@ -293,6 +293,7 @@ dummy_func(void) {
|| oparg == NB_INPLACE_TRUE_DIVIDE);
bool is_remainder = (oparg == NB_REMAINDER
|| oparg == NB_INPLACE_REMAINDER);
int emit_op = _BINARY_OP;
// Promote probable-float operands to known floats via speculative
// guards. _RECORD_TOS_TYPE / _RECORD_NOS_TYPE in the BINARY_OP macro
// record the observed operand type during tracing, which
@ -318,17 +319,17 @@ dummy_func(void) {
}
if (is_truediv && lhs_float && rhs_float) {
if (PyJitRef_IsUnique(lhs)) {
ADD_OP(_BINARY_OP_TRUEDIV_FLOAT_INPLACE, 0, 0);
emit_op = _BINARY_OP_TRUEDIV_FLOAT_INPLACE;
l = sym_new_null(ctx);
r = rhs;
}
else if (PyJitRef_IsUnique(rhs)) {
ADD_OP(_BINARY_OP_TRUEDIV_FLOAT_INPLACE_RIGHT, 0, 0);
emit_op = _BINARY_OP_TRUEDIV_FLOAT_INPLACE_RIGHT;
l = lhs;
r = sym_new_null(ctx);
}
else {
ADD_OP(_BINARY_OP_TRUEDIV_FLOAT, 0, 0);
emit_op = _BINARY_OP_TRUEDIV_FLOAT;
l = lhs;
r = rhs;
}
@ -382,6 +383,7 @@ dummy_func(void) {
else {
res = PyJitRef_MakeUnique(sym_new_type(ctx, &PyFloat_Type));
}
ADD_OP(emit_op, oparg, 0);
}
op(_BINARY_OP_ADD_INT, (left, right -- res, l, r)) {

8
Python/optimizer_cases.c.h generated
View file

@ -5242,6 +5242,7 @@
|| oparg == NB_INPLACE_TRUE_DIVIDE);
bool is_remainder = (oparg == NB_REMAINDER
|| oparg == NB_INPLACE_REMAINDER);
int emit_op = _BINARY_OP;
if (is_truediv || is_remainder) {
if (!sym_has_type(rhs)
&& sym_get_probable_type(rhs) == &PyFloat_Type) {
@ -5258,17 +5259,17 @@
}
if (is_truediv && lhs_float && rhs_float) {
if (PyJitRef_IsUnique(lhs)) {
ADD_OP(_BINARY_OP_TRUEDIV_FLOAT_INPLACE, 0, 0);
emit_op = _BINARY_OP_TRUEDIV_FLOAT_INPLACE;
l = sym_new_null(ctx);
r = rhs;
}
else if (PyJitRef_IsUnique(rhs)) {
ADD_OP(_BINARY_OP_TRUEDIV_FLOAT_INPLACE_RIGHT, 0, 0);
emit_op = _BINARY_OP_TRUEDIV_FLOAT_INPLACE_RIGHT;
l = lhs;
r = sym_new_null(ctx);
}
else {
ADD_OP(_BINARY_OP_TRUEDIV_FLOAT, 0, 0);
emit_op = _BINARY_OP_TRUEDIV_FLOAT;
l = lhs;
r = rhs;
}
@ -5304,6 +5305,7 @@
else {
res = PyJitRef_MakeUnique(sym_new_type(ctx, &PyFloat_Type));
}
ADD_OP(emit_op, oparg, 0);
CHECK_STACK_BOUNDS(1);
stack_pointer[-2] = res;
stack_pointer[-1] = l;