https://github.com/python/cpython/commit/1a9d4a1fb3d4beda7c7e8483af7c6bc7ac477e9f
commit: 1a9d4a1fb3d4beda7c7e8483af7c6bc7ac477e9f
branch: main
author: Brandt Bucher <brandtbuc...@microsoft.com>
committer: brandtbucher <brandtbuc...@gmail.com>
date: 2025-04-01T15:10:15-07:00
summary:
GH-131798: Allow the JIT to remove more int/float/str guards (GH-131800)
files:
A
Misc/NEWS.d/next/Core_and_Builtins/2025-03-27-12-40-21.gh-issue-131800.Xq3n54.rst
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 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 073c002b34c30a..5a165a5a3a2675 100644
--- a/Include/internal/pycore_opcode_metadata.h
+++ b/Include/internal/pycore_opcode_metadata.h
@@ -1071,9 +1071,9 @@ const struct opcode_metadata
_PyOpcode_opcode_metadata[266] = {
[BINARY_OP_MULTIPLY_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG |
HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[BINARY_OP_SUBSCR_DICT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG |
HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[BINARY_OP_SUBSCR_GETITEM] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG },
- [BINARY_OP_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG |
HAS_ESCAPES_FLAG },
- [BINARY_OP_SUBSCR_STR_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG |
HAS_ESCAPES_FLAG },
- [BINARY_OP_SUBSCR_TUPLE_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG },
+ [BINARY_OP_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG |
HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
+ [BINARY_OP_SUBSCR_STR_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG |
HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
+ [BINARY_OP_SUBSCR_TUPLE_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG |
HAS_EXIT_FLAG },
[BINARY_OP_SUBTRACT_FLOAT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG |
HAS_ERROR_FLAG },
[BINARY_OP_SUBTRACT_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG |
HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[BINARY_SLICE] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
@@ -1266,7 +1266,7 @@ const struct opcode_metadata
_PyOpcode_opcode_metadata[266] = {
[STORE_SLICE] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[STORE_SUBSCR] = { true, INSTR_FMT_IXC, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG
},
[STORE_SUBSCR_DICT] = { true, INSTR_FMT_IXC, HAS_DEOPT_FLAG |
HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
- [STORE_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC, HAS_DEOPT_FLAG |
HAS_ESCAPES_FLAG },
+ [STORE_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC, HAS_DEOPT_FLAG |
HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
[SWAP] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_PURE_FLAG },
[TO_BOOL] = { true, INSTR_FMT_IXC00, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[TO_BOOL_ALWAYS_TRUE] = { true, INSTR_FMT_IXC00, HAS_EXIT_FLAG |
HAS_ESCAPES_FLAG },
@@ -1309,20 +1309,20 @@ extern const struct opcode_macro_expansion
_PyOpcode_macro_expansion[256];
const struct opcode_macro_expansion
_PyOpcode_macro_expansion[256] = {
[BINARY_OP] = { .nuops = 1, .uops = { { _BINARY_OP, OPARG_SIMPLE, 4 } } },
- [BINARY_OP_ADD_FLOAT] = { .nuops = 2, .uops = { { _GUARD_BOTH_FLOAT,
OPARG_SIMPLE, 0 }, { _BINARY_OP_ADD_FLOAT, OPARG_SIMPLE, 5 } } },
- [BINARY_OP_ADD_INT] = { .nuops = 2, .uops = { { _GUARD_BOTH_INT,
OPARG_SIMPLE, 0 }, { _BINARY_OP_ADD_INT, OPARG_SIMPLE, 5 } } },
- [BINARY_OP_ADD_UNICODE] = { .nuops = 2, .uops = { { _GUARD_BOTH_UNICODE,
OPARG_SIMPLE, 0 }, { _BINARY_OP_ADD_UNICODE, OPARG_SIMPLE, 5 } } },
+ [BINARY_OP_ADD_FLOAT] = { .nuops = 3, .uops = { { _GUARD_TOS_FLOAT,
OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, {
_BINARY_OP_ADD_FLOAT, OPARG_SIMPLE, 5 } } },
+ [BINARY_OP_ADD_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT,
OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_ADD_INT,
OPARG_SIMPLE, 5 } } },
+ [BINARY_OP_ADD_UNICODE] = { .nuops = 3, .uops = { { _GUARD_TOS_UNICODE,
OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, {
_BINARY_OP_ADD_UNICODE, OPARG_SIMPLE, 5 } } },
[BINARY_OP_EXTEND] = { .nuops = 2, .uops = { { _GUARD_BINARY_OP_EXTEND, 4,
1 }, { _BINARY_OP_EXTEND, 4, 1 } } },
- [BINARY_OP_INPLACE_ADD_UNICODE] = { .nuops = 2, .uops = { {
_GUARD_BOTH_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_INPLACE_ADD_UNICODE,
OPARG_SIMPLE, 5 } } },
- [BINARY_OP_MULTIPLY_FLOAT] = { .nuops = 2, .uops = { { _GUARD_BOTH_FLOAT,
OPARG_SIMPLE, 0 }, { _BINARY_OP_MULTIPLY_FLOAT, OPARG_SIMPLE, 5 } } },
- [BINARY_OP_MULTIPLY_INT] = { .nuops = 2, .uops = { { _GUARD_BOTH_INT,
OPARG_SIMPLE, 0 }, { _BINARY_OP_MULTIPLY_INT, OPARG_SIMPLE, 5 } } },
+ [BINARY_OP_INPLACE_ADD_UNICODE] = { .nuops = 3, .uops = { {
_GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 },
{ _BINARY_OP_INPLACE_ADD_UNICODE, OPARG_SIMPLE, 5 } } },
+ [BINARY_OP_MULTIPLY_FLOAT] = { .nuops = 3, .uops = { { _GUARD_TOS_FLOAT,
OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, {
_BINARY_OP_MULTIPLY_FLOAT, OPARG_SIMPLE, 5 } } },
+ [BINARY_OP_MULTIPLY_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT,
OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, {
_BINARY_OP_MULTIPLY_INT, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBSCR_DICT] = { .nuops = 1, .uops = { {
_BINARY_OP_SUBSCR_DICT, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBSCR_GETITEM] = { .nuops = 4, .uops = { { _CHECK_PEP_523,
OPARG_SIMPLE, 5 }, { _BINARY_OP_SUBSCR_CHECK_FUNC, OPARG_SIMPLE, 5 }, {
_BINARY_OP_SUBSCR_INIT_CALL, OPARG_SIMPLE, 5 }, { _PUSH_FRAME, OPARG_SIMPLE, 5
} } },
- [BINARY_OP_SUBSCR_LIST_INT] = { .nuops = 1, .uops = { {
_BINARY_OP_SUBSCR_LIST_INT, OPARG_SIMPLE, 5 } } },
- [BINARY_OP_SUBSCR_STR_INT] = { .nuops = 1, .uops = { {
_BINARY_OP_SUBSCR_STR_INT, OPARG_SIMPLE, 5 } } },
- [BINARY_OP_SUBSCR_TUPLE_INT] = { .nuops = 1, .uops = { {
_BINARY_OP_SUBSCR_TUPLE_INT, OPARG_SIMPLE, 5 } } },
- [BINARY_OP_SUBTRACT_FLOAT] = { .nuops = 2, .uops = { { _GUARD_BOTH_FLOAT,
OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_FLOAT, OPARG_SIMPLE, 5 } } },
- [BINARY_OP_SUBTRACT_INT] = { .nuops = 2, .uops = { { _GUARD_BOTH_INT,
OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_INT, OPARG_SIMPLE, 5 } } },
+ [BINARY_OP_SUBSCR_LIST_INT] = { .nuops = 2, .uops = { { _GUARD_TOS_INT,
OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_LIST_INT, OPARG_SIMPLE, 5 } } },
+ [BINARY_OP_SUBSCR_STR_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT,
OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, {
_BINARY_OP_SUBSCR_STR_INT, OPARG_SIMPLE, 5 } } },
+ [BINARY_OP_SUBSCR_TUPLE_INT] = { .nuops = 2, .uops = { { _GUARD_TOS_INT,
OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_TUPLE_INT, OPARG_SIMPLE, 5 } } },
+ [BINARY_OP_SUBTRACT_FLOAT] = { .nuops = 3, .uops = { { _GUARD_TOS_FLOAT,
OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, {
_BINARY_OP_SUBTRACT_FLOAT, OPARG_SIMPLE, 5 } } },
+ [BINARY_OP_SUBTRACT_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT,
OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, {
_BINARY_OP_SUBTRACT_INT, OPARG_SIMPLE, 5 } } },
[BINARY_SLICE] = { .nuops = 1, .uops = { { _BINARY_SLICE, OPARG_SIMPLE, 0
} } },
[BUILD_LIST] = { .nuops = 1, .uops = { { _BUILD_LIST, OPARG_SIMPLE, 0 } }
},
[BUILD_MAP] = { .nuops = 1, .uops = { { _BUILD_MAP, OPARG_SIMPLE, 0 } } },
@@ -1358,9 +1358,9 @@ _PyOpcode_macro_expansion[256] = {
[CHECK_EG_MATCH] = { .nuops = 1, .uops = { { _CHECK_EG_MATCH,
OPARG_SIMPLE, 0 } } },
[CHECK_EXC_MATCH] = { .nuops = 1, .uops = { { _CHECK_EXC_MATCH,
OPARG_SIMPLE, 0 } } },
[COMPARE_OP] = { .nuops = 1, .uops = { { _COMPARE_OP, OPARG_SIMPLE, 0 } }
},
- [COMPARE_OP_FLOAT] = { .nuops = 2, .uops = { { _GUARD_BOTH_FLOAT,
OPARG_SIMPLE, 0 }, { _COMPARE_OP_FLOAT, OPARG_SIMPLE, 1 } } },
- [COMPARE_OP_INT] = { .nuops = 2, .uops = { { _GUARD_BOTH_INT,
OPARG_SIMPLE, 0 }, { _COMPARE_OP_INT, OPARG_SIMPLE, 1 } } },
- [COMPARE_OP_STR] = { .nuops = 2, .uops = { { _GUARD_BOTH_UNICODE,
OPARG_SIMPLE, 0 }, { _COMPARE_OP_STR, OPARG_SIMPLE, 1 } } },
+ [COMPARE_OP_FLOAT] = { .nuops = 3, .uops = { { _GUARD_TOS_FLOAT,
OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _COMPARE_OP_FLOAT,
OPARG_SIMPLE, 1 } } },
+ [COMPARE_OP_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE,
0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _COMPARE_OP_INT, OPARG_SIMPLE, 1 }
} },
+ [COMPARE_OP_STR] = { .nuops = 3, .uops = { { _GUARD_TOS_UNICODE,
OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _COMPARE_OP_STR,
OPARG_SIMPLE, 1 } } },
[CONTAINS_OP] = { .nuops = 1, .uops = { { _CONTAINS_OP, OPARG_SIMPLE, 0 }
} },
[CONTAINS_OP_DICT] = { .nuops = 1, .uops = { { _CONTAINS_OP_DICT,
OPARG_SIMPLE, 1 } } },
[CONTAINS_OP_SET] = { .nuops = 1, .uops = { { _CONTAINS_OP_SET,
OPARG_SIMPLE, 1 } } },
@@ -1469,7 +1469,7 @@ _PyOpcode_macro_expansion[256] = {
[STORE_SLICE] = { .nuops = 1, .uops = { { _STORE_SLICE, OPARG_SIMPLE, 0 }
} },
[STORE_SUBSCR] = { .nuops = 1, .uops = { { _STORE_SUBSCR, OPARG_SIMPLE, 0
} } },
[STORE_SUBSCR_DICT] = { .nuops = 1, .uops = { { _STORE_SUBSCR_DICT,
OPARG_SIMPLE, 1 } } },
- [STORE_SUBSCR_LIST_INT] = { .nuops = 1, .uops = { {
_STORE_SUBSCR_LIST_INT, OPARG_SIMPLE, 1 } } },
+ [STORE_SUBSCR_LIST_INT] = { .nuops = 2, .uops = { { _GUARD_TOS_INT,
OPARG_SIMPLE, 0 }, { _STORE_SUBSCR_LIST_INT, OPARG_SIMPLE, 1 } } },
[SWAP] = { .nuops = 1, .uops = { { _SWAP, OPARG_SIMPLE, 0 } } },
[TO_BOOL] = { .nuops = 1, .uops = { { _TO_BOOL, OPARG_SIMPLE, 2 } } },
[TO_BOOL_ALWAYS_TRUE] = { .nuops = 2, .uops = { { _GUARD_TYPE_VERSION, 2,
1 }, { _REPLACE_WITH_TRUE, OPARG_SIMPLE, 3 } } },
diff --git a/Include/internal/pycore_uop_ids.h
b/Include/internal/pycore_uop_ids.h
index 6fb63bfabfe798..daac41b3d2879d 100644
--- a/Include/internal/pycore_uop_ids.h
+++ b/Include/internal/pycore_uop_ids.h
@@ -22,104 +22,101 @@ extern "C" {
#define _BINARY_OP_SUBSCR_CHECK_FUNC 310
#define _BINARY_OP_SUBSCR_DICT BINARY_OP_SUBSCR_DICT
#define _BINARY_OP_SUBSCR_INIT_CALL 311
-#define _BINARY_OP_SUBSCR_LIST_INT BINARY_OP_SUBSCR_LIST_INT
-#define _BINARY_OP_SUBSCR_STR_INT BINARY_OP_SUBSCR_STR_INT
-#define _BINARY_OP_SUBSCR_TUPLE_INT BINARY_OP_SUBSCR_TUPLE_INT
-#define _BINARY_OP_SUBTRACT_FLOAT 312
-#define _BINARY_OP_SUBTRACT_INT 313
-#define _BINARY_SLICE 314
+#define _BINARY_OP_SUBSCR_LIST_INT 312
+#define _BINARY_OP_SUBSCR_STR_INT 313
+#define _BINARY_OP_SUBSCR_TUPLE_INT 314
+#define _BINARY_OP_SUBTRACT_FLOAT 315
+#define _BINARY_OP_SUBTRACT_INT 316
+#define _BINARY_SLICE 317
#define _BUILD_LIST BUILD_LIST
#define _BUILD_MAP BUILD_MAP
#define _BUILD_SET BUILD_SET
#define _BUILD_SLICE BUILD_SLICE
#define _BUILD_STRING BUILD_STRING
#define _BUILD_TUPLE BUILD_TUPLE
-#define _CALL_BUILTIN_CLASS 315
-#define _CALL_BUILTIN_FAST 316
-#define _CALL_BUILTIN_FAST_WITH_KEYWORDS 317
-#define _CALL_BUILTIN_O 318
+#define _CALL_BUILTIN_CLASS 318
+#define _CALL_BUILTIN_FAST 319
+#define _CALL_BUILTIN_FAST_WITH_KEYWORDS 320
+#define _CALL_BUILTIN_O 321
#define _CALL_INTRINSIC_1 CALL_INTRINSIC_1
#define _CALL_INTRINSIC_2 CALL_INTRINSIC_2
#define _CALL_ISINSTANCE CALL_ISINSTANCE
-#define _CALL_KW_NON_PY 319
+#define _CALL_KW_NON_PY 322
#define _CALL_LEN CALL_LEN
#define _CALL_LIST_APPEND CALL_LIST_APPEND
-#define _CALL_METHOD_DESCRIPTOR_FAST 320
-#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 321
-#define _CALL_METHOD_DESCRIPTOR_NOARGS 322
-#define _CALL_METHOD_DESCRIPTOR_O 323
-#define _CALL_NON_PY_GENERAL 324
-#define _CALL_STR_1 325
-#define _CALL_TUPLE_1 326
+#define _CALL_METHOD_DESCRIPTOR_FAST 323
+#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 324
+#define _CALL_METHOD_DESCRIPTOR_NOARGS 325
+#define _CALL_METHOD_DESCRIPTOR_O 326
+#define _CALL_NON_PY_GENERAL 327
+#define _CALL_STR_1 328
+#define _CALL_TUPLE_1 329
#define _CALL_TYPE_1 CALL_TYPE_1
-#define _CHECK_AND_ALLOCATE_OBJECT 327
-#define _CHECK_ATTR_CLASS 328
-#define _CHECK_ATTR_METHOD_LAZY_DICT 329
-#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 330
+#define _CHECK_AND_ALLOCATE_OBJECT 330
+#define _CHECK_ATTR_CLASS 331
+#define _CHECK_ATTR_METHOD_LAZY_DICT 332
+#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 333
#define _CHECK_EG_MATCH CHECK_EG_MATCH
#define _CHECK_EXC_MATCH CHECK_EXC_MATCH
-#define _CHECK_FUNCTION 331
-#define _CHECK_FUNCTION_EXACT_ARGS 332
-#define _CHECK_FUNCTION_VERSION 333
-#define _CHECK_FUNCTION_VERSION_INLINE 334
-#define _CHECK_FUNCTION_VERSION_KW 335
-#define _CHECK_IS_NOT_PY_CALLABLE 336
-#define _CHECK_IS_NOT_PY_CALLABLE_KW 337
-#define _CHECK_MANAGED_OBJECT_HAS_VALUES 338
-#define _CHECK_METHOD_VERSION 339
-#define _CHECK_METHOD_VERSION_KW 340
-#define _CHECK_PEP_523 341
-#define _CHECK_PERIODIC 342
-#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 343
-#define _CHECK_STACK_SPACE 344
-#define _CHECK_STACK_SPACE_OPERAND 345
-#define _CHECK_VALIDITY 346
-#define _CHECK_VALIDITY_AND_SET_IP 347
-#define _COMPARE_OP 348
-#define _COMPARE_OP_FLOAT 349
-#define _COMPARE_OP_INT 350
-#define _COMPARE_OP_STR 351
-#define _CONTAINS_OP 352
+#define _CHECK_FUNCTION 334
+#define _CHECK_FUNCTION_EXACT_ARGS 335
+#define _CHECK_FUNCTION_VERSION 336
+#define _CHECK_FUNCTION_VERSION_INLINE 337
+#define _CHECK_FUNCTION_VERSION_KW 338
+#define _CHECK_IS_NOT_PY_CALLABLE 339
+#define _CHECK_IS_NOT_PY_CALLABLE_KW 340
+#define _CHECK_MANAGED_OBJECT_HAS_VALUES 341
+#define _CHECK_METHOD_VERSION 342
+#define _CHECK_METHOD_VERSION_KW 343
+#define _CHECK_PEP_523 344
+#define _CHECK_PERIODIC 345
+#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 346
+#define _CHECK_STACK_SPACE 347
+#define _CHECK_STACK_SPACE_OPERAND 348
+#define _CHECK_VALIDITY 349
+#define _CHECK_VALIDITY_AND_SET_IP 350
+#define _COMPARE_OP 351
+#define _COMPARE_OP_FLOAT 352
+#define _COMPARE_OP_INT 353
+#define _COMPARE_OP_STR 354
+#define _CONTAINS_OP 355
#define _CONTAINS_OP_DICT CONTAINS_OP_DICT
#define _CONTAINS_OP_SET CONTAINS_OP_SET
#define _CONVERT_VALUE CONVERT_VALUE
#define _COPY COPY
#define _COPY_FREE_VARS COPY_FREE_VARS
-#define _CREATE_INIT_FRAME 353
+#define _CREATE_INIT_FRAME 356
#define _DELETE_ATTR DELETE_ATTR
#define _DELETE_DEREF DELETE_DEREF
#define _DELETE_FAST DELETE_FAST
#define _DELETE_GLOBAL DELETE_GLOBAL
#define _DELETE_NAME DELETE_NAME
#define _DELETE_SUBSCR DELETE_SUBSCR
-#define _DEOPT 354
+#define _DEOPT 357
#define _DICT_MERGE DICT_MERGE
#define _DICT_UPDATE DICT_UPDATE
-#define _DO_CALL 355
-#define _DO_CALL_FUNCTION_EX 356
-#define _DO_CALL_KW 357
+#define _DO_CALL 358
+#define _DO_CALL_FUNCTION_EX 359
+#define _DO_CALL_KW 360
#define _END_FOR END_FOR
#define _END_SEND END_SEND
-#define _ERROR_POP_N 358
+#define _ERROR_POP_N 361
#define _EXIT_INIT_CHECK EXIT_INIT_CHECK
-#define _EXPAND_METHOD 359
-#define _EXPAND_METHOD_KW 360
-#define _FATAL_ERROR 361
+#define _EXPAND_METHOD 362
+#define _EXPAND_METHOD_KW 363
+#define _FATAL_ERROR 364
#define _FORMAT_SIMPLE FORMAT_SIMPLE
#define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC
-#define _FOR_ITER 362
-#define _FOR_ITER_GEN_FRAME 363
-#define _FOR_ITER_TIER_TWO 364
+#define _FOR_ITER 365
+#define _FOR_ITER_GEN_FRAME 366
+#define _FOR_ITER_TIER_TWO 367
#define _GET_AITER GET_AITER
#define _GET_ANEXT GET_ANEXT
#define _GET_AWAITABLE GET_AWAITABLE
#define _GET_ITER GET_ITER
#define _GET_LEN GET_LEN
#define _GET_YIELD_FROM_ITER GET_YIELD_FROM_ITER
-#define _GUARD_BINARY_OP_EXTEND 365
-#define _GUARD_BOTH_FLOAT 366
-#define _GUARD_BOTH_INT 367
-#define _GUARD_BOTH_UNICODE 368
+#define _GUARD_BINARY_OP_EXTEND 368
#define _GUARD_DORV_NO_DICT 369
#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 370
#define _GUARD_GLOBALS_VERSION 371
@@ -130,23 +127,24 @@ extern "C" {
#define _GUARD_KEYS_VERSION 376
#define _GUARD_NOS_FLOAT 377
#define _GUARD_NOS_INT 378
-#define _GUARD_NOT_EXHAUSTED_LIST 379
-#define _GUARD_NOT_EXHAUSTED_RANGE 380
-#define _GUARD_NOT_EXHAUSTED_TUPLE 381
-#define _GUARD_TOS_FLOAT 382
-#define _GUARD_TOS_INT 383
-#define _GUARD_TOS_UNICODE 384
-#define _GUARD_TYPE_VERSION 385
-#define _GUARD_TYPE_VERSION_AND_LOCK 386
+#define _GUARD_NOS_UNICODE 379
+#define _GUARD_NOT_EXHAUSTED_LIST 380
+#define _GUARD_NOT_EXHAUSTED_RANGE 381
+#define _GUARD_NOT_EXHAUSTED_TUPLE 382
+#define _GUARD_TOS_FLOAT 383
+#define _GUARD_TOS_INT 384
+#define _GUARD_TOS_UNICODE 385
+#define _GUARD_TYPE_VERSION 386
+#define _GUARD_TYPE_VERSION_AND_LOCK 387
#define _IMPORT_FROM IMPORT_FROM
#define _IMPORT_NAME IMPORT_NAME
-#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 387
-#define _INIT_CALL_PY_EXACT_ARGS 388
-#define _INIT_CALL_PY_EXACT_ARGS_0 389
-#define _INIT_CALL_PY_EXACT_ARGS_1 390
-#define _INIT_CALL_PY_EXACT_ARGS_2 391
-#define _INIT_CALL_PY_EXACT_ARGS_3 392
-#define _INIT_CALL_PY_EXACT_ARGS_4 393
+#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 388
+#define _INIT_CALL_PY_EXACT_ARGS 389
+#define _INIT_CALL_PY_EXACT_ARGS_0 390
+#define _INIT_CALL_PY_EXACT_ARGS_1 391
+#define _INIT_CALL_PY_EXACT_ARGS_2 392
+#define _INIT_CALL_PY_EXACT_ARGS_3 393
+#define _INIT_CALL_PY_EXACT_ARGS_4 394
#define _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER
#define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION
#define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD
@@ -156,163 +154,163 @@ extern "C" {
#define _INSTRUMENTED_POP_JUMP_IF_NONE INSTRUMENTED_POP_JUMP_IF_NONE
#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE INSTRUMENTED_POP_JUMP_IF_NOT_NONE
#define _INSTRUMENTED_POP_JUMP_IF_TRUE INSTRUMENTED_POP_JUMP_IF_TRUE
-#define _IS_NONE 394
+#define _IS_NONE 395
#define _IS_OP IS_OP
-#define _ITER_CHECK_LIST 395
-#define _ITER_CHECK_RANGE 396
-#define _ITER_CHECK_TUPLE 397
-#define _ITER_JUMP_LIST 398
-#define _ITER_JUMP_RANGE 399
-#define _ITER_JUMP_TUPLE 400
-#define _ITER_NEXT_LIST 401
-#define _ITER_NEXT_LIST_TIER_TWO 402
-#define _ITER_NEXT_RANGE 403
-#define _ITER_NEXT_TUPLE 404
-#define _JUMP_TO_TOP 405
+#define _ITER_CHECK_LIST 396
+#define _ITER_CHECK_RANGE 397
+#define _ITER_CHECK_TUPLE 398
+#define _ITER_JUMP_LIST 399
+#define _ITER_JUMP_RANGE 400
+#define _ITER_JUMP_TUPLE 401
+#define _ITER_NEXT_LIST 402
+#define _ITER_NEXT_LIST_TIER_TWO 403
+#define _ITER_NEXT_RANGE 404
+#define _ITER_NEXT_TUPLE 405
+#define _JUMP_TO_TOP 406
#define _LIST_APPEND LIST_APPEND
#define _LIST_EXTEND LIST_EXTEND
-#define _LOAD_ATTR 406
-#define _LOAD_ATTR_CLASS 407
+#define _LOAD_ATTR 407
+#define _LOAD_ATTR_CLASS 408
#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN
-#define _LOAD_ATTR_INSTANCE_VALUE 408
-#define _LOAD_ATTR_METHOD_LAZY_DICT 409
-#define _LOAD_ATTR_METHOD_NO_DICT 410
-#define _LOAD_ATTR_METHOD_WITH_VALUES 411
-#define _LOAD_ATTR_MODULE 412
-#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 413
-#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 414
-#define _LOAD_ATTR_PROPERTY_FRAME 415
-#define _LOAD_ATTR_SLOT 416
-#define _LOAD_ATTR_WITH_HINT 417
+#define _LOAD_ATTR_INSTANCE_VALUE 409
+#define _LOAD_ATTR_METHOD_LAZY_DICT 410
+#define _LOAD_ATTR_METHOD_NO_DICT 411
+#define _LOAD_ATTR_METHOD_WITH_VALUES 412
+#define _LOAD_ATTR_MODULE 413
+#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 414
+#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 415
+#define _LOAD_ATTR_PROPERTY_FRAME 416
+#define _LOAD_ATTR_SLOT 417
+#define _LOAD_ATTR_WITH_HINT 418
#define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS
-#define _LOAD_BYTECODE 418
+#define _LOAD_BYTECODE 419
#define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT
#define _LOAD_CONST LOAD_CONST
#define _LOAD_CONST_IMMORTAL LOAD_CONST_IMMORTAL
-#define _LOAD_CONST_INLINE 419
-#define _LOAD_CONST_INLINE_BORROW 420
+#define _LOAD_CONST_INLINE 420
+#define _LOAD_CONST_INLINE_BORROW 421
#define _LOAD_CONST_MORTAL LOAD_CONST_MORTAL
#define _LOAD_DEREF LOAD_DEREF
-#define _LOAD_FAST 421
-#define _LOAD_FAST_0 422
-#define _LOAD_FAST_1 423
-#define _LOAD_FAST_2 424
-#define _LOAD_FAST_3 425
-#define _LOAD_FAST_4 426
-#define _LOAD_FAST_5 427
-#define _LOAD_FAST_6 428
-#define _LOAD_FAST_7 429
+#define _LOAD_FAST 422
+#define _LOAD_FAST_0 423
+#define _LOAD_FAST_1 424
+#define _LOAD_FAST_2 425
+#define _LOAD_FAST_3 426
+#define _LOAD_FAST_4 427
+#define _LOAD_FAST_5 428
+#define _LOAD_FAST_6 429
+#define _LOAD_FAST_7 430
#define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR
-#define _LOAD_FAST_BORROW 430
-#define _LOAD_FAST_BORROW_0 431
-#define _LOAD_FAST_BORROW_1 432
-#define _LOAD_FAST_BORROW_2 433
-#define _LOAD_FAST_BORROW_3 434
-#define _LOAD_FAST_BORROW_4 435
-#define _LOAD_FAST_BORROW_5 436
-#define _LOAD_FAST_BORROW_6 437
-#define _LOAD_FAST_BORROW_7 438
+#define _LOAD_FAST_BORROW 431
+#define _LOAD_FAST_BORROW_0 432
+#define _LOAD_FAST_BORROW_1 433
+#define _LOAD_FAST_BORROW_2 434
+#define _LOAD_FAST_BORROW_3 435
+#define _LOAD_FAST_BORROW_4 436
+#define _LOAD_FAST_BORROW_5 437
+#define _LOAD_FAST_BORROW_6 438
+#define _LOAD_FAST_BORROW_7 439
#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW LOAD_FAST_BORROW_LOAD_FAST_BORROW
#define _LOAD_FAST_CHECK LOAD_FAST_CHECK
#define _LOAD_FAST_LOAD_FAST LOAD_FAST_LOAD_FAST
#define _LOAD_FROM_DICT_OR_DEREF LOAD_FROM_DICT_OR_DEREF
#define _LOAD_FROM_DICT_OR_GLOBALS LOAD_FROM_DICT_OR_GLOBALS
-#define _LOAD_GLOBAL 439
-#define _LOAD_GLOBAL_BUILTINS 440
-#define _LOAD_GLOBAL_MODULE 441
+#define _LOAD_GLOBAL 440
+#define _LOAD_GLOBAL_BUILTINS 441
+#define _LOAD_GLOBAL_MODULE 442
#define _LOAD_LOCALS LOAD_LOCALS
#define _LOAD_NAME LOAD_NAME
-#define _LOAD_SMALL_INT 442
-#define _LOAD_SMALL_INT_0 443
-#define _LOAD_SMALL_INT_1 444
-#define _LOAD_SMALL_INT_2 445
-#define _LOAD_SMALL_INT_3 446
+#define _LOAD_SMALL_INT 443
+#define _LOAD_SMALL_INT_0 444
+#define _LOAD_SMALL_INT_1 445
+#define _LOAD_SMALL_INT_2 446
+#define _LOAD_SMALL_INT_3 447
#define _LOAD_SPECIAL LOAD_SPECIAL
#define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR
#define _LOAD_SUPER_ATTR_METHOD LOAD_SUPER_ATTR_METHOD
-#define _MAKE_CALLARGS_A_TUPLE 447
+#define _MAKE_CALLARGS_A_TUPLE 448
#define _MAKE_CELL MAKE_CELL
#define _MAKE_FUNCTION MAKE_FUNCTION
-#define _MAKE_WARM 448
+#define _MAKE_WARM 449
#define _MAP_ADD MAP_ADD
#define _MATCH_CLASS MATCH_CLASS
#define _MATCH_KEYS MATCH_KEYS
#define _MATCH_MAPPING MATCH_MAPPING
#define _MATCH_SEQUENCE MATCH_SEQUENCE
-#define _MAYBE_EXPAND_METHOD 449
-#define _MAYBE_EXPAND_METHOD_KW 450
-#define _MONITOR_CALL 451
-#define _MONITOR_CALL_KW 452
-#define _MONITOR_JUMP_BACKWARD 453
-#define _MONITOR_RESUME 454
+#define _MAYBE_EXPAND_METHOD 450
+#define _MAYBE_EXPAND_METHOD_KW 451
+#define _MONITOR_CALL 452
+#define _MONITOR_CALL_KW 453
+#define _MONITOR_JUMP_BACKWARD 454
+#define _MONITOR_RESUME 455
#define _NOP NOP
#define _POP_EXCEPT POP_EXCEPT
-#define _POP_JUMP_IF_FALSE 455
-#define _POP_JUMP_IF_TRUE 456
+#define _POP_JUMP_IF_FALSE 456
+#define _POP_JUMP_IF_TRUE 457
#define _POP_TOP POP_TOP
-#define _POP_TOP_LOAD_CONST_INLINE 457
-#define _POP_TOP_LOAD_CONST_INLINE_BORROW 458
-#define _POP_TWO_LOAD_CONST_INLINE_BORROW 459
+#define _POP_TOP_LOAD_CONST_INLINE 458
+#define _POP_TOP_LOAD_CONST_INLINE_BORROW 459
+#define _POP_TWO_LOAD_CONST_INLINE_BORROW 460
#define _PUSH_EXC_INFO PUSH_EXC_INFO
-#define _PUSH_FRAME 460
+#define _PUSH_FRAME 461
#define _PUSH_NULL PUSH_NULL
-#define _PUSH_NULL_CONDITIONAL 461
-#define _PY_FRAME_GENERAL 462
-#define _PY_FRAME_KW 463
-#define _QUICKEN_RESUME 464
-#define _REPLACE_WITH_TRUE 465
+#define _PUSH_NULL_CONDITIONAL 462
+#define _PY_FRAME_GENERAL 463
+#define _PY_FRAME_KW 464
+#define _QUICKEN_RESUME 465
+#define _REPLACE_WITH_TRUE 466
#define _RESUME_CHECK RESUME_CHECK
#define _RETURN_GENERATOR RETURN_GENERATOR
#define _RETURN_VALUE RETURN_VALUE
-#define _SAVE_RETURN_OFFSET 466
-#define _SEND 467
-#define _SEND_GEN_FRAME 468
+#define _SAVE_RETURN_OFFSET 467
+#define _SEND 468
+#define _SEND_GEN_FRAME 469
#define _SETUP_ANNOTATIONS SETUP_ANNOTATIONS
#define _SET_ADD SET_ADD
#define _SET_FUNCTION_ATTRIBUTE SET_FUNCTION_ATTRIBUTE
#define _SET_UPDATE SET_UPDATE
-#define _START_EXECUTOR 469
-#define _STORE_ATTR 470
-#define _STORE_ATTR_INSTANCE_VALUE 471
-#define _STORE_ATTR_SLOT 472
-#define _STORE_ATTR_WITH_HINT 473
+#define _START_EXECUTOR 470
+#define _STORE_ATTR 471
+#define _STORE_ATTR_INSTANCE_VALUE 472
+#define _STORE_ATTR_SLOT 473
+#define _STORE_ATTR_WITH_HINT 474
#define _STORE_DEREF STORE_DEREF
-#define _STORE_FAST 474
-#define _STORE_FAST_0 475
-#define _STORE_FAST_1 476
-#define _STORE_FAST_2 477
-#define _STORE_FAST_3 478
-#define _STORE_FAST_4 479
-#define _STORE_FAST_5 480
-#define _STORE_FAST_6 481
-#define _STORE_FAST_7 482
+#define _STORE_FAST 475
+#define _STORE_FAST_0 476
+#define _STORE_FAST_1 477
+#define _STORE_FAST_2 478
+#define _STORE_FAST_3 479
+#define _STORE_FAST_4 480
+#define _STORE_FAST_5 481
+#define _STORE_FAST_6 482
+#define _STORE_FAST_7 483
#define _STORE_FAST_LOAD_FAST STORE_FAST_LOAD_FAST
#define _STORE_FAST_STORE_FAST STORE_FAST_STORE_FAST
#define _STORE_GLOBAL STORE_GLOBAL
#define _STORE_NAME STORE_NAME
-#define _STORE_SLICE 483
-#define _STORE_SUBSCR 484
+#define _STORE_SLICE 484
+#define _STORE_SUBSCR 485
#define _STORE_SUBSCR_DICT STORE_SUBSCR_DICT
-#define _STORE_SUBSCR_LIST_INT STORE_SUBSCR_LIST_INT
+#define _STORE_SUBSCR_LIST_INT 486
#define _SWAP SWAP
-#define _TIER2_RESUME_CHECK 485
-#define _TO_BOOL 486
+#define _TIER2_RESUME_CHECK 487
+#define _TO_BOOL 488
#define _TO_BOOL_BOOL TO_BOOL_BOOL
#define _TO_BOOL_INT TO_BOOL_INT
#define _TO_BOOL_LIST TO_BOOL_LIST
#define _TO_BOOL_NONE TO_BOOL_NONE
-#define _TO_BOOL_STR 487
+#define _TO_BOOL_STR 489
#define _UNARY_INVERT UNARY_INVERT
#define _UNARY_NEGATIVE UNARY_NEGATIVE
#define _UNARY_NOT UNARY_NOT
#define _UNPACK_EX UNPACK_EX
-#define _UNPACK_SEQUENCE 488
+#define _UNPACK_SEQUENCE 490
#define _UNPACK_SEQUENCE_LIST UNPACK_SEQUENCE_LIST
#define _UNPACK_SEQUENCE_TUPLE UNPACK_SEQUENCE_TUPLE
#define _UNPACK_SEQUENCE_TWO_TUPLE UNPACK_SEQUENCE_TWO_TUPLE
#define _WITH_EXCEPT_START WITH_EXCEPT_START
#define _YIELD_VALUE YIELD_VALUE
-#define MAX_UOP_ID 488
+#define MAX_UOP_ID 490
#ifdef __cplusplus
}
diff --git a/Include/internal/pycore_uop_metadata.h
b/Include/internal/pycore_uop_metadata.h
index 32007d0d917e2f..95ccf4e81afeab 100644
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -74,23 +74,21 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_TO_BOOL_INT] = HAS_EXIT_FLAG | HAS_ESCAPES_FLAG,
[_TO_BOOL_LIST] = HAS_EXIT_FLAG,
[_TO_BOOL_NONE] = HAS_EXIT_FLAG,
+ [_GUARD_NOS_UNICODE] = HAS_EXIT_FLAG,
[_GUARD_TOS_UNICODE] = HAS_EXIT_FLAG,
[_TO_BOOL_STR] = HAS_ESCAPES_FLAG,
[_REPLACE_WITH_TRUE] = HAS_ESCAPES_FLAG,
[_UNARY_INVERT] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
- [_GUARD_BOTH_INT] = HAS_EXIT_FLAG,
[_GUARD_NOS_INT] = HAS_EXIT_FLAG,
[_GUARD_TOS_INT] = HAS_EXIT_FLAG,
[_BINARY_OP_MULTIPLY_INT] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG |
HAS_PURE_FLAG,
[_BINARY_OP_ADD_INT] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG | HAS_PURE_FLAG,
[_BINARY_OP_SUBTRACT_INT] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG |
HAS_PURE_FLAG,
- [_GUARD_BOTH_FLOAT] = HAS_EXIT_FLAG,
[_GUARD_NOS_FLOAT] = HAS_EXIT_FLAG,
[_GUARD_TOS_FLOAT] = HAS_EXIT_FLAG,
[_BINARY_OP_MULTIPLY_FLOAT] = HAS_ERROR_FLAG | HAS_PURE_FLAG,
[_BINARY_OP_ADD_FLOAT] = HAS_ERROR_FLAG | HAS_PURE_FLAG,
[_BINARY_OP_SUBTRACT_FLOAT] = HAS_ERROR_FLAG | HAS_PURE_FLAG,
- [_GUARD_BOTH_UNICODE] = HAS_EXIT_FLAG,
[_BINARY_OP_ADD_UNICODE] = HAS_ERROR_FLAG | HAS_PURE_FLAG,
[_BINARY_OP_INPLACE_ADD_UNICODE] = HAS_LOCAL_FLAG | HAS_DEOPT_FLAG |
HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_GUARD_BINARY_OP_EXTEND] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG,
@@ -407,9 +405,6 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
[_GET_LEN] = "_GET_LEN",
[_GET_YIELD_FROM_ITER] = "_GET_YIELD_FROM_ITER",
[_GUARD_BINARY_OP_EXTEND] = "_GUARD_BINARY_OP_EXTEND",
- [_GUARD_BOTH_FLOAT] = "_GUARD_BOTH_FLOAT",
- [_GUARD_BOTH_INT] = "_GUARD_BOTH_INT",
- [_GUARD_BOTH_UNICODE] = "_GUARD_BOTH_UNICODE",
[_GUARD_DORV_NO_DICT] = "_GUARD_DORV_NO_DICT",
[_GUARD_DORV_VALUES_INST_ATTR_FROM_DICT] =
"_GUARD_DORV_VALUES_INST_ATTR_FROM_DICT",
[_GUARD_GLOBALS_VERSION] = "_GUARD_GLOBALS_VERSION",
@@ -420,6 +415,7 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
[_GUARD_KEYS_VERSION] = "_GUARD_KEYS_VERSION",
[_GUARD_NOS_FLOAT] = "_GUARD_NOS_FLOAT",
[_GUARD_NOS_INT] = "_GUARD_NOS_INT",
+ [_GUARD_NOS_UNICODE] = "_GUARD_NOS_UNICODE",
[_GUARD_NOT_EXHAUSTED_LIST] = "_GUARD_NOT_EXHAUSTED_LIST",
[_GUARD_NOT_EXHAUSTED_RANGE] = "_GUARD_NOT_EXHAUSTED_RANGE",
[_GUARD_NOT_EXHAUSTED_TUPLE] = "_GUARD_NOT_EXHAUSTED_TUPLE",
@@ -692,6 +688,8 @@ int _PyUop_num_popped(int opcode, int oparg)
return 1;
case _TO_BOOL_NONE:
return 1;
+ case _GUARD_NOS_UNICODE:
+ return 0;
case _GUARD_TOS_UNICODE:
return 0;
case _TO_BOOL_STR:
@@ -700,8 +698,6 @@ int _PyUop_num_popped(int opcode, int oparg)
return 1;
case _UNARY_INVERT:
return 1;
- case _GUARD_BOTH_INT:
- return 0;
case _GUARD_NOS_INT:
return 0;
case _GUARD_TOS_INT:
@@ -712,8 +708,6 @@ int _PyUop_num_popped(int opcode, int oparg)
return 2;
case _BINARY_OP_SUBTRACT_INT:
return 2;
- case _GUARD_BOTH_FLOAT:
- return 0;
case _GUARD_NOS_FLOAT:
return 0;
case _GUARD_TOS_FLOAT:
@@ -724,8 +718,6 @@ int _PyUop_num_popped(int opcode, int oparg)
return 2;
case _BINARY_OP_SUBTRACT_FLOAT:
return 2;
- case _GUARD_BOTH_UNICODE:
- return 0;
case _BINARY_OP_ADD_UNICODE:
return 2;
case _BINARY_OP_INPLACE_ADD_UNICODE:
diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
index 57556daa3ae74b..9ac5d1ecf7eb1e 100644
--- a/Lib/test/test_capi/test_opt.py
+++ b/Lib/test/test_capi/test_opt.py
@@ -472,9 +472,11 @@ def testfunc(loops):
self.assertIsNotNone(ex)
self.assertEqual(res, (TIER2_THRESHOLD - 1) * 2 + 1)
binop_count = [opname for opname in iter_opnames(ex) if opname ==
"_BINARY_OP_ADD_INT"]
- guard_both_int_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_BOTH_INT"]
+ guard_tos_int_count = [opname for opname in iter_opnames(ex) if opname
== "_GUARD_TOS_INT"]
+ guard_nos_int_count = [opname for opname in iter_opnames(ex) if opname
== "_GUARD_NOS_INT"]
self.assertGreaterEqual(len(binop_count), 3)
- self.assertLessEqual(len(guard_both_int_count), 1)
+ self.assertLessEqual(len(guard_tos_int_count), 1)
+ self.assertLessEqual(len(guard_nos_int_count), 1)
def test_int_type_propagation_through_frame(self):
def double(x):
@@ -493,9 +495,11 @@ def testfunc(loops):
self.assertIsNotNone(ex)
self.assertEqual(res, (TIER2_THRESHOLD - 1) * 4)
binop_count = [opname for opname in iter_opnames(ex) if opname ==
"_BINARY_OP_ADD_INT"]
- guard_both_int_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_BOTH_INT"]
+ guard_tos_int_count = [opname for opname in iter_opnames(ex) if opname
== "_GUARD_TOS_INT"]
+ guard_nos_int_count = [opname for opname in iter_opnames(ex) if opname
== "_GUARD_NOS_INT"]
self.assertGreaterEqual(len(binop_count), 3)
- self.assertLessEqual(len(guard_both_int_count), 1)
+ self.assertLessEqual(len(guard_tos_int_count), 1)
+ self.assertLessEqual(len(guard_nos_int_count), 1)
def test_int_type_propagation_from_frame(self):
def double(x):
@@ -514,9 +518,11 @@ def testfunc(loops):
self.assertIsNotNone(ex)
self.assertEqual(res, (TIER2_THRESHOLD - 1) * 4)
binop_count = [opname for opname in iter_opnames(ex) if opname ==
"_BINARY_OP_ADD_INT"]
- guard_both_int_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_BOTH_INT"]
+ guard_tos_int_count = [opname for opname in iter_opnames(ex) if opname
== "_GUARD_TOS_INT"]
+ guard_nos_int_count = [opname for opname in iter_opnames(ex) if opname
== "_GUARD_NOS_INT"]
self.assertGreaterEqual(len(binop_count), 3)
- self.assertLessEqual(len(guard_both_int_count), 1)
+ self.assertLessEqual(len(guard_tos_int_count), 1)
+ self.assertLessEqual(len(guard_nos_int_count), 1)
def test_int_impure_region(self):
def testfunc(loops):
@@ -559,7 +565,8 @@ def testfunc(n):
self.assertEqual(res, (TIER2_THRESHOLD - 1) * 2)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- self.assertNotIn("_GUARD_BOTH_INT", uops)
+ self.assertNotIn("_GUARD_TOS_INT", uops)
+ self.assertNotIn("_GUARD_NOS_INT", uops)
def test_int_value_numbering(self):
def testfunc(n):
@@ -577,9 +584,10 @@ def testfunc(n):
self.assertEqual(res, 4)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- self.assertIn("_GUARD_BOTH_INT", uops)
- guard_count = [opname for opname in iter_opnames(ex) if opname ==
"_GUARD_BOTH_INT"]
- self.assertEqual(len(guard_count), 1)
+ self.assertIn("_GUARD_TOS_INT", uops)
+ self.assertNotIn("_GUARD_NOS_INT", uops)
+ guard_tos_count = [opname for opname in iter_opnames(ex) if opname ==
"_GUARD_TOS_INT"]
+ self.assertEqual(len(guard_tos_count), 1)
def test_comprehension(self):
def testfunc(n):
@@ -664,8 +672,10 @@ def testfunc(n):
self.assertAlmostEqual(res, TIER2_THRESHOLD + 1)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- guard_both_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_BOTH_FLOAT"]
- self.assertLessEqual(len(guard_both_float_count), 1)
+ guard_tos_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_TOS_FLOAT"]
+ guard_nos_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_NOS_FLOAT"]
+ self.assertLessEqual(len(guard_tos_float_count), 1)
+ self.assertLessEqual(len(guard_nos_float_count), 1)
# TODO gh-115506: this assertion may change after propagating
constants.
# We'll also need to verify that propagation actually occurs.
self.assertIn("_BINARY_OP_ADD_FLOAT", uops)
@@ -684,8 +694,10 @@ def testfunc(n):
self.assertAlmostEqual(res, -TIER2_THRESHOLD + 1)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- guard_both_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_BOTH_FLOAT"]
- self.assertLessEqual(len(guard_both_float_count), 1)
+ guard_tos_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_TOS_FLOAT"]
+ guard_nos_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_NOS_FLOAT"]
+ self.assertLessEqual(len(guard_tos_float_count), 1)
+ self.assertLessEqual(len(guard_nos_float_count), 1)
# TODO gh-115506: this assertion may change after propagating
constants.
# We'll also need to verify that propagation actually occurs.
self.assertIn("_BINARY_OP_SUBTRACT_FLOAT", uops)
@@ -704,8 +716,10 @@ def testfunc(n):
self.assertAlmostEqual(res, 1.0)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- guard_both_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_BOTH_FLOAT"]
- self.assertLessEqual(len(guard_both_float_count), 1)
+ guard_tos_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_TOS_FLOAT"]
+ guard_nos_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_NOS_FLOAT"]
+ self.assertLessEqual(len(guard_tos_float_count), 1)
+ self.assertLessEqual(len(guard_nos_float_count), 1)
# TODO gh-115506: this assertion may change after propagating
constants.
# We'll also need to verify that propagation actually occurs.
self.assertIn("_BINARY_OP_MULTIPLY_FLOAT", uops)
@@ -724,8 +738,10 @@ def testfunc(n):
self.assertEqual(res, "")
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- guard_both_unicode_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_BOTH_UNICODE"]
- self.assertLessEqual(len(guard_both_unicode_count), 1)
+ guard_tos_unicode_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_TOS_UNICODE"]
+ guard_nos_unicode_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_NOS_UNICODE"]
+ self.assertLessEqual(len(guard_tos_unicode_count), 1)
+ self.assertLessEqual(len(guard_nos_unicode_count), 1)
self.assertIn("_BINARY_OP_ADD_UNICODE", uops)
def test_compare_op_type_propagation_float(self):
@@ -742,8 +758,10 @@ def testfunc(n):
self.assertTrue(res)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- guard_both_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_BOTH_FLOAT"]
- self.assertLessEqual(len(guard_both_float_count), 1)
+ guard_tos_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_TOS_FLOAT"]
+ guard_nos_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_NOS_FLOAT"]
+ self.assertLessEqual(len(guard_tos_float_count), 1)
+ self.assertLessEqual(len(guard_nos_float_count), 1)
self.assertIn("_COMPARE_OP_FLOAT", uops)
def test_compare_op_type_propagation_int(self):
@@ -760,8 +778,10 @@ def testfunc(n):
self.assertTrue(res)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- guard_both_int_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_BOTH_INT"]
- self.assertLessEqual(len(guard_both_int_count), 1)
+ guard_tos_int_count = [opname for opname in iter_opnames(ex) if opname
== "_GUARD_TOS_INT"]
+ guard_nos_int_count = [opname for opname in iter_opnames(ex) if opname
== "_GUARD_NOS_INT"]
+ self.assertLessEqual(len(guard_tos_int_count), 1)
+ self.assertLessEqual(len(guard_nos_int_count), 1)
self.assertIn("_COMPARE_OP_INT", uops)
def test_compare_op_type_propagation_int_partial(self):
@@ -778,10 +798,10 @@ def testfunc(n):
self.assertEqual(res, 1)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- guard_left_int_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_NOS_INT"]
- guard_both_int_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_BOTH_INT"]
- self.assertLessEqual(len(guard_left_int_count), 1)
- self.assertEqual(len(guard_both_int_count), 0)
+ guard_nos_int_count = [opname for opname in iter_opnames(ex) if opname
== "_GUARD_NOS_INT"]
+ guard_tos_int_count = [opname for opname in iter_opnames(ex) if opname
== "_GUARD_TOS_INT"]
+ self.assertLessEqual(len(guard_nos_int_count), 1)
+ self.assertEqual(len(guard_tos_int_count), 0)
self.assertIn("_COMPARE_OP_INT", uops)
def test_compare_op_type_propagation_float_partial(self):
@@ -798,10 +818,10 @@ def testfunc(n):
self.assertEqual(res, 1)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- guard_left_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_NOS_FLOAT"]
- guard_both_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_BOTH_FLOAT"]
- self.assertLessEqual(len(guard_left_float_count), 1)
- self.assertEqual(len(guard_both_float_count), 0)
+ guard_nos_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_NOS_FLOAT"]
+ guard_tos_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_TOS_FLOAT"]
+ self.assertLessEqual(len(guard_nos_float_count), 1)
+ self.assertEqual(len(guard_tos_float_count), 0)
self.assertIn("_COMPARE_OP_FLOAT", uops)
def test_compare_op_type_propagation_unicode(self):
@@ -818,8 +838,10 @@ def testfunc(n):
self.assertTrue(res)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- guard_both_float_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_BOTH_UNICODE"]
- self.assertLessEqual(len(guard_both_float_count), 1)
+ guard_tos_unicode_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_TOS_UNICODE"]
+ guard_nos_unicode_count = [opname for opname in iter_opnames(ex) if
opname == "_GUARD_NOS_UNICODE"]
+ self.assertLessEqual(len(guard_tos_unicode_count), 1)
+ self.assertLessEqual(len(guard_nos_unicode_count), 1)
self.assertIn("_COMPARE_OP_STR", uops)
def test_type_inconsistency(self):
@@ -838,7 +860,8 @@ def testfunc(n):
_, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD - 1)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- self.assertNotIn("_GUARD_BOTH_INT", uops)
+ self.assertNotIn("_GUARD_TOS_INT", uops)
+ self.assertNotIn("_GUARD_NOS_INT", uops)
self.assertIn("_BINARY_OP_ADD_INT", uops)
# Try again, but between the runs, set the global to a float.
# This should result in no executor the second time.
@@ -1414,7 +1437,6 @@ def testfunc(n):
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertIn("_BINARY_OP_ADD_INT", uops)
- self.assertNotIn("_GUARD_BOTH_INT", uops)
self.assertNotIn("_GUARD_NOS_INT", uops)
self.assertNotIn("_GUARD_TOS_INT", uops)
diff --git
a/Misc/NEWS.d/next/Core_and_Builtins/2025-03-27-12-40-21.gh-issue-131800.Xq3n54.rst
b/Misc/NEWS.d/next/Core_and_Builtins/2025-03-27-12-40-21.gh-issue-131800.Xq3n54.rst
new file mode 100644
index 00000000000000..bcfdc46bb3b97d
--- /dev/null
+++
b/Misc/NEWS.d/next/Core_and_Builtins/2025-03-27-12-40-21.gh-issue-131800.Xq3n54.rst
@@ -0,0 +1,2 @@
+Improve the experimental JIT's ability to remove type checks for certain
+subscripting operations.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 83847e31ef4dc7..c50df896cc9322 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -524,6 +524,12 @@ dummy_func(
res = PyStackRef_False;
}
+ op(_GUARD_NOS_UNICODE, (nos, tos -- nos, tos)) {
+ (void)tos;
+ PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
+ EXIT_IF(!PyUnicode_CheckExact(o));
+ }
+
op(_GUARD_TOS_UNICODE, (value -- value)) {
PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
EXIT_IF(!PyUnicode_CheckExact(value_o));
@@ -581,14 +587,8 @@ dummy_func(
BINARY_OP_EXTEND,
};
- op(_GUARD_BOTH_INT, (left, right -- left, right)) {
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- EXIT_IF(!PyLong_CheckExact(left_o));
- EXIT_IF(!PyLong_CheckExact(right_o));
- }
-
- op(_GUARD_NOS_INT, (left, unused -- left, unused)) {
+ op(_GUARD_NOS_INT, (left, right -- left, right)) {
+ (void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
EXIT_IF(!PyLong_CheckExact(left_o));
}
@@ -644,20 +644,14 @@ dummy_func(
}
macro(BINARY_OP_MULTIPLY_INT) =
- _GUARD_BOTH_INT + unused/5 + _BINARY_OP_MULTIPLY_INT;
+ _GUARD_TOS_INT + _GUARD_NOS_INT + unused/5 +
_BINARY_OP_MULTIPLY_INT;
macro(BINARY_OP_ADD_INT) =
- _GUARD_BOTH_INT + unused/5 + _BINARY_OP_ADD_INT;
+ _GUARD_TOS_INT + _GUARD_NOS_INT + unused/5 + _BINARY_OP_ADD_INT;
macro(BINARY_OP_SUBTRACT_INT) =
- _GUARD_BOTH_INT + unused/5 + _BINARY_OP_SUBTRACT_INT;
+ _GUARD_TOS_INT + _GUARD_NOS_INT + unused/5 +
_BINARY_OP_SUBTRACT_INT;
- op(_GUARD_BOTH_FLOAT, (left, right -- left, right)) {
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- EXIT_IF(!PyFloat_CheckExact(left_o));
- EXIT_IF(!PyFloat_CheckExact(right_o));
- }
-
- op(_GUARD_NOS_FLOAT, (left, unused -- left, unused)) {
+ op(_GUARD_NOS_FLOAT, (left, right -- left, right)) {
+ (void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
EXIT_IF(!PyFloat_CheckExact(left_o));
}
@@ -713,19 +707,11 @@ dummy_func(
}
macro(BINARY_OP_MULTIPLY_FLOAT) =
- _GUARD_BOTH_FLOAT + unused/5 + _BINARY_OP_MULTIPLY_FLOAT;
+ _GUARD_TOS_FLOAT + _GUARD_NOS_FLOAT + unused/5 +
_BINARY_OP_MULTIPLY_FLOAT;
macro(BINARY_OP_ADD_FLOAT) =
- _GUARD_BOTH_FLOAT + unused/5 + _BINARY_OP_ADD_FLOAT;
+ _GUARD_TOS_FLOAT + _GUARD_NOS_FLOAT + unused/5 +
_BINARY_OP_ADD_FLOAT;
macro(BINARY_OP_SUBTRACT_FLOAT) =
- _GUARD_BOTH_FLOAT + unused/5 + _BINARY_OP_SUBTRACT_FLOAT;
-
- op(_GUARD_BOTH_UNICODE, (left, right -- left, right)) {
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-
- EXIT_IF(!PyUnicode_CheckExact(left_o));
- EXIT_IF(!PyUnicode_CheckExact(right_o));
- }
+ _GUARD_TOS_FLOAT + _GUARD_NOS_FLOAT + unused/5 +
_BINARY_OP_SUBTRACT_FLOAT;
pure op(_BINARY_OP_ADD_UNICODE, (left, right -- res)) {
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
@@ -743,7 +729,7 @@ dummy_func(
}
macro(BINARY_OP_ADD_UNICODE) =
- _GUARD_BOTH_UNICODE + unused/5 + _BINARY_OP_ADD_UNICODE;
+ _GUARD_TOS_UNICODE + _GUARD_NOS_UNICODE + unused/5 +
_BINARY_OP_ADD_UNICODE;
// This is a subtle one. It's a super-instruction for
// BINARY_OP_ADD_UNICODE followed by STORE_FAST
@@ -822,7 +808,7 @@ dummy_func(
unused/1 + _GUARD_BINARY_OP_EXTEND + rewind/-4 + _BINARY_OP_EXTEND;
macro(BINARY_OP_INPLACE_ADD_UNICODE) =
- _GUARD_BOTH_UNICODE + unused/5 + _BINARY_OP_INPLACE_ADD_UNICODE;
+ _GUARD_TOS_UNICODE + _GUARD_NOS_UNICODE + unused/5 +
_BINARY_OP_INPLACE_ADD_UNICODE;
specializing op(_SPECIALIZE_BINARY_SLICE, (container, start, stop --
container, start, stop)) {
// Placeholder until we implement BINARY_SLICE specialization
@@ -875,11 +861,14 @@ dummy_func(
macro(STORE_SLICE) = _SPECIALIZE_STORE_SLICE + _STORE_SLICE;
- inst(BINARY_OP_SUBSCR_LIST_INT, (unused/5, list_st, sub_st -- res)) {
+ macro(BINARY_OP_SUBSCR_LIST_INT) =
+ _GUARD_TOS_INT + unused/5 + _BINARY_OP_SUBSCR_LIST_INT;
+
+ op(_BINARY_OP_SUBSCR_LIST_INT, (list_st, sub_st -- res)) {
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
- DEOPT_IF(!PyLong_CheckExact(sub));
+ assert(PyLong_CheckExact(sub));
DEOPT_IF(!PyList_CheckExact(list));
// Deopt unless 0 <= sub < PyList_Size(list)
@@ -901,12 +890,15 @@ dummy_func(
DECREF_INPUTS();
}
- inst(BINARY_OP_SUBSCR_STR_INT, (unused/5, str_st, sub_st -- res)) {
+ macro(BINARY_OP_SUBSCR_STR_INT) =
+ _GUARD_TOS_INT + _GUARD_NOS_UNICODE + unused/5 +
_BINARY_OP_SUBSCR_STR_INT;
+
+ op(_BINARY_OP_SUBSCR_STR_INT, (str_st, sub_st -- res)) {
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *str = PyStackRef_AsPyObjectBorrow(str_st);
- DEOPT_IF(!PyLong_CheckExact(sub));
- DEOPT_IF(!PyUnicode_CheckExact(str));
+ assert(PyLong_CheckExact(sub));
+ assert(PyUnicode_CheckExact(str));
DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub));
Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
DEOPT_IF(PyUnicode_GET_LENGTH(str) <= index);
@@ -921,11 +913,14 @@ dummy_func(
res = PyStackRef_FromPyObjectImmortal(res_o);
}
- inst(BINARY_OP_SUBSCR_TUPLE_INT, (unused/5, tuple_st, sub_st -- res)) {
+ macro(BINARY_OP_SUBSCR_TUPLE_INT) =
+ _GUARD_TOS_INT + unused/5 + _BINARY_OP_SUBSCR_TUPLE_INT;
+
+ op(_BINARY_OP_SUBSCR_TUPLE_INT, (tuple_st, sub_st -- res)) {
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st);
- DEOPT_IF(!PyLong_CheckExact(sub));
+ assert(PyLong_CheckExact(sub));
DEOPT_IF(!PyTuple_CheckExact(tuple));
// Deopt unless 0 <= sub < PyTuple_Size(list)
@@ -1025,11 +1020,14 @@ dummy_func(
macro(STORE_SUBSCR) = _SPECIALIZE_STORE_SUBSCR + _STORE_SUBSCR;
- inst(STORE_SUBSCR_LIST_INT, (unused/1, value, list_st, sub_st -- )) {
+ macro(STORE_SUBSCR_LIST_INT) =
+ _GUARD_TOS_INT + unused/1 + _STORE_SUBSCR_LIST_INT;
+
+ op(_STORE_SUBSCR_LIST_INT, (value, list_st, sub_st -- )) {
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
- DEOPT_IF(!PyLong_CheckExact(sub));
+ assert(PyLong_CheckExact(sub));
DEOPT_IF(!PyList_CheckExact(list));
// Ensure nonnegative, zero-or-one-digit ints.
@@ -2584,13 +2582,13 @@ dummy_func(
macro(COMPARE_OP) = _SPECIALIZE_COMPARE_OP + _COMPARE_OP;
macro(COMPARE_OP_FLOAT) =
- _GUARD_BOTH_FLOAT + unused/1 + _COMPARE_OP_FLOAT;
+ _GUARD_TOS_FLOAT + _GUARD_NOS_FLOAT + unused/1 + _COMPARE_OP_FLOAT;
macro(COMPARE_OP_INT) =
- _GUARD_BOTH_INT + unused/1 + _COMPARE_OP_INT;
+ _GUARD_TOS_INT + _GUARD_NOS_INT + unused/1 + _COMPARE_OP_INT;
macro(COMPARE_OP_STR) =
- _GUARD_BOTH_UNICODE + unused/1 + _COMPARE_OP_STR;
+ _GUARD_TOS_UNICODE + _GUARD_NOS_UNICODE + unused/1 +
_COMPARE_OP_STR;
op(_COMPARE_OP_FLOAT, (left, right -- res)) {
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 260d52be02c136..117c80c8d78dbc 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -760,6 +760,20 @@
break;
}
+ case _GUARD_NOS_UNICODE: {
+ _PyStackRef tos;
+ _PyStackRef nos;
+ tos = stack_pointer[-1];
+ nos = stack_pointer[-2];
+ (void)tos;
+ PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
+ if (!PyUnicode_CheckExact(o)) {
+ UOP_STAT_INC(uopcode, miss);
+ JUMP_TO_JUMP_TARGET();
+ }
+ break;
+ }
+
case _GUARD_TOS_UNICODE: {
_PyStackRef value;
value = stack_pointer[-1];
@@ -834,27 +848,12 @@
break;
}
- case _GUARD_BOTH_INT: {
+ case _GUARD_NOS_INT: {
_PyStackRef right;
_PyStackRef left;
right = stack_pointer[-1];
left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyLong_CheckExact(left_o)) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
- if (!PyLong_CheckExact(right_o)) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
- break;
- }
-
- case _GUARD_NOS_INT: {
- _PyStackRef left;
- left = stack_pointer[-2];
+ (void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
if (!PyLong_CheckExact(left_o)) {
UOP_STAT_INC(uopcode, miss);
@@ -958,27 +957,12 @@
break;
}
- case _GUARD_BOTH_FLOAT: {
+ case _GUARD_NOS_FLOAT: {
_PyStackRef right;
_PyStackRef left;
right = stack_pointer[-1];
left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyFloat_CheckExact(left_o)) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
- if (!PyFloat_CheckExact(right_o)) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
- break;
- }
-
- case _GUARD_NOS_FLOAT: {
- _PyStackRef left;
- left = stack_pointer[-2];
+ (void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
if (!PyFloat_CheckExact(left_o)) {
UOP_STAT_INC(uopcode, miss);
@@ -1079,24 +1063,6 @@
break;
}
- case _GUARD_BOTH_UNICODE: {
- _PyStackRef right;
- _PyStackRef left;
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyUnicode_CheckExact(left_o)) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
- if (!PyUnicode_CheckExact(right_o)) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
- break;
- }
-
case _BINARY_OP_ADD_UNICODE: {
_PyStackRef right;
_PyStackRef left;
@@ -1332,10 +1298,7 @@
list_st = stack_pointer[-2];
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
- if (!PyLong_CheckExact(sub)) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
+ assert(PyLong_CheckExact(sub));
if (!PyList_CheckExact(list)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
@@ -1390,14 +1353,8 @@
str_st = stack_pointer[-2];
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *str = PyStackRef_AsPyObjectBorrow(str_st);
- if (!PyLong_CheckExact(sub)) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
- if (!PyUnicode_CheckExact(str)) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
+ assert(PyLong_CheckExact(sub));
+ assert(PyUnicode_CheckExact(str));
if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
@@ -1436,10 +1393,7 @@
tuple_st = stack_pointer[-2];
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st);
- if (!PyLong_CheckExact(sub)) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
+ assert(PyLong_CheckExact(sub));
if (!PyTuple_CheckExact(tuple)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
@@ -1646,10 +1600,7 @@
value = stack_pointer[-3];
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
- if (!PyLong_CheckExact(sub)) {
- UOP_STAT_INC(uopcode, miss);
- JUMP_TO_JUMP_TARGET();
- }
+ assert(PyLong_CheckExact(sub));
if (!PyList_CheckExact(list)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index a4b5673c9e54b4..41ea054d3f5eea 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -92,21 +92,27 @@
next_instr += 6;
INSTRUCTION_STATS(BINARY_OP_ADD_FLOAT);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect
cache size");
+ _PyStackRef value;
_PyStackRef left;
_PyStackRef right;
_PyStackRef res;
- // _GUARD_BOTH_FLOAT
+ // _GUARD_TOS_FLOAT
{
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyFloat_CheckExact(left_o)) {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyFloat_CheckExact(value_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
}
- if (!PyFloat_CheckExact(right_o)) {
+ }
+ // _GUARD_NOS_FLOAT
+ {
+ right = value;
+ left = stack_pointer[-2];
+ (void)right;
+ PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
+ if (!PyFloat_CheckExact(left_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
@@ -145,21 +151,27 @@
next_instr += 6;
INSTRUCTION_STATS(BINARY_OP_ADD_INT);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect
cache size");
+ _PyStackRef value;
_PyStackRef left;
_PyStackRef right;
_PyStackRef res;
- // _GUARD_BOTH_INT
+ // _GUARD_TOS_INT
{
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyLong_CheckExact(left_o)) {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyLong_CheckExact(value_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
}
- if (!PyLong_CheckExact(right_o)) {
+ }
+ // _GUARD_NOS_INT
+ {
+ right = value;
+ left = stack_pointer[-2];
+ (void)right;
+ PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
+ if (!PyLong_CheckExact(left_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
@@ -200,21 +212,29 @@
next_instr += 6;
INSTRUCTION_STATS(BINARY_OP_ADD_UNICODE);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect
cache size");
+ _PyStackRef value;
+ _PyStackRef nos;
+ _PyStackRef tos;
_PyStackRef left;
_PyStackRef right;
_PyStackRef res;
- // _GUARD_BOTH_UNICODE
+ // _GUARD_TOS_UNICODE
{
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyUnicode_CheckExact(left_o)) {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyUnicode_CheckExact(value_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
}
- if (!PyUnicode_CheckExact(right_o)) {
+ }
+ // _GUARD_NOS_UNICODE
+ {
+ tos = value;
+ nos = stack_pointer[-2];
+ (void)tos;
+ PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
+ if (!PyUnicode_CheckExact(o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
@@ -223,6 +243,8 @@
/* Skip 5 cache entries */
// _BINARY_OP_ADD_UNICODE
{
+ right = tos;
+ left = nos;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
assert(PyUnicode_CheckExact(left_o));
@@ -317,20 +339,28 @@
next_instr += 6;
INSTRUCTION_STATS(BINARY_OP_INPLACE_ADD_UNICODE);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect
cache size");
+ _PyStackRef value;
+ _PyStackRef nos;
+ _PyStackRef tos;
_PyStackRef left;
_PyStackRef right;
- // _GUARD_BOTH_UNICODE
+ // _GUARD_TOS_UNICODE
{
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyUnicode_CheckExact(left_o)) {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyUnicode_CheckExact(value_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
}
- if (!PyUnicode_CheckExact(right_o)) {
+ }
+ // _GUARD_NOS_UNICODE
+ {
+ tos = value;
+ nos = stack_pointer[-2];
+ (void)tos;
+ PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
+ if (!PyUnicode_CheckExact(o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
@@ -339,6 +369,8 @@
/* Skip 5 cache entries */
// _BINARY_OP_INPLACE_ADD_UNICODE
{
+ right = tos;
+ left = nos;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
assert(PyUnicode_CheckExact(left_o));
assert(PyUnicode_CheckExact(PyStackRef_AsPyObjectBorrow(right)));
@@ -405,21 +437,27 @@
next_instr += 6;
INSTRUCTION_STATS(BINARY_OP_MULTIPLY_FLOAT);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect
cache size");
+ _PyStackRef value;
_PyStackRef left;
_PyStackRef right;
_PyStackRef res;
- // _GUARD_BOTH_FLOAT
+ // _GUARD_TOS_FLOAT
{
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyFloat_CheckExact(left_o)) {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyFloat_CheckExact(value_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
}
- if (!PyFloat_CheckExact(right_o)) {
+ }
+ // _GUARD_NOS_FLOAT
+ {
+ right = value;
+ left = stack_pointer[-2];
+ (void)right;
+ PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
+ if (!PyFloat_CheckExact(left_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
@@ -458,21 +496,27 @@
next_instr += 6;
INSTRUCTION_STATS(BINARY_OP_MULTIPLY_INT);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect
cache size");
+ _PyStackRef value;
_PyStackRef left;
_PyStackRef right;
_PyStackRef res;
- // _GUARD_BOTH_INT
+ // _GUARD_TOS_INT
{
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyLong_CheckExact(left_o)) {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyLong_CheckExact(value_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
}
- if (!PyLong_CheckExact(right_o)) {
+ }
+ // _GUARD_NOS_INT
+ {
+ right = value;
+ left = stack_pointer[-2];
+ (void)right;
+ PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
+ if (!PyLong_CheckExact(left_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
@@ -655,66 +699,76 @@
next_instr += 6;
INSTRUCTION_STATS(BINARY_OP_SUBSCR_LIST_INT);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect
cache size");
+ _PyStackRef value;
_PyStackRef list_st;
_PyStackRef sub_st;
_PyStackRef res;
- /* Skip 5 cache entries */
- sub_st = stack_pointer[-1];
- list_st = stack_pointer[-2];
- PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
- PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
- if (!PyLong_CheckExact(sub)) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
- }
- if (!PyList_CheckExact(list)) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
- }
- // Deopt unless 0 <= sub < PyList_Size(list)
- if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
- }
- Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
- #ifdef Py_GIL_DISABLED
- _PyFrame_SetStackPointer(frame, stack_pointer);
- PyObject *res_o = _PyList_GetItemRef((PyListObject*)list, index);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- if (res_o == NULL) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
+ // _GUARD_TOS_INT
+ {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyLong_CheckExact(value_o)) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
}
- STAT_INC(BINARY_OP, hit);
- res = PyStackRef_FromPyObjectSteal(res_o);
- #else
- if (index >= PyList_GET_SIZE(list)) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
+ /* Skip 5 cache entries */
+ // _BINARY_OP_SUBSCR_LIST_INT
+ {
+ sub_st = value;
+ list_st = stack_pointer[-2];
+ PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
+ PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
+ assert(PyLong_CheckExact(sub));
+ if (!PyList_CheckExact(list)) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
+ // Deopt unless 0 <= sub < PyList_Size(list)
+ if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
+ Py_ssize_t index =
((PyLongObject*)sub)->long_value.ob_digit[0];
+ #ifdef Py_GIL_DISABLED
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ PyObject *res_o = _PyList_GetItemRef((PyListObject*)list,
index);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
+ if (res_o == NULL) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
+ STAT_INC(BINARY_OP, hit);
+ res = PyStackRef_FromPyObjectSteal(res_o);
+ #else
+ if (index >= PyList_GET_SIZE(list)) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
+ STAT_INC(BINARY_OP, hit);
+ PyObject *res_o = PyList_GET_ITEM(list, index);
+ assert(res_o != NULL);
+ res = PyStackRef_FromPyObjectNew(res_o);
+ #endif
+ STAT_INC(BINARY_OP, hit);
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ _PyStackRef tmp = list_st;
+ list_st = res;
+ stack_pointer[-2] = list_st;
+ PyStackRef_CLOSE(tmp);
+ tmp = sub_st;
+ sub_st = PyStackRef_NULL;
+ stack_pointer[-1] = sub_st;
+ PyStackRef_CLOSE(tmp);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
+ stack_pointer += -1;
+ assert(WITHIN_STACK_BOUNDS());
}
- STAT_INC(BINARY_OP, hit);
- PyObject *res_o = PyList_GET_ITEM(list, index);
- assert(res_o != NULL);
- res = PyStackRef_FromPyObjectNew(res_o);
- #endif
- STAT_INC(BINARY_OP, hit);
- _PyFrame_SetStackPointer(frame, stack_pointer);
- _PyStackRef tmp = list_st;
- list_st = res;
- stack_pointer[-2] = list_st;
- PyStackRef_CLOSE(tmp);
- tmp = sub_st;
- sub_st = PyStackRef_NULL;
- stack_pointer[-1] = sub_st;
- PyStackRef_CLOSE(tmp);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- stack_pointer += -1;
- assert(WITHIN_STACK_BOUNDS());
DISPATCH();
}
@@ -729,51 +783,71 @@
next_instr += 6;
INSTRUCTION_STATS(BINARY_OP_SUBSCR_STR_INT);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect
cache size");
+ _PyStackRef value;
+ _PyStackRef nos;
+ _PyStackRef tos;
_PyStackRef str_st;
_PyStackRef sub_st;
_PyStackRef res;
- /* Skip 5 cache entries */
- sub_st = stack_pointer[-1];
- str_st = stack_pointer[-2];
- PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
- PyObject *str = PyStackRef_AsPyObjectBorrow(str_st);
- if (!PyLong_CheckExact(sub)) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
- }
- if (!PyUnicode_CheckExact(str)) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
- }
- if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
+ // _GUARD_TOS_INT
+ {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyLong_CheckExact(value_o)) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
}
- Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
- if (PyUnicode_GET_LENGTH(str) <= index) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
+ // _GUARD_NOS_UNICODE
+ {
+ tos = value;
+ nos = stack_pointer[-2];
+ (void)tos;
+ PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
+ if (!PyUnicode_CheckExact(o)) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
}
- // Specialize for reading an ASCII character from any string:
- Py_UCS4 c = PyUnicode_READ_CHAR(str, index);
- if (Py_ARRAY_LENGTH(_Py_SINGLETON(strings).ascii) <= c) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
+ /* Skip 5 cache entries */
+ // _BINARY_OP_SUBSCR_STR_INT
+ {
+ sub_st = tos;
+ str_st = nos;
+ PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
+ PyObject *str = PyStackRef_AsPyObjectBorrow(str_st);
+ assert(PyLong_CheckExact(sub));
+ assert(PyUnicode_CheckExact(str));
+ if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
+ Py_ssize_t index =
((PyLongObject*)sub)->long_value.ob_digit[0];
+ if (PyUnicode_GET_LENGTH(str) <= index) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
+ // Specialize for reading an ASCII character from any string:
+ Py_UCS4 c = PyUnicode_READ_CHAR(str, index);
+ if (Py_ARRAY_LENGTH(_Py_SINGLETON(strings).ascii) <= c) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
+ STAT_INC(BINARY_OP, hit);
+ PyObject *res_o = (PyObject*)&_Py_SINGLETON(strings).ascii[c];
+ PyStackRef_CLOSE_SPECIALIZED(sub_st, _PyLong_ExactDealloc);
+ stack_pointer += -2;
+ assert(WITHIN_STACK_BOUNDS());
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ PyStackRef_CLOSE(str_st);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
+ res = PyStackRef_FromPyObjectImmortal(res_o);
}
- STAT_INC(BINARY_OP, hit);
- PyObject *res_o = (PyObject*)&_Py_SINGLETON(strings).ascii[c];
- PyStackRef_CLOSE_SPECIALIZED(sub_st, _PyLong_ExactDealloc);
- stack_pointer += -2;
- assert(WITHIN_STACK_BOUNDS());
- _PyFrame_SetStackPointer(frame, stack_pointer);
- PyStackRef_CLOSE(str_st);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- res = PyStackRef_FromPyObjectImmortal(res_o);
stack_pointer[0] = res;
stack_pointer += 1;
assert(WITHIN_STACK_BOUNDS());
@@ -791,49 +865,59 @@
next_instr += 6;
INSTRUCTION_STATS(BINARY_OP_SUBSCR_TUPLE_INT);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect
cache size");
+ _PyStackRef value;
_PyStackRef tuple_st;
_PyStackRef sub_st;
_PyStackRef res;
- /* Skip 5 cache entries */
- sub_st = stack_pointer[-1];
- tuple_st = stack_pointer[-2];
- PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
- PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st);
- if (!PyLong_CheckExact(sub)) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
- }
- if (!PyTuple_CheckExact(tuple)) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
- }
- // Deopt unless 0 <= sub < PyTuple_Size(list)
- if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
+ // _GUARD_TOS_INT
+ {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyLong_CheckExact(value_o)) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
}
- Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
- if (index >= PyTuple_GET_SIZE(tuple)) {
- UPDATE_MISS_STATS(BINARY_OP);
- assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
- JUMP_TO_PREDICTED(BINARY_OP);
+ /* Skip 5 cache entries */
+ // _BINARY_OP_SUBSCR_TUPLE_INT
+ {
+ sub_st = value;
+ tuple_st = stack_pointer[-2];
+ PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
+ PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st);
+ assert(PyLong_CheckExact(sub));
+ if (!PyTuple_CheckExact(tuple)) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
+ // Deopt unless 0 <= sub < PyTuple_Size(list)
+ if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
+ Py_ssize_t index =
((PyLongObject*)sub)->long_value.ob_digit[0];
+ if (index >= PyTuple_GET_SIZE(tuple)) {
+ UPDATE_MISS_STATS(BINARY_OP);
+ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
+ JUMP_TO_PREDICTED(BINARY_OP);
+ }
+ STAT_INC(BINARY_OP, hit);
+ PyObject *res_o = PyTuple_GET_ITEM(tuple, index);
+ assert(res_o != NULL);
+ PyStackRef_CLOSE_SPECIALIZED(sub_st, _PyLong_ExactDealloc);
+ res = PyStackRef_FromPyObjectNew(res_o);
+ stack_pointer += -1;
+ assert(WITHIN_STACK_BOUNDS());
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ _PyStackRef tmp = tuple_st;
+ tuple_st = res;
+ stack_pointer[-1] = tuple_st;
+ PyStackRef_CLOSE(tmp);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
}
- STAT_INC(BINARY_OP, hit);
- PyObject *res_o = PyTuple_GET_ITEM(tuple, index);
- assert(res_o != NULL);
- PyStackRef_CLOSE_SPECIALIZED(sub_st, _PyLong_ExactDealloc);
- res = PyStackRef_FromPyObjectNew(res_o);
- stack_pointer += -1;
- assert(WITHIN_STACK_BOUNDS());
- _PyFrame_SetStackPointer(frame, stack_pointer);
- _PyStackRef tmp = tuple_st;
- tuple_st = res;
- stack_pointer[-1] = tuple_st;
- PyStackRef_CLOSE(tmp);
- stack_pointer = _PyFrame_GetStackPointer(frame);
DISPATCH();
}
@@ -848,21 +932,27 @@
next_instr += 6;
INSTRUCTION_STATS(BINARY_OP_SUBTRACT_FLOAT);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect
cache size");
+ _PyStackRef value;
_PyStackRef left;
_PyStackRef right;
_PyStackRef res;
- // _GUARD_BOTH_FLOAT
+ // _GUARD_TOS_FLOAT
{
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyFloat_CheckExact(left_o)) {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyFloat_CheckExact(value_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
}
- if (!PyFloat_CheckExact(right_o)) {
+ }
+ // _GUARD_NOS_FLOAT
+ {
+ right = value;
+ left = stack_pointer[-2];
+ (void)right;
+ PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
+ if (!PyFloat_CheckExact(left_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
@@ -901,21 +991,27 @@
next_instr += 6;
INSTRUCTION_STATS(BINARY_OP_SUBTRACT_INT);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect
cache size");
+ _PyStackRef value;
_PyStackRef left;
_PyStackRef right;
_PyStackRef res;
- // _GUARD_BOTH_INT
+ // _GUARD_TOS_INT
{
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyLong_CheckExact(left_o)) {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyLong_CheckExact(value_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
}
- if (!PyLong_CheckExact(right_o)) {
+ }
+ // _GUARD_NOS_INT
+ {
+ right = value;
+ left = stack_pointer[-2];
+ (void)right;
+ PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
+ if (!PyLong_CheckExact(left_o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
@@ -4513,21 +4609,27 @@
next_instr += 2;
INSTRUCTION_STATS(COMPARE_OP_FLOAT);
static_assert(INLINE_CACHE_ENTRIES_COMPARE_OP == 1, "incorrect
cache size");
+ _PyStackRef value;
_PyStackRef left;
_PyStackRef right;
_PyStackRef res;
- // _GUARD_BOTH_FLOAT
+ // _GUARD_TOS_FLOAT
{
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyFloat_CheckExact(left_o)) {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyFloat_CheckExact(value_o)) {
UPDATE_MISS_STATS(COMPARE_OP);
assert(_PyOpcode_Deopt[opcode] == (COMPARE_OP));
JUMP_TO_PREDICTED(COMPARE_OP);
}
- if (!PyFloat_CheckExact(right_o)) {
+ }
+ // _GUARD_NOS_FLOAT
+ {
+ right = value;
+ left = stack_pointer[-2];
+ (void)right;
+ PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
+ if (!PyFloat_CheckExact(left_o)) {
UPDATE_MISS_STATS(COMPARE_OP);
assert(_PyOpcode_Deopt[opcode] == (COMPARE_OP));
JUMP_TO_PREDICTED(COMPARE_OP);
@@ -4565,21 +4667,27 @@
next_instr += 2;
INSTRUCTION_STATS(COMPARE_OP_INT);
static_assert(INLINE_CACHE_ENTRIES_COMPARE_OP == 1, "incorrect
cache size");
+ _PyStackRef value;
_PyStackRef left;
_PyStackRef right;
_PyStackRef res;
- // _GUARD_BOTH_INT
+ // _GUARD_TOS_INT
{
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyLong_CheckExact(left_o)) {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyLong_CheckExact(value_o)) {
UPDATE_MISS_STATS(COMPARE_OP);
assert(_PyOpcode_Deopt[opcode] == (COMPARE_OP));
JUMP_TO_PREDICTED(COMPARE_OP);
}
- if (!PyLong_CheckExact(right_o)) {
+ }
+ // _GUARD_NOS_INT
+ {
+ right = value;
+ left = stack_pointer[-2];
+ (void)right;
+ PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
+ if (!PyLong_CheckExact(left_o)) {
UPDATE_MISS_STATS(COMPARE_OP);
assert(_PyOpcode_Deopt[opcode] == (COMPARE_OP));
JUMP_TO_PREDICTED(COMPARE_OP);
@@ -4629,21 +4737,29 @@
next_instr += 2;
INSTRUCTION_STATS(COMPARE_OP_STR);
static_assert(INLINE_CACHE_ENTRIES_COMPARE_OP == 1, "incorrect
cache size");
+ _PyStackRef value;
+ _PyStackRef nos;
+ _PyStackRef tos;
_PyStackRef left;
_PyStackRef right;
_PyStackRef res;
- // _GUARD_BOTH_UNICODE
+ // _GUARD_TOS_UNICODE
{
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
- PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
- if (!PyUnicode_CheckExact(left_o)) {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyUnicode_CheckExact(value_o)) {
UPDATE_MISS_STATS(COMPARE_OP);
assert(_PyOpcode_Deopt[opcode] == (COMPARE_OP));
JUMP_TO_PREDICTED(COMPARE_OP);
}
- if (!PyUnicode_CheckExact(right_o)) {
+ }
+ // _GUARD_NOS_UNICODE
+ {
+ tos = value;
+ nos = stack_pointer[-2];
+ (void)tos;
+ PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
+ if (!PyUnicode_CheckExact(o)) {
UPDATE_MISS_STATS(COMPARE_OP);
assert(_PyOpcode_Deopt[opcode] == (COMPARE_OP));
JUMP_TO_PREDICTED(COMPARE_OP);
@@ -4652,6 +4768,8 @@
/* Skip 1 cache entry */
// _COMPARE_OP_STR
{
+ right = tos;
+ left = nos;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
STAT_INC(COMPARE_OP, hit);
@@ -11346,56 +11464,65 @@
_PyStackRef value;
_PyStackRef list_st;
_PyStackRef sub_st;
- /* Skip 1 cache entry */
- sub_st = stack_pointer[-1];
- list_st = stack_pointer[-2];
- value = stack_pointer[-3];
- PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
- PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
- if (!PyLong_CheckExact(sub)) {
- UPDATE_MISS_STATS(STORE_SUBSCR);
- assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR));
- JUMP_TO_PREDICTED(STORE_SUBSCR);
- }
- if (!PyList_CheckExact(list)) {
- UPDATE_MISS_STATS(STORE_SUBSCR);
- assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR));
- JUMP_TO_PREDICTED(STORE_SUBSCR);
- }
- // Ensure nonnegative, zero-or-one-digit ints.
- if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
- UPDATE_MISS_STATS(STORE_SUBSCR);
- assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR));
- JUMP_TO_PREDICTED(STORE_SUBSCR);
- }
- Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0];
- if (!LOCK_OBJECT(list)) {
- UPDATE_MISS_STATS(STORE_SUBSCR);
- assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR));
- JUMP_TO_PREDICTED(STORE_SUBSCR);
- }
- // Ensure index < len(list)
- if (index >= PyList_GET_SIZE(list)) {
- UNLOCK_OBJECT(list);
- if (true) {
+ // _GUARD_TOS_INT
+ {
+ value = stack_pointer[-1];
+ PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
+ if (!PyLong_CheckExact(value_o)) {
UPDATE_MISS_STATS(STORE_SUBSCR);
assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR));
JUMP_TO_PREDICTED(STORE_SUBSCR);
}
}
- STAT_INC(STORE_SUBSCR, hit);
- PyObject *old_value = PyList_GET_ITEM(list, index);
- FT_ATOMIC_STORE_PTR_RELEASE(_PyList_ITEMS(list)[index],
+ /* Skip 1 cache entry */
+ // _STORE_SUBSCR_LIST_INT
+ {
+ sub_st = value;
+ list_st = stack_pointer[-2];
+ value = stack_pointer[-3];
+ PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
+ PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
+ assert(PyLong_CheckExact(sub));
+ if (!PyList_CheckExact(list)) {
+ UPDATE_MISS_STATS(STORE_SUBSCR);
+ assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR));
+ JUMP_TO_PREDICTED(STORE_SUBSCR);
+ }
+ // Ensure nonnegative, zero-or-one-digit ints.
+ if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
+ UPDATE_MISS_STATS(STORE_SUBSCR);
+ assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR));
+ JUMP_TO_PREDICTED(STORE_SUBSCR);
+ }
+ Py_ssize_t index =
((PyLongObject*)sub)->long_value.ob_digit[0];
+ if (!LOCK_OBJECT(list)) {
+ UPDATE_MISS_STATS(STORE_SUBSCR);
+ assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR));
+ JUMP_TO_PREDICTED(STORE_SUBSCR);
+ }
+ // Ensure index < len(list)
+ if (index >= PyList_GET_SIZE(list)) {
+ UNLOCK_OBJECT(list);
+ if (true) {
+ UPDATE_MISS_STATS(STORE_SUBSCR);
+ assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR));
+ JUMP_TO_PREDICTED(STORE_SUBSCR);
+ }
+ }
+ STAT_INC(STORE_SUBSCR, hit);
+ PyObject *old_value = PyList_GET_ITEM(list, index);
+ FT_ATOMIC_STORE_PTR_RELEASE(_PyList_ITEMS(list)[index],
PyStackRef_AsPyObjectSteal(value));
- assert(old_value != NULL);
- UNLOCK_OBJECT(list); // unlock before decrefs!
- PyStackRef_CLOSE_SPECIALIZED(sub_st, _PyLong_ExactDealloc);
- stack_pointer += -3;
- assert(WITHIN_STACK_BOUNDS());
- _PyFrame_SetStackPointer(frame, stack_pointer);
- PyStackRef_CLOSE(list_st);
- Py_DECREF(old_value);
- stack_pointer = _PyFrame_GetStackPointer(frame);
+ assert(old_value != NULL);
+ UNLOCK_OBJECT(list); // unlock before decrefs!
+ PyStackRef_CLOSE_SPECIALIZED(sub_st, _PyLong_ExactDealloc);
+ stack_pointer += -3;
+ assert(WITHIN_STACK_BOUNDS());
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+ PyStackRef_CLOSE(list_st);
+ Py_DECREF(old_value);
+ stack_pointer = _PyFrame_GetStackPointer(frame);
+ }
DISPATCH();
}
diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
index 163a8bfd2679db..a948cccbf858ac 100644
--- a/Python/optimizer_bytecodes.c
+++ b/Python/optimizer_bytecodes.c
@@ -104,22 +104,18 @@ dummy_func(void) {
res = sym_new_null(ctx);
}
- op(_GUARD_BOTH_INT, (left, right -- left, right)) {
- if (sym_matches_type(left, &PyLong_Type)) {
- if (sym_matches_type(right, &PyLong_Type)) {
- REPLACE_OP(this_instr, _NOP, 0, 0);
- }
- else {
- REPLACE_OP(this_instr, _GUARD_TOS_INT, 0, 0);
- }
+ op(_GUARD_TOS_INT, (tos -- tos)) {
+ if (sym_matches_type(tos, &PyLong_Type)) {
+ REPLACE_OP(this_instr, _NOP, 0, 0);
}
- else {
- if (sym_matches_type(right, &PyLong_Type)) {
- REPLACE_OP(this_instr, _GUARD_NOS_INT, 0, 0);
- }
+ sym_set_type(tos, &PyLong_Type);
+ }
+
+ op(_GUARD_NOS_INT, (nos, unused -- nos, unused)) {
+ if (sym_matches_type(nos, &PyLong_Type)) {
+ REPLACE_OP(this_instr, _NOP, 0, 0);
}
- sym_set_type(left, &PyLong_Type);
- sym_set_type(right, &PyLong_Type);
+ sym_set_type(nos, &PyLong_Type);
}
op(_GUARD_TYPE_VERSION, (type_version/2, owner -- owner)) {
@@ -145,32 +141,18 @@ dummy_func(void) {
}
}
- op(_GUARD_BOTH_FLOAT, (left, right -- left, right)) {
- if (sym_matches_type(left, &PyFloat_Type)) {
- if (sym_matches_type(right, &PyFloat_Type)) {
- REPLACE_OP(this_instr, _NOP, 0, 0);
- }
- else {
- REPLACE_OP(this_instr, _GUARD_TOS_FLOAT, 0, 0);
- }
- }
- else {
- if (sym_matches_type(right, &PyFloat_Type)) {
- REPLACE_OP(this_instr, _GUARD_NOS_FLOAT, 0, 0);
- }
+ op(_GUARD_TOS_FLOAT, (tos -- tos)) {
+ if (sym_matches_type(tos, &PyFloat_Type)) {
+ REPLACE_OP(this_instr, _NOP, 0, 0);
}
-
- sym_set_type(left, &PyFloat_Type);
- sym_set_type(right, &PyFloat_Type);
+ sym_set_type(tos, &PyFloat_Type);
}
- op(_GUARD_BOTH_UNICODE, (left, right -- left, right)) {
- if (sym_matches_type(left, &PyUnicode_Type) &&
- sym_matches_type(right, &PyUnicode_Type)) {
- REPLACE_OP(this_instr, _NOP, 0 ,0);
+ op(_GUARD_NOS_FLOAT, (nos, unused -- nos, unused)) {
+ if (sym_matches_type(nos, &PyFloat_Type)) {
+ REPLACE_OP(this_instr, _NOP, 0, 0);
}
- sym_set_type(left, &PyUnicode_Type);
- sym_set_type(right, &PyUnicode_Type);
+ sym_set_type(nos, &PyFloat_Type);
}
op(_BINARY_OP, (left, right -- res)) {
@@ -418,6 +400,13 @@ dummy_func(void) {
}
}
+ op(_GUARD_NOS_UNICODE, (nos, unused -- nos, unused)) {
+ if (sym_matches_type(nos, &PyUnicode_Type)) {
+ REPLACE_OP(this_instr, _NOP, 0, 0);
+ }
+ sym_set_type(nos, &PyUnicode_Type);
+ }
+
op(_GUARD_TOS_UNICODE, (value -- value)) {
if (sym_matches_type(value, &PyUnicode_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index f1280ba1e40a7f..6fdc81f1e5a01d 100644
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -217,6 +217,16 @@
break;
}
+ case _GUARD_NOS_UNICODE: {
+ JitOptSymbol *nos;
+ nos = stack_pointer[-2];
+ if (sym_matches_type(nos, &PyUnicode_Type)) {
+ REPLACE_OP(this_instr, _NOP, 0, 0);
+ }
+ sym_set_type(nos, &PyUnicode_Type);
+ break;
+ }
+
case _GUARD_TOS_UNICODE: {
JitOptSymbol *value;
value = stack_pointer[-1];
@@ -252,34 +262,23 @@
break;
}
- case _GUARD_BOTH_INT: {
- JitOptSymbol *right;
- JitOptSymbol *left;
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- if (sym_matches_type(left, &PyLong_Type)) {
- if (sym_matches_type(right, &PyLong_Type)) {
- REPLACE_OP(this_instr, _NOP, 0, 0);
- }
- else {
- REPLACE_OP(this_instr, _GUARD_TOS_INT, 0, 0);
- }
- }
- else {
- if (sym_matches_type(right, &PyLong_Type)) {
- REPLACE_OP(this_instr, _GUARD_NOS_INT, 0, 0);
- }
- }
- sym_set_type(left, &PyLong_Type);
- sym_set_type(right, &PyLong_Type);
- break;
- }
-
case _GUARD_NOS_INT: {
+ JitOptSymbol *nos;
+ nos = stack_pointer[-2];
+ if (sym_matches_type(nos, &PyLong_Type)) {
+ REPLACE_OP(this_instr, _NOP, 0, 0);
+ }
+ sym_set_type(nos, &PyLong_Type);
break;
}
case _GUARD_TOS_INT: {
+ JitOptSymbol *tos;
+ tos = stack_pointer[-1];
+ if (sym_matches_type(tos, &PyLong_Type)) {
+ REPLACE_OP(this_instr, _NOP, 0, 0);
+ }
+ sym_set_type(tos, &PyLong_Type);
break;
}
@@ -376,34 +375,23 @@
break;
}
- case _GUARD_BOTH_FLOAT: {
- JitOptSymbol *right;
- JitOptSymbol *left;
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- if (sym_matches_type(left, &PyFloat_Type)) {
- if (sym_matches_type(right, &PyFloat_Type)) {
- REPLACE_OP(this_instr, _NOP, 0, 0);
- }
- else {
- REPLACE_OP(this_instr, _GUARD_TOS_FLOAT, 0, 0);
- }
- }
- else {
- if (sym_matches_type(right, &PyFloat_Type)) {
- REPLACE_OP(this_instr, _GUARD_NOS_FLOAT, 0, 0);
- }
- }
- sym_set_type(left, &PyFloat_Type);
- sym_set_type(right, &PyFloat_Type);
- break;
- }
-
case _GUARD_NOS_FLOAT: {
+ JitOptSymbol *nos;
+ nos = stack_pointer[-2];
+ if (sym_matches_type(nos, &PyFloat_Type)) {
+ REPLACE_OP(this_instr, _NOP, 0, 0);
+ }
+ sym_set_type(nos, &PyFloat_Type);
break;
}
case _GUARD_TOS_FLOAT: {
+ JitOptSymbol *tos;
+ tos = stack_pointer[-1];
+ if (sym_matches_type(tos, &PyFloat_Type)) {
+ REPLACE_OP(this_instr, _NOP, 0, 0);
+ }
+ sym_set_type(tos, &PyFloat_Type);
break;
}
@@ -503,20 +491,6 @@
break;
}
- case _GUARD_BOTH_UNICODE: {
- JitOptSymbol *right;
- JitOptSymbol *left;
- right = stack_pointer[-1];
- left = stack_pointer[-2];
- if (sym_matches_type(left, &PyUnicode_Type) &&
- sym_matches_type(right, &PyUnicode_Type)) {
- REPLACE_OP(this_instr, _NOP, 0 ,0);
- }
- sym_set_type(left, &PyUnicode_Type);
- sym_set_type(right, &PyUnicode_Type);
- break;
- }
-
case _BINARY_OP_ADD_UNICODE: {
JitOptSymbol *right;
JitOptSymbol *left;
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
