https://github.com/python/cpython/commit/cd98657f0a8767e44c1db40dadedb5e278f7bdac
commit: cd98657f0a8767e44c1db40dadedb5e278f7bdac
branch: main
author: Wonseok Oh <[email protected]>
committer: Fidget-Spinner <[email protected]>
date: 2026-08-13T12:29:18+01:00
summary:
gh-155486: Allow non-compact integers in `TO_BOOL_INT` (GH-155531)
files:
M Include/internal/pycore_opcode_metadata.h
M Include/internal/pycore_uop_ids.h
M Include/internal/pycore_uop_metadata.h
M Lib/test/test_capi/test_opt.py
M Modules/_testinternalcapi/test_cases.c.h
M Python/bytecodes.c
M Python/executor_cases.c.h
M Python/generated_cases.c.h
M Python/optimizer_bytecodes.c
M Python/optimizer_cases.c.h
diff --git a/Include/internal/pycore_opcode_metadata.h
b/Include/internal/pycore_opcode_metadata.h
index 457e5c5bf20d2b9..38bccdd48c0f862 100644
--- a/Include/internal/pycore_opcode_metadata.h
+++ b/Include/internal/pycore_opcode_metadata.h
@@ -1531,7 +1531,7 @@ _PyOpcode_macro_expansion[256] = {
[TO_BOOL] = { .nuops = 1, .uops = { { _TO_BOOL, OPARG_SIMPLE, 2 } } },
[TO_BOOL_ALWAYS_TRUE] = { .nuops = 4, .uops = { { _RECORD_TOS_TYPE,
OPARG_SIMPLE, 1 }, { _GUARD_TYPE_VERSION, 2, 1 }, { _REPLACE_WITH_TRUE,
OPARG_SIMPLE, 3 }, { _POP_TOP, OPARG_SIMPLE, 3 } } },
[TO_BOOL_BOOL] = { .nuops = 1, .uops = { { _TO_BOOL_BOOL, OPARG_SIMPLE, 3
} } },
- [TO_BOOL_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0
}, { _TO_BOOL_INT, OPARG_SIMPLE, 3 }, { _POP_TOP_INT, OPARG_SIMPLE, 3 } } },
+ [TO_BOOL_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_EXACT_INT,
OPARG_SIMPLE, 0 }, { _TO_BOOL_INT, OPARG_SIMPLE, 3 }, { _POP_TOP_INT,
OPARG_SIMPLE, 3 } } },
[TO_BOOL_LIST] = { .nuops = 3, .uops = { { _GUARD_TOS_LIST, OPARG_SIMPLE,
0 }, { _TO_BOOL_LIST, OPARG_SIMPLE, 3 }, { _POP_TOP, OPARG_SIMPLE, 3 } } },
[TO_BOOL_NONE] = { .nuops = 1, .uops = { { _TO_BOOL_NONE, OPARG_SIMPLE, 3
} } },
[TO_BOOL_STR] = { .nuops = 3, .uops = { { _GUARD_TOS_UNICODE,
OPARG_SIMPLE, 0 }, { _TO_BOOL_STR, OPARG_SIMPLE, 3 }, { _POP_TOP_UNICODE,
OPARG_SIMPLE, 3 } } },
diff --git a/Include/internal/pycore_uop_ids.h
b/Include/internal/pycore_uop_ids.h
index 97f934727a85a36..625c33a6640b853 100644
--- a/Include/internal/pycore_uop_ids.h
+++ b/Include/internal/pycore_uop_ids.h
@@ -193,6 +193,7 @@ enum {
_GUARD_TOS_ANY_DICT,
_GUARD_TOS_ANY_SET,
_GUARD_TOS_DICT,
+ _GUARD_TOS_EXACT_INT,
_GUARD_TOS_FLOAT,
_GUARD_TOS_FROZENDICT,
_GUARD_TOS_FROZENSET,
@@ -364,7 +365,7 @@ enum {
_UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE,
_YIELD_VALUE,
};
-#define MAX_UOP_ID 652
+#define MAX_UOP_ID 653
#define _BUILD_INTERPOLATION BUILD_INTERPOLATION
#define _BUILD_LIST BUILD_LIST
@@ -926,6 +927,10 @@ enum {
_GUARD_TOS_DICT_r11,
_GUARD_TOS_DICT_r22,
_GUARD_TOS_DICT_r33,
+ _GUARD_TOS_EXACT_INT_r01,
+ _GUARD_TOS_EXACT_INT_r11,
+ _GUARD_TOS_EXACT_INT_r22,
+ _GUARD_TOS_EXACT_INT_r33,
_GUARD_TOS_FLOAT_r01,
_GUARD_TOS_FLOAT_r11,
_GUARD_TOS_FLOAT_r22,
@@ -1434,7 +1439,7 @@ enum {
_WITH_EXCEPT_START_r33,
_YIELD_VALUE_r11,
};
-#define MAX_UOP_REGS_ID 1645
+#define MAX_UOP_REGS_ID 1650
#ifdef __cplusplus
}
diff --git a/Include/internal/pycore_uop_metadata.h
b/Include/internal/pycore_uop_metadata.h
index 02e755330d6c209..f464effe23bc0b3 100644
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -103,6 +103,7 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_UNARY_INVERT] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG |
HAS_ESCAPES_FLAG,
[_GUARD_NOS_INT] = HAS_EXIT_FLAG,
[_GUARD_TOS_INT] = HAS_EXIT_FLAG,
+ [_GUARD_TOS_EXACT_INT] = HAS_EXIT_FLAG,
[_GUARD_NOS_OVERFLOWED] = HAS_EXIT_FLAG,
[_GUARD_TOS_OVERFLOWED] = HAS_EXIT_FLAG,
[_BINARY_OP_MULTIPLY_INT] = HAS_EXIT_FLAG | HAS_PURE_FLAG,
@@ -1056,6 +1057,15 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = {
{ 3, 3, _GUARD_TOS_INT_r33 },
},
},
+ [_GUARD_TOS_EXACT_INT] = {
+ .best = { 0, 1, 2, 3 },
+ .entries = {
+ { 1, 0, _GUARD_TOS_EXACT_INT_r01 },
+ { 1, 1, _GUARD_TOS_EXACT_INT_r11 },
+ { 2, 2, _GUARD_TOS_EXACT_INT_r22 },
+ { 3, 3, _GUARD_TOS_EXACT_INT_r33 },
+ },
+ },
[_GUARD_NOS_OVERFLOWED] = {
.best = { 0, 1, 2, 3 },
.entries = {
@@ -4095,6 +4105,10 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = {
[_GUARD_TOS_INT_r11] = _GUARD_TOS_INT,
[_GUARD_TOS_INT_r22] = _GUARD_TOS_INT,
[_GUARD_TOS_INT_r33] = _GUARD_TOS_INT,
+ [_GUARD_TOS_EXACT_INT_r01] = _GUARD_TOS_EXACT_INT,
+ [_GUARD_TOS_EXACT_INT_r11] = _GUARD_TOS_EXACT_INT,
+ [_GUARD_TOS_EXACT_INT_r22] = _GUARD_TOS_EXACT_INT,
+ [_GUARD_TOS_EXACT_INT_r33] = _GUARD_TOS_EXACT_INT,
[_GUARD_NOS_OVERFLOWED_r02] = _GUARD_NOS_OVERFLOWED,
[_GUARD_NOS_OVERFLOWED_r12] = _GUARD_NOS_OVERFLOWED,
[_GUARD_NOS_OVERFLOWED_r22] = _GUARD_NOS_OVERFLOWED,
@@ -5506,6 +5520,11 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1]
= {
[_GUARD_TOS_DICT_r11] = "_GUARD_TOS_DICT_r11",
[_GUARD_TOS_DICT_r22] = "_GUARD_TOS_DICT_r22",
[_GUARD_TOS_DICT_r33] = "_GUARD_TOS_DICT_r33",
+ [_GUARD_TOS_EXACT_INT] = "_GUARD_TOS_EXACT_INT",
+ [_GUARD_TOS_EXACT_INT_r01] = "_GUARD_TOS_EXACT_INT_r01",
+ [_GUARD_TOS_EXACT_INT_r11] = "_GUARD_TOS_EXACT_INT_r11",
+ [_GUARD_TOS_EXACT_INT_r22] = "_GUARD_TOS_EXACT_INT_r22",
+ [_GUARD_TOS_EXACT_INT_r33] = "_GUARD_TOS_EXACT_INT_r33",
[_GUARD_TOS_FLOAT] = "_GUARD_TOS_FLOAT",
[_GUARD_TOS_FLOAT_r01] = "_GUARD_TOS_FLOAT_r01",
[_GUARD_TOS_FLOAT_r11] = "_GUARD_TOS_FLOAT_r11",
@@ -6283,6 +6302,8 @@ int _PyUop_num_popped(int opcode, int oparg)
return 0;
case _GUARD_TOS_INT:
return 0;
+ case _GUARD_TOS_EXACT_INT:
+ return 0;
case _GUARD_NOS_OVERFLOWED:
return 0;
case _GUARD_TOS_OVERFLOWED:
diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
index d5a94ef69c14de0..36efab518781410 100644
--- a/Lib/test/test_capi/test_opt.py
+++ b/Lib/test/test_capi/test_opt.py
@@ -4875,6 +4875,27 @@ def f(n):
self.assertLessEqual(count_ops(ex, "_POP_TOP"), 3)
self.assertIn("_POP_TOP_NOP", uops)
+ def test_to_bool_noncompact_int(self):
+ # gh-155486: non-compact exact integer should remain specialized
+ # as _TO_BOOL_INT in Tier 2.
+ def f(n, value=1 << 100):
+ for _ in range(n):
+ if not value:
+ return 0
+ # The second check should reuse the exact-int type established
by the first guard.
+ if not value:
+ return 0
+ return 1
+
+ res, ex = self._run_with_optimizer(f, TIER2_THRESHOLD)
+ self.assertEqual(res, 1)
+ self.assertIsNotNone(ex)
+ uops = get_opnames(ex)
+ self.assertIn("_TO_BOOL_INT", uops)
+ self.assertLessEqual(count_ops(ex, "_GUARD_TOS_EXACT_INT"), 1)
+ self.assertLessEqual(count_ops(ex, "_POP_TOP"), 3)
+ self.assertIn("_POP_TOP_NOP", uops)
+
def test_to_bool_list(self):
def f(n):
for i in range(n):
diff --git a/Modules/_testinternalcapi/test_cases.c.h
b/Modules/_testinternalcapi/test_cases.c.h
index a17648a33d4fe4a..7a75e80298fcd82 100644
--- a/Modules/_testinternalcapi/test_cases.c.h
+++ b/Modules/_testinternalcapi/test_cases.c.h
@@ -12996,11 +12996,11 @@
_PyStackRef value;
_PyStackRef res;
_PyStackRef v;
- // _GUARD_TOS_INT
+ // _GUARD_TOS_EXACT_INT
{
value = stack_pointer[-1];
PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
- if (!_PyLong_CheckExactAndCompact(value_o)) {
+ if (!PyLong_CheckExact(value_o)) {
UPDATE_MISS_STATS(TO_BOOL);
assert(_PyOpcode_Deopt[opcode] == (TO_BOOL));
JUMP_TO_PREDICTED(TO_BOOL);
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index d657ae579a8f986..fb0cdf4d65e060d 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -526,7 +526,7 @@ dummy_func(
}
macro(TO_BOOL_INT) =
- _GUARD_TOS_INT + unused/1 + unused/2 + _TO_BOOL_INT + _POP_TOP_INT;
+ _GUARD_TOS_EXACT_INT + unused/1 + unused/2 + _TO_BOOL_INT +
_POP_TOP_INT;
op(_GUARD_NOS_LIST, (nos, unused -- nos, unused)) {
PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
@@ -643,6 +643,11 @@ dummy_func(
EXIT_IF(!_PyLong_CheckExactAndCompact(value_o));
}
+ op(_GUARD_TOS_EXACT_INT, (value -- value)) {
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ EXIT_IF(!PyLong_CheckExact(value_o));
+ }
+
op(_GUARD_NOS_OVERFLOWED, (left, unused -- left, unused)) {
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
assert(Py_TYPE(left_o) == &PyLong_Type);
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 46e721ea34b6b6e..9aad9e003765cf8 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -4009,6 +4009,91 @@
break;
}
+ case _GUARD_TOS_EXACT_INT_r01: {
+ CHECK_CURRENT_CACHED_VALUES(0);
+ ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__);
+ _PyStackRef value;
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyLong_CheckExact(value_o)) {
+ UOP_STAT_INC(uopcode, miss);
+ SET_CURRENT_CACHED_VALUES(0);
+ JUMP_TO_JUMP_TARGET();
+ }
+ _tos_cache0 = value;
+ SET_CURRENT_CACHED_VALUES(1);
+ stack_pointer += -1;
+ ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
+ ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__);
+ break;
+ }
+
+ case _GUARD_TOS_EXACT_INT_r11: {
+ CHECK_CURRENT_CACHED_VALUES(1);
+ ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__);
+ _PyStackRef value;
+ _PyStackRef _stack_item_0 = _tos_cache0;
+ value = _stack_item_0;
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyLong_CheckExact(value_o)) {
+ UOP_STAT_INC(uopcode, miss);
+ _tos_cache0 = value;
+ SET_CURRENT_CACHED_VALUES(1);
+ JUMP_TO_JUMP_TARGET();
+ }
+ _tos_cache0 = value;
+ SET_CURRENT_CACHED_VALUES(1);
+ ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__);
+ break;
+ }
+
+ case _GUARD_TOS_EXACT_INT_r22: {
+ CHECK_CURRENT_CACHED_VALUES(2);
+ ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__);
+ _PyStackRef value;
+ _PyStackRef _stack_item_0 = _tos_cache0;
+ _PyStackRef _stack_item_1 = _tos_cache1;
+ value = _stack_item_1;
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyLong_CheckExact(value_o)) {
+ UOP_STAT_INC(uopcode, miss);
+ _tos_cache1 = value;
+ _tos_cache0 = _stack_item_0;
+ SET_CURRENT_CACHED_VALUES(2);
+ JUMP_TO_JUMP_TARGET();
+ }
+ _tos_cache1 = value;
+ _tos_cache0 = _stack_item_0;
+ SET_CURRENT_CACHED_VALUES(2);
+ ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__);
+ break;
+ }
+
+ case _GUARD_TOS_EXACT_INT_r33: {
+ CHECK_CURRENT_CACHED_VALUES(3);
+ ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__);
+ _PyStackRef value;
+ _PyStackRef _stack_item_0 = _tos_cache0;
+ _PyStackRef _stack_item_1 = _tos_cache1;
+ _PyStackRef _stack_item_2 = _tos_cache2;
+ value = _stack_item_2;
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyLong_CheckExact(value_o)) {
+ UOP_STAT_INC(uopcode, miss);
+ _tos_cache2 = value;
+ _tos_cache1 = _stack_item_1;
+ _tos_cache0 = _stack_item_0;
+ SET_CURRENT_CACHED_VALUES(3);
+ JUMP_TO_JUMP_TARGET();
+ }
+ _tos_cache2 = value;
+ _tos_cache1 = _stack_item_1;
+ _tos_cache0 = _stack_item_0;
+ SET_CURRENT_CACHED_VALUES(3);
+ ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__);
+ break;
+ }
+
case _GUARD_NOS_OVERFLOWED_r02: {
CHECK_CURRENT_CACHED_VALUES(0);
ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__);
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 6178dc70c1b80e7..77c18b3d61fefc7 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -12993,11 +12993,11 @@
_PyStackRef value;
_PyStackRef res;
_PyStackRef v;
- // _GUARD_TOS_INT
+ // _GUARD_TOS_EXACT_INT
{
value = stack_pointer[-1];
PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
- if (!_PyLong_CheckExactAndCompact(value_o)) {
+ if (!PyLong_CheckExact(value_o)) {
UPDATE_MISS_STATS(TO_BOOL);
assert(_PyOpcode_Deopt[opcode] == (TO_BOOL));
JUMP_TO_PREDICTED(TO_BOOL);
diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
index edb4c644bccbf6f..5246e50633461bd 100644
--- a/Python/optimizer_bytecodes.c
+++ b/Python/optimizer_bytecodes.c
@@ -217,6 +217,13 @@ dummy_func(void) {
}
}
+ op(_GUARD_TOS_EXACT_INT, (value -- value)) {
+ if (sym_matches_type(value, &PyLong_Type)) {
+ ADD_OP(_NOP, 0, 0);
+ }
+ sym_set_type(value, &PyLong_Type);
+ }
+
op(_GUARD_NOS_INT, (left, unused -- left, unused)) {
if (sym_is_compact_int(left)) {
ADD_OP(_NOP, 0, 0);
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index 5e110360b81b445..21f275f27cafe04 100644
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -581,6 +581,16 @@
break;
}
+ case _GUARD_TOS_EXACT_INT: {
+ JitOptRef value;
+ value = stack_pointer[-1];
+ if (sym_matches_type(value, &PyLong_Type)) {
+ ADD_OP(_NOP, 0, 0);
+ }
+ sym_set_type(value, &PyLong_Type);
+ break;
+ }
+
case _GUARD_NOS_OVERFLOWED: {
break;
}
_______________________________________________
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]
