From 15387dc0c5c43e2c9d32228cb36a973e9df4fb2e Mon Sep 17 00:00:00 2001 From: Chris Eibl <138194463+chris-eibl@users.noreply.github.com> Date: Sat, 3 Jan 2026 12:00:24 +0100 Subject: [PATCH 01/10] POC implementation of BINARY_OP_SUBSCR_NCSTR_INT passes the tests and brings bm_tomli back to normal, i.e. 15 % speedup --- Include/internal/pycore_opcode_metadata.h | 10 +- Include/internal/pycore_uop_ids.h | 2074 +++++++++++---------- Include/internal/pycore_uop_metadata.h | 15 + Include/opcode_ids.h | 143 +- Lib/_opcode_metadata.py | 144 +- Python/bytecodes.c | 24 + Python/executor_cases.c.h | 52 + Python/generated_cases.c.h | 89 + Python/opcode_targets.h | 9 +- Python/optimizer_cases.c.h | 16 + Python/specialize.c | 11 +- 11 files changed, 1400 insertions(+), 1187 deletions(-) diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h index 11a9d76640a439..006de127895201 100644 --- a/Include/internal/pycore_opcode_metadata.h +++ b/Include/internal/pycore_opcode_metadata.h @@ -62,6 +62,8 @@ int _PyOpcode_num_popped(int opcode, int oparg) { return 2; case BINARY_OP_SUBSCR_LIST_SLICE: return 2; + case BINARY_OP_SUBSCR_NCSTR_INT: + return 2; case BINARY_OP_SUBSCR_STR_INT: return 2; case BINARY_OP_SUBSCR_TUPLE_INT: @@ -547,6 +549,8 @@ int _PyOpcode_num_pushed(int opcode, int oparg) { return 1; case BINARY_OP_SUBSCR_LIST_SLICE: return 1; + case BINARY_OP_SUBSCR_NCSTR_INT: + return 1; case BINARY_OP_SUBSCR_STR_INT: return 1; case BINARY_OP_SUBSCR_TUPLE_INT: @@ -1090,6 +1094,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [BINARY_OP_SUBSCR_GETITEM] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, [BINARY_OP_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_SUBSCR_LIST_SLICE] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, + [BINARY_OP_SUBSCR_NCSTR_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 | HAS_ESCAPES_FLAG }, [BINARY_OP_SUBTRACT_FLOAT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG }, @@ -1340,6 +1345,7 @@ _PyOpcode_macro_expansion[256] = { [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 = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_LIST, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_LIST_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_LIST_SLICE] = { .nuops = 3, .uops = { { _GUARD_TOS_SLICE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_LIST, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_LIST_SLICE, OPARG_SIMPLE, 5 } } }, + [BINARY_OP_SUBSCR_NCSTR_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_NCSTR_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_STR_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_COMPACT_ASCII, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_STR_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_TUPLE_INT] = { .nuops = 6, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_TUPLE, OPARG_SIMPLE, 0 }, { _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_TUPLE_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBTRACT_FLOAT] = { .nuops = 5, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 } } }, @@ -1532,6 +1538,7 @@ const char *_PyOpcode_OpName[267] = { [BINARY_OP_SUBSCR_GETITEM] = "BINARY_OP_SUBSCR_GETITEM", [BINARY_OP_SUBSCR_LIST_INT] = "BINARY_OP_SUBSCR_LIST_INT", [BINARY_OP_SUBSCR_LIST_SLICE] = "BINARY_OP_SUBSCR_LIST_SLICE", + [BINARY_OP_SUBSCR_NCSTR_INT] = "BINARY_OP_SUBSCR_NCSTR_INT", [BINARY_OP_SUBSCR_STR_INT] = "BINARY_OP_SUBSCR_STR_INT", [BINARY_OP_SUBSCR_TUPLE_INT] = "BINARY_OP_SUBSCR_TUPLE_INT", [BINARY_OP_SUBTRACT_FLOAT] = "BINARY_OP_SUBTRACT_FLOAT", @@ -1794,7 +1801,6 @@ const uint8_t _PyOpcode_Deopt[256] = { [125] = 125, [126] = 126, [127] = 127, - [210] = 210, [211] = 211, [212] = 212, [213] = 213, @@ -1829,6 +1835,7 @@ const uint8_t _PyOpcode_Deopt[256] = { [BINARY_OP_SUBSCR_GETITEM] = BINARY_OP, [BINARY_OP_SUBSCR_LIST_INT] = BINARY_OP, [BINARY_OP_SUBSCR_LIST_SLICE] = BINARY_OP, + [BINARY_OP_SUBSCR_NCSTR_INT] = BINARY_OP, [BINARY_OP_SUBSCR_STR_INT] = BINARY_OP, [BINARY_OP_SUBSCR_TUPLE_INT] = BINARY_OP, [BINARY_OP_SUBTRACT_FLOAT] = BINARY_OP, @@ -2055,7 +2062,6 @@ const uint8_t _PyOpcode_Deopt[256] = { case 125: \ case 126: \ case 127: \ - case 210: \ case 211: \ case 212: \ case 213: \ diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index b06f4221c5963b..7dd90879741a3f 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -24,11 +24,12 @@ extern "C" { #define _BINARY_OP_SUBSCR_INIT_CALL 312 #define _BINARY_OP_SUBSCR_LIST_INT 313 #define _BINARY_OP_SUBSCR_LIST_SLICE 314 -#define _BINARY_OP_SUBSCR_STR_INT 315 -#define _BINARY_OP_SUBSCR_TUPLE_INT 316 -#define _BINARY_OP_SUBTRACT_FLOAT 317 -#define _BINARY_OP_SUBTRACT_INT 318 -#define _BINARY_SLICE 319 +#define _BINARY_OP_SUBSCR_NCSTR_INT 315 +#define _BINARY_OP_SUBSCR_STR_INT 316 +#define _BINARY_OP_SUBSCR_TUPLE_INT 317 +#define _BINARY_OP_SUBTRACT_FLOAT 318 +#define _BINARY_OP_SUBTRACT_INT 319 +#define _BINARY_SLICE 320 #define _BUILD_INTERPOLATION BUILD_INTERPOLATION #define _BUILD_LIST BUILD_LIST #define _BUILD_MAP BUILD_MAP @@ -37,150 +38,150 @@ extern "C" { #define _BUILD_STRING BUILD_STRING #define _BUILD_TEMPLATE BUILD_TEMPLATE #define _BUILD_TUPLE BUILD_TUPLE -#define _CALL_BUILTIN_CLASS 320 -#define _CALL_BUILTIN_FAST 321 -#define _CALL_BUILTIN_FAST_WITH_KEYWORDS 322 -#define _CALL_BUILTIN_O 323 +#define _CALL_BUILTIN_CLASS 321 +#define _CALL_BUILTIN_FAST 322 +#define _CALL_BUILTIN_FAST_WITH_KEYWORDS 323 +#define _CALL_BUILTIN_O 324 #define _CALL_INTRINSIC_1 CALL_INTRINSIC_1 #define _CALL_INTRINSIC_2 CALL_INTRINSIC_2 -#define _CALL_ISINSTANCE 324 -#define _CALL_KW_NON_PY 325 -#define _CALL_LEN 326 -#define _CALL_LIST_APPEND 327 -#define _CALL_METHOD_DESCRIPTOR_FAST 328 -#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 329 -#define _CALL_METHOD_DESCRIPTOR_NOARGS 330 -#define _CALL_METHOD_DESCRIPTOR_O 331 -#define _CALL_NON_PY_GENERAL 332 -#define _CALL_STR_1 333 -#define _CALL_TUPLE_1 334 -#define _CALL_TYPE_1 335 -#define _CHECK_AND_ALLOCATE_OBJECT 336 -#define _CHECK_ATTR_CLASS 337 -#define _CHECK_ATTR_METHOD_LAZY_DICT 338 -#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 339 +#define _CALL_ISINSTANCE 325 +#define _CALL_KW_NON_PY 326 +#define _CALL_LEN 327 +#define _CALL_LIST_APPEND 328 +#define _CALL_METHOD_DESCRIPTOR_FAST 329 +#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 330 +#define _CALL_METHOD_DESCRIPTOR_NOARGS 331 +#define _CALL_METHOD_DESCRIPTOR_O 332 +#define _CALL_NON_PY_GENERAL 333 +#define _CALL_STR_1 334 +#define _CALL_TUPLE_1 335 +#define _CALL_TYPE_1 336 +#define _CHECK_AND_ALLOCATE_OBJECT 337 +#define _CHECK_ATTR_CLASS 338 +#define _CHECK_ATTR_METHOD_LAZY_DICT 339 +#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 340 #define _CHECK_EG_MATCH CHECK_EG_MATCH #define _CHECK_EXC_MATCH CHECK_EXC_MATCH -#define _CHECK_FUNCTION_EXACT_ARGS 340 -#define _CHECK_FUNCTION_VERSION 341 -#define _CHECK_FUNCTION_VERSION_INLINE 342 -#define _CHECK_FUNCTION_VERSION_KW 343 -#define _CHECK_IS_NOT_PY_CALLABLE 344 -#define _CHECK_IS_NOT_PY_CALLABLE_KW 345 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES 346 -#define _CHECK_METHOD_VERSION 347 -#define _CHECK_METHOD_VERSION_KW 348 -#define _CHECK_PEP_523 349 -#define _CHECK_PERIODIC 350 -#define _CHECK_PERIODIC_AT_END 351 -#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 352 -#define _CHECK_RECURSION_REMAINING 353 -#define _CHECK_STACK_SPACE 354 -#define _CHECK_STACK_SPACE_OPERAND 355 -#define _CHECK_VALIDITY 356 -#define _COLD_DYNAMIC_EXIT 357 -#define _COLD_EXIT 358 -#define _COMPARE_OP 359 -#define _COMPARE_OP_FLOAT 360 -#define _COMPARE_OP_INT 361 -#define _COMPARE_OP_STR 362 -#define _CONTAINS_OP 363 -#define _CONTAINS_OP_DICT 364 -#define _CONTAINS_OP_SET 365 +#define _CHECK_FUNCTION_EXACT_ARGS 341 +#define _CHECK_FUNCTION_VERSION 342 +#define _CHECK_FUNCTION_VERSION_INLINE 343 +#define _CHECK_FUNCTION_VERSION_KW 344 +#define _CHECK_IS_NOT_PY_CALLABLE 345 +#define _CHECK_IS_NOT_PY_CALLABLE_KW 346 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES 347 +#define _CHECK_METHOD_VERSION 348 +#define _CHECK_METHOD_VERSION_KW 349 +#define _CHECK_PEP_523 350 +#define _CHECK_PERIODIC 351 +#define _CHECK_PERIODIC_AT_END 352 +#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 353 +#define _CHECK_RECURSION_REMAINING 354 +#define _CHECK_STACK_SPACE 355 +#define _CHECK_STACK_SPACE_OPERAND 356 +#define _CHECK_VALIDITY 357 +#define _COLD_DYNAMIC_EXIT 358 +#define _COLD_EXIT 359 +#define _COMPARE_OP 360 +#define _COMPARE_OP_FLOAT 361 +#define _COMPARE_OP_INT 362 +#define _COMPARE_OP_STR 363 +#define _CONTAINS_OP 364 +#define _CONTAINS_OP_DICT 365 +#define _CONTAINS_OP_SET 366 #define _CONVERT_VALUE CONVERT_VALUE -#define _COPY 366 -#define _COPY_1 367 -#define _COPY_2 368 -#define _COPY_3 369 +#define _COPY 367 +#define _COPY_1 368 +#define _COPY_2 369 +#define _COPY_3 370 #define _COPY_FREE_VARS COPY_FREE_VARS -#define _CREATE_INIT_FRAME 370 +#define _CREATE_INIT_FRAME 371 #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 371 +#define _DEOPT 372 #define _DICT_MERGE DICT_MERGE #define _DICT_UPDATE DICT_UPDATE -#define _DO_CALL 372 -#define _DO_CALL_FUNCTION_EX 373 -#define _DO_CALL_KW 374 -#define _DYNAMIC_EXIT 375 +#define _DO_CALL 373 +#define _DO_CALL_FUNCTION_EX 374 +#define _DO_CALL_KW 375 +#define _DYNAMIC_EXIT 376 #define _END_FOR END_FOR #define _END_SEND END_SEND -#define _ERROR_POP_N 376 +#define _ERROR_POP_N 377 #define _EXIT_INIT_CHECK EXIT_INIT_CHECK -#define _EXPAND_METHOD 377 -#define _EXPAND_METHOD_KW 378 -#define _FATAL_ERROR 379 +#define _EXPAND_METHOD 378 +#define _EXPAND_METHOD_KW 379 +#define _FATAL_ERROR 380 #define _FORMAT_SIMPLE FORMAT_SIMPLE #define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC -#define _FOR_ITER 380 -#define _FOR_ITER_GEN_FRAME 381 -#define _FOR_ITER_TIER_TWO 382 +#define _FOR_ITER 381 +#define _FOR_ITER_GEN_FRAME 382 +#define _FOR_ITER_TIER_TWO 383 #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 383 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS 384 -#define _GUARD_CALLABLE_ISINSTANCE 385 -#define _GUARD_CALLABLE_LEN 386 -#define _GUARD_CALLABLE_LIST_APPEND 387 -#define _GUARD_CALLABLE_STR_1 388 -#define _GUARD_CALLABLE_TUPLE_1 389 -#define _GUARD_CALLABLE_TYPE_1 390 -#define _GUARD_DORV_NO_DICT 391 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 392 -#define _GUARD_GLOBALS_VERSION 393 -#define _GUARD_IP_RETURN_GENERATOR 394 -#define _GUARD_IP_RETURN_VALUE 395 -#define _GUARD_IP_YIELD_VALUE 396 -#define _GUARD_IP__PUSH_FRAME 397 -#define _GUARD_IS_FALSE_POP 398 -#define _GUARD_IS_NONE_POP 399 -#define _GUARD_IS_NOT_NONE_POP 400 -#define _GUARD_IS_TRUE_POP 401 -#define _GUARD_KEYS_VERSION 402 -#define _GUARD_NOS_COMPACT_ASCII 403 -#define _GUARD_NOS_DICT 404 -#define _GUARD_NOS_FLOAT 405 -#define _GUARD_NOS_INT 406 -#define _GUARD_NOS_LIST 407 -#define _GUARD_NOS_NOT_NULL 408 -#define _GUARD_NOS_NULL 409 -#define _GUARD_NOS_OVERFLOWED 410 -#define _GUARD_NOS_TUPLE 411 -#define _GUARD_NOS_UNICODE 412 -#define _GUARD_NOT_EXHAUSTED_LIST 413 -#define _GUARD_NOT_EXHAUSTED_RANGE 414 -#define _GUARD_NOT_EXHAUSTED_TUPLE 415 -#define _GUARD_THIRD_NULL 416 -#define _GUARD_TOS_ANY_SET 417 -#define _GUARD_TOS_DICT 418 -#define _GUARD_TOS_FLOAT 419 -#define _GUARD_TOS_INT 420 -#define _GUARD_TOS_LIST 421 -#define _GUARD_TOS_OVERFLOWED 422 -#define _GUARD_TOS_SLICE 423 -#define _GUARD_TOS_TUPLE 424 -#define _GUARD_TOS_UNICODE 425 -#define _GUARD_TYPE_VERSION 426 -#define _GUARD_TYPE_VERSION_AND_LOCK 427 -#define _HANDLE_PENDING_AND_DEOPT 428 +#define _GUARD_BINARY_OP_EXTEND 384 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS 385 +#define _GUARD_CALLABLE_ISINSTANCE 386 +#define _GUARD_CALLABLE_LEN 387 +#define _GUARD_CALLABLE_LIST_APPEND 388 +#define _GUARD_CALLABLE_STR_1 389 +#define _GUARD_CALLABLE_TUPLE_1 390 +#define _GUARD_CALLABLE_TYPE_1 391 +#define _GUARD_DORV_NO_DICT 392 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 393 +#define _GUARD_GLOBALS_VERSION 394 +#define _GUARD_IP_RETURN_GENERATOR 395 +#define _GUARD_IP_RETURN_VALUE 396 +#define _GUARD_IP_YIELD_VALUE 397 +#define _GUARD_IP__PUSH_FRAME 398 +#define _GUARD_IS_FALSE_POP 399 +#define _GUARD_IS_NONE_POP 400 +#define _GUARD_IS_NOT_NONE_POP 401 +#define _GUARD_IS_TRUE_POP 402 +#define _GUARD_KEYS_VERSION 403 +#define _GUARD_NOS_COMPACT_ASCII 404 +#define _GUARD_NOS_DICT 405 +#define _GUARD_NOS_FLOAT 406 +#define _GUARD_NOS_INT 407 +#define _GUARD_NOS_LIST 408 +#define _GUARD_NOS_NOT_NULL 409 +#define _GUARD_NOS_NULL 410 +#define _GUARD_NOS_OVERFLOWED 411 +#define _GUARD_NOS_TUPLE 412 +#define _GUARD_NOS_UNICODE 413 +#define _GUARD_NOT_EXHAUSTED_LIST 414 +#define _GUARD_NOT_EXHAUSTED_RANGE 415 +#define _GUARD_NOT_EXHAUSTED_TUPLE 416 +#define _GUARD_THIRD_NULL 417 +#define _GUARD_TOS_ANY_SET 418 +#define _GUARD_TOS_DICT 419 +#define _GUARD_TOS_FLOAT 420 +#define _GUARD_TOS_INT 421 +#define _GUARD_TOS_LIST 422 +#define _GUARD_TOS_OVERFLOWED 423 +#define _GUARD_TOS_SLICE 424 +#define _GUARD_TOS_TUPLE 425 +#define _GUARD_TOS_UNICODE 426 +#define _GUARD_TYPE_VERSION 427 +#define _GUARD_TYPE_VERSION_AND_LOCK 428 +#define _HANDLE_PENDING_AND_DEOPT 429 #define _IMPORT_FROM IMPORT_FROM #define _IMPORT_NAME IMPORT_NAME -#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 429 -#define _INIT_CALL_PY_EXACT_ARGS 430 -#define _INIT_CALL_PY_EXACT_ARGS_0 431 -#define _INIT_CALL_PY_EXACT_ARGS_1 432 -#define _INIT_CALL_PY_EXACT_ARGS_2 433 -#define _INIT_CALL_PY_EXACT_ARGS_3 434 -#define _INIT_CALL_PY_EXACT_ARGS_4 435 -#define _INSERT_NULL 436 +#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 430 +#define _INIT_CALL_PY_EXACT_ARGS 431 +#define _INIT_CALL_PY_EXACT_ARGS_0 432 +#define _INIT_CALL_PY_EXACT_ARGS_1 433 +#define _INIT_CALL_PY_EXACT_ARGS_2 434 +#define _INIT_CALL_PY_EXACT_ARGS_3 435 +#define _INIT_CALL_PY_EXACT_ARGS_4 436 +#define _INSERT_NULL 437 #define _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER #define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION #define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD @@ -190,969 +191,970 @@ 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 437 -#define _IS_OP 438 -#define _ITER_CHECK_LIST 439 -#define _ITER_CHECK_RANGE 440 -#define _ITER_CHECK_TUPLE 441 -#define _ITER_JUMP_LIST 442 -#define _ITER_JUMP_RANGE 443 -#define _ITER_JUMP_TUPLE 444 -#define _ITER_NEXT_LIST 445 -#define _ITER_NEXT_LIST_TIER_TWO 446 -#define _ITER_NEXT_RANGE 447 -#define _ITER_NEXT_TUPLE 448 +#define _IS_NONE 438 +#define _IS_OP 439 +#define _ITER_CHECK_LIST 440 +#define _ITER_CHECK_RANGE 441 +#define _ITER_CHECK_TUPLE 442 +#define _ITER_JUMP_LIST 443 +#define _ITER_JUMP_RANGE 444 +#define _ITER_JUMP_TUPLE 445 +#define _ITER_NEXT_LIST 446 +#define _ITER_NEXT_LIST_TIER_TWO 447 +#define _ITER_NEXT_RANGE 448 +#define _ITER_NEXT_TUPLE 449 #define _JUMP_BACKWARD_NO_INTERRUPT JUMP_BACKWARD_NO_INTERRUPT -#define _JUMP_TO_TOP 449 +#define _JUMP_TO_TOP 450 #define _LIST_APPEND LIST_APPEND #define _LIST_EXTEND LIST_EXTEND -#define _LOAD_ATTR 450 -#define _LOAD_ATTR_CLASS 451 +#define _LOAD_ATTR 451 +#define _LOAD_ATTR_CLASS 452 #define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN -#define _LOAD_ATTR_INSTANCE_VALUE 452 -#define _LOAD_ATTR_METHOD_LAZY_DICT 453 -#define _LOAD_ATTR_METHOD_NO_DICT 454 -#define _LOAD_ATTR_METHOD_WITH_VALUES 455 -#define _LOAD_ATTR_MODULE 456 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 457 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 458 -#define _LOAD_ATTR_PROPERTY_FRAME 459 -#define _LOAD_ATTR_SLOT 460 -#define _LOAD_ATTR_WITH_HINT 461 +#define _LOAD_ATTR_INSTANCE_VALUE 453 +#define _LOAD_ATTR_METHOD_LAZY_DICT 454 +#define _LOAD_ATTR_METHOD_NO_DICT 455 +#define _LOAD_ATTR_METHOD_WITH_VALUES 456 +#define _LOAD_ATTR_MODULE 457 +#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 458 +#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 459 +#define _LOAD_ATTR_PROPERTY_FRAME 460 +#define _LOAD_ATTR_SLOT 461 +#define _LOAD_ATTR_WITH_HINT 462 #define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS -#define _LOAD_BYTECODE 462 +#define _LOAD_BYTECODE 463 #define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT #define _LOAD_CONST LOAD_CONST -#define _LOAD_CONST_INLINE 463 -#define _LOAD_CONST_INLINE_BORROW 464 -#define _LOAD_CONST_UNDER_INLINE 465 -#define _LOAD_CONST_UNDER_INLINE_BORROW 466 +#define _LOAD_CONST_INLINE 464 +#define _LOAD_CONST_INLINE_BORROW 465 +#define _LOAD_CONST_UNDER_INLINE 466 +#define _LOAD_CONST_UNDER_INLINE_BORROW 467 #define _LOAD_DEREF LOAD_DEREF -#define _LOAD_FAST 467 -#define _LOAD_FAST_0 468 -#define _LOAD_FAST_1 469 -#define _LOAD_FAST_2 470 -#define _LOAD_FAST_3 471 -#define _LOAD_FAST_4 472 -#define _LOAD_FAST_5 473 -#define _LOAD_FAST_6 474 -#define _LOAD_FAST_7 475 +#define _LOAD_FAST 468 +#define _LOAD_FAST_0 469 +#define _LOAD_FAST_1 470 +#define _LOAD_FAST_2 471 +#define _LOAD_FAST_3 472 +#define _LOAD_FAST_4 473 +#define _LOAD_FAST_5 474 +#define _LOAD_FAST_6 475 +#define _LOAD_FAST_7 476 #define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR -#define _LOAD_FAST_BORROW 476 -#define _LOAD_FAST_BORROW_0 477 -#define _LOAD_FAST_BORROW_1 478 -#define _LOAD_FAST_BORROW_2 479 -#define _LOAD_FAST_BORROW_3 480 -#define _LOAD_FAST_BORROW_4 481 -#define _LOAD_FAST_BORROW_5 482 -#define _LOAD_FAST_BORROW_6 483 -#define _LOAD_FAST_BORROW_7 484 +#define _LOAD_FAST_BORROW 477 +#define _LOAD_FAST_BORROW_0 478 +#define _LOAD_FAST_BORROW_1 479 +#define _LOAD_FAST_BORROW_2 480 +#define _LOAD_FAST_BORROW_3 481 +#define _LOAD_FAST_BORROW_4 482 +#define _LOAD_FAST_BORROW_5 483 +#define _LOAD_FAST_BORROW_6 484 +#define _LOAD_FAST_BORROW_7 485 #define _LOAD_FAST_CHECK LOAD_FAST_CHECK #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 485 -#define _LOAD_GLOBAL_BUILTINS 486 -#define _LOAD_GLOBAL_MODULE 487 +#define _LOAD_GLOBAL 486 +#define _LOAD_GLOBAL_BUILTINS 487 +#define _LOAD_GLOBAL_MODULE 488 #define _LOAD_LOCALS LOAD_LOCALS #define _LOAD_NAME LOAD_NAME -#define _LOAD_SMALL_INT 488 -#define _LOAD_SMALL_INT_0 489 -#define _LOAD_SMALL_INT_1 490 -#define _LOAD_SMALL_INT_2 491 -#define _LOAD_SMALL_INT_3 492 -#define _LOAD_SPECIAL 493 +#define _LOAD_SMALL_INT 489 +#define _LOAD_SMALL_INT_0 490 +#define _LOAD_SMALL_INT_1 491 +#define _LOAD_SMALL_INT_2 492 +#define _LOAD_SMALL_INT_3 493 +#define _LOAD_SPECIAL 494 #define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR #define _LOAD_SUPER_ATTR_METHOD LOAD_SUPER_ATTR_METHOD -#define _MAKE_CALLARGS_A_TUPLE 494 +#define _MAKE_CALLARGS_A_TUPLE 495 #define _MAKE_CELL MAKE_CELL #define _MAKE_FUNCTION MAKE_FUNCTION -#define _MAKE_WARM 495 +#define _MAKE_WARM 496 #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 496 -#define _MAYBE_EXPAND_METHOD_KW 497 -#define _MONITOR_CALL 498 -#define _MONITOR_CALL_KW 499 -#define _MONITOR_JUMP_BACKWARD 500 -#define _MONITOR_RESUME 501 +#define _MAYBE_EXPAND_METHOD 497 +#define _MAYBE_EXPAND_METHOD_KW 498 +#define _MONITOR_CALL 499 +#define _MONITOR_CALL_KW 500 +#define _MONITOR_JUMP_BACKWARD 501 +#define _MONITOR_RESUME 502 #define _NOP NOP -#define _POP_CALL 502 -#define _POP_CALL_LOAD_CONST_INLINE_BORROW 503 -#define _POP_CALL_ONE 504 -#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW 505 -#define _POP_CALL_TWO 506 -#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW 507 +#define _POP_CALL 503 +#define _POP_CALL_LOAD_CONST_INLINE_BORROW 504 +#define _POP_CALL_ONE 505 +#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW 506 +#define _POP_CALL_TWO 507 +#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW 508 #define _POP_EXCEPT POP_EXCEPT #define _POP_ITER POP_ITER -#define _POP_JUMP_IF_FALSE 508 -#define _POP_JUMP_IF_TRUE 509 +#define _POP_JUMP_IF_FALSE 509 +#define _POP_JUMP_IF_TRUE 510 #define _POP_TOP POP_TOP -#define _POP_TOP_FLOAT 510 -#define _POP_TOP_INT 511 -#define _POP_TOP_LOAD_CONST_INLINE 512 -#define _POP_TOP_LOAD_CONST_INLINE_BORROW 513 -#define _POP_TOP_NOP 514 -#define _POP_TOP_UNICODE 515 -#define _POP_TWO 516 -#define _POP_TWO_LOAD_CONST_INLINE_BORROW 517 +#define _POP_TOP_FLOAT 511 +#define _POP_TOP_INT 512 +#define _POP_TOP_LOAD_CONST_INLINE 513 +#define _POP_TOP_LOAD_CONST_INLINE_BORROW 514 +#define _POP_TOP_NOP 515 +#define _POP_TOP_UNICODE 516 +#define _POP_TWO 517 +#define _POP_TWO_LOAD_CONST_INLINE_BORROW 518 #define _PUSH_EXC_INFO PUSH_EXC_INFO -#define _PUSH_FRAME 518 +#define _PUSH_FRAME 519 #define _PUSH_NULL PUSH_NULL -#define _PUSH_NULL_CONDITIONAL 519 -#define _PY_FRAME_GENERAL 520 -#define _PY_FRAME_KW 521 -#define _QUICKEN_RESUME 522 -#define _REPLACE_WITH_TRUE 523 +#define _PUSH_NULL_CONDITIONAL 520 +#define _PY_FRAME_GENERAL 521 +#define _PY_FRAME_KW 522 +#define _QUICKEN_RESUME 523 +#define _REPLACE_WITH_TRUE 524 #define _RESUME_CHECK RESUME_CHECK #define _RETURN_GENERATOR RETURN_GENERATOR #define _RETURN_VALUE RETURN_VALUE -#define _SAVE_RETURN_OFFSET 524 -#define _SEND 525 -#define _SEND_GEN_FRAME 526 +#define _SAVE_RETURN_OFFSET 525 +#define _SEND 526 +#define _SEND_GEN_FRAME 527 #define _SETUP_ANNOTATIONS SETUP_ANNOTATIONS #define _SET_ADD SET_ADD #define _SET_FUNCTION_ATTRIBUTE SET_FUNCTION_ATTRIBUTE #define _SET_UPDATE SET_UPDATE -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW 527 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW 528 -#define _SPILL_OR_RELOAD 529 -#define _START_EXECUTOR 530 -#define _STORE_ATTR 531 -#define _STORE_ATTR_INSTANCE_VALUE 532 -#define _STORE_ATTR_SLOT 533 -#define _STORE_ATTR_WITH_HINT 534 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW 528 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW 529 +#define _SPILL_OR_RELOAD 530 +#define _START_EXECUTOR 531 +#define _STORE_ATTR 532 +#define _STORE_ATTR_INSTANCE_VALUE 533 +#define _STORE_ATTR_SLOT 534 +#define _STORE_ATTR_WITH_HINT 535 #define _STORE_DEREF STORE_DEREF #define _STORE_GLOBAL STORE_GLOBAL #define _STORE_NAME STORE_NAME -#define _STORE_SLICE 535 -#define _STORE_SUBSCR 536 -#define _STORE_SUBSCR_DICT 537 -#define _STORE_SUBSCR_LIST_INT 538 -#define _SWAP 539 -#define _SWAP_2 540 -#define _SWAP_3 541 -#define _SWAP_FAST 542 -#define _SWAP_FAST_0 543 -#define _SWAP_FAST_1 544 -#define _SWAP_FAST_2 545 -#define _SWAP_FAST_3 546 -#define _SWAP_FAST_4 547 -#define _SWAP_FAST_5 548 -#define _SWAP_FAST_6 549 -#define _SWAP_FAST_7 550 -#define _TIER2_RESUME_CHECK 551 -#define _TO_BOOL 552 +#define _STORE_SLICE 536 +#define _STORE_SUBSCR 537 +#define _STORE_SUBSCR_DICT 538 +#define _STORE_SUBSCR_LIST_INT 539 +#define _SWAP 540 +#define _SWAP_2 541 +#define _SWAP_3 542 +#define _SWAP_FAST 543 +#define _SWAP_FAST_0 544 +#define _SWAP_FAST_1 545 +#define _SWAP_FAST_2 546 +#define _SWAP_FAST_3 547 +#define _SWAP_FAST_4 548 +#define _SWAP_FAST_5 549 +#define _SWAP_FAST_6 550 +#define _SWAP_FAST_7 551 +#define _TIER2_RESUME_CHECK 552 +#define _TO_BOOL 553 #define _TO_BOOL_BOOL TO_BOOL_BOOL #define _TO_BOOL_INT TO_BOOL_INT -#define _TO_BOOL_LIST 553 +#define _TO_BOOL_LIST 554 #define _TO_BOOL_NONE TO_BOOL_NONE -#define _TO_BOOL_STR 554 +#define _TO_BOOL_STR 555 #define _TRACE_RECORD TRACE_RECORD #define _UNARY_INVERT UNARY_INVERT #define _UNARY_NEGATIVE UNARY_NEGATIVE #define _UNARY_NOT UNARY_NOT #define _UNPACK_EX UNPACK_EX -#define _UNPACK_SEQUENCE 555 -#define _UNPACK_SEQUENCE_LIST 556 -#define _UNPACK_SEQUENCE_TUPLE 557 -#define _UNPACK_SEQUENCE_TWO_TUPLE 558 +#define _UNPACK_SEQUENCE 556 +#define _UNPACK_SEQUENCE_LIST 557 +#define _UNPACK_SEQUENCE_TUPLE 558 +#define _UNPACK_SEQUENCE_TWO_TUPLE 559 #define _WITH_EXCEPT_START WITH_EXCEPT_START #define _YIELD_VALUE YIELD_VALUE -#define MAX_UOP_ID 558 -#define _BINARY_OP_r21 559 -#define _BINARY_OP_ADD_FLOAT_r03 560 -#define _BINARY_OP_ADD_FLOAT_r13 561 -#define _BINARY_OP_ADD_FLOAT_r23 562 -#define _BINARY_OP_ADD_INT_r03 563 -#define _BINARY_OP_ADD_INT_r13 564 -#define _BINARY_OP_ADD_INT_r23 565 -#define _BINARY_OP_ADD_UNICODE_r03 566 -#define _BINARY_OP_ADD_UNICODE_r13 567 -#define _BINARY_OP_ADD_UNICODE_r23 568 -#define _BINARY_OP_EXTEND_r21 569 -#define _BINARY_OP_INPLACE_ADD_UNICODE_r21 570 -#define _BINARY_OP_MULTIPLY_FLOAT_r03 571 -#define _BINARY_OP_MULTIPLY_FLOAT_r13 572 -#define _BINARY_OP_MULTIPLY_FLOAT_r23 573 -#define _BINARY_OP_MULTIPLY_INT_r03 574 -#define _BINARY_OP_MULTIPLY_INT_r13 575 -#define _BINARY_OP_MULTIPLY_INT_r23 576 -#define _BINARY_OP_SUBSCR_CHECK_FUNC_r23 577 -#define _BINARY_OP_SUBSCR_DICT_r21 578 -#define _BINARY_OP_SUBSCR_INIT_CALL_r01 579 -#define _BINARY_OP_SUBSCR_INIT_CALL_r11 580 -#define _BINARY_OP_SUBSCR_INIT_CALL_r21 581 -#define _BINARY_OP_SUBSCR_INIT_CALL_r31 582 -#define _BINARY_OP_SUBSCR_LIST_INT_r23 583 -#define _BINARY_OP_SUBSCR_LIST_SLICE_r21 584 -#define _BINARY_OP_SUBSCR_STR_INT_r23 585 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r03 586 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r13 587 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r23 588 -#define _BINARY_OP_SUBTRACT_FLOAT_r03 589 -#define _BINARY_OP_SUBTRACT_FLOAT_r13 590 -#define _BINARY_OP_SUBTRACT_FLOAT_r23 591 -#define _BINARY_OP_SUBTRACT_INT_r03 592 -#define _BINARY_OP_SUBTRACT_INT_r13 593 -#define _BINARY_OP_SUBTRACT_INT_r23 594 -#define _BINARY_SLICE_r31 595 -#define _BUILD_INTERPOLATION_r01 596 -#define _BUILD_LIST_r01 597 -#define _BUILD_MAP_r01 598 -#define _BUILD_SET_r01 599 -#define _BUILD_SLICE_r01 600 -#define _BUILD_STRING_r01 601 -#define _BUILD_TEMPLATE_r21 602 -#define _BUILD_TUPLE_r01 603 -#define _CALL_BUILTIN_CLASS_r01 604 -#define _CALL_BUILTIN_FAST_r01 605 -#define _CALL_BUILTIN_FAST_WITH_KEYWORDS_r01 606 -#define _CALL_BUILTIN_O_r03 607 -#define _CALL_INTRINSIC_1_r11 608 -#define _CALL_INTRINSIC_2_r21 609 -#define _CALL_ISINSTANCE_r31 610 -#define _CALL_KW_NON_PY_r11 611 -#define _CALL_LEN_r33 612 -#define _CALL_LIST_APPEND_r03 613 -#define _CALL_LIST_APPEND_r13 614 -#define _CALL_LIST_APPEND_r23 615 -#define _CALL_LIST_APPEND_r33 616 -#define _CALL_METHOD_DESCRIPTOR_FAST_r01 617 -#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r01 618 -#define _CALL_METHOD_DESCRIPTOR_NOARGS_r01 619 -#define _CALL_METHOD_DESCRIPTOR_O_r03 620 -#define _CALL_NON_PY_GENERAL_r01 621 -#define _CALL_STR_1_r32 622 -#define _CALL_TUPLE_1_r32 623 -#define _CALL_TYPE_1_r02 624 -#define _CALL_TYPE_1_r12 625 -#define _CALL_TYPE_1_r22 626 -#define _CALL_TYPE_1_r32 627 -#define _CHECK_AND_ALLOCATE_OBJECT_r00 628 -#define _CHECK_ATTR_CLASS_r01 629 -#define _CHECK_ATTR_CLASS_r11 630 -#define _CHECK_ATTR_CLASS_r22 631 -#define _CHECK_ATTR_CLASS_r33 632 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r01 633 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r11 634 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r22 635 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r33 636 -#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS_r00 637 -#define _CHECK_EG_MATCH_r22 638 -#define _CHECK_EXC_MATCH_r22 639 -#define _CHECK_FUNCTION_EXACT_ARGS_r00 640 -#define _CHECK_FUNCTION_VERSION_r00 641 -#define _CHECK_FUNCTION_VERSION_INLINE_r00 642 -#define _CHECK_FUNCTION_VERSION_INLINE_r11 643 -#define _CHECK_FUNCTION_VERSION_INLINE_r22 644 -#define _CHECK_FUNCTION_VERSION_INLINE_r33 645 -#define _CHECK_FUNCTION_VERSION_KW_r11 646 -#define _CHECK_IS_NOT_PY_CALLABLE_r00 647 -#define _CHECK_IS_NOT_PY_CALLABLE_KW_r11 648 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r01 649 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r11 650 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r22 651 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r33 652 -#define _CHECK_METHOD_VERSION_r00 653 -#define _CHECK_METHOD_VERSION_KW_r11 654 -#define _CHECK_PEP_523_r00 655 -#define _CHECK_PEP_523_r11 656 -#define _CHECK_PEP_523_r22 657 -#define _CHECK_PEP_523_r33 658 -#define _CHECK_PERIODIC_r00 659 -#define _CHECK_PERIODIC_AT_END_r00 660 -#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM_r00 661 -#define _CHECK_RECURSION_REMAINING_r00 662 -#define _CHECK_RECURSION_REMAINING_r11 663 -#define _CHECK_RECURSION_REMAINING_r22 664 -#define _CHECK_RECURSION_REMAINING_r33 665 -#define _CHECK_STACK_SPACE_r00 666 -#define _CHECK_STACK_SPACE_OPERAND_r00 667 -#define _CHECK_STACK_SPACE_OPERAND_r11 668 -#define _CHECK_STACK_SPACE_OPERAND_r22 669 -#define _CHECK_STACK_SPACE_OPERAND_r33 670 -#define _CHECK_VALIDITY_r00 671 -#define _CHECK_VALIDITY_r11 672 -#define _CHECK_VALIDITY_r22 673 -#define _CHECK_VALIDITY_r33 674 -#define _COLD_DYNAMIC_EXIT_r00 675 -#define _COLD_EXIT_r00 676 -#define _COMPARE_OP_r21 677 -#define _COMPARE_OP_FLOAT_r03 678 -#define _COMPARE_OP_FLOAT_r13 679 -#define _COMPARE_OP_FLOAT_r23 680 -#define _COMPARE_OP_INT_r23 681 -#define _COMPARE_OP_STR_r23 682 -#define _CONTAINS_OP_r21 683 -#define _CONTAINS_OP_DICT_r21 684 -#define _CONTAINS_OP_SET_r21 685 -#define _CONVERT_VALUE_r11 686 -#define _COPY_r01 687 -#define _COPY_1_r02 688 -#define _COPY_1_r12 689 -#define _COPY_1_r23 690 -#define _COPY_2_r03 691 -#define _COPY_2_r13 692 -#define _COPY_2_r23 693 -#define _COPY_3_r03 694 -#define _COPY_3_r13 695 -#define _COPY_3_r23 696 -#define _COPY_3_r33 697 -#define _COPY_FREE_VARS_r00 698 -#define _COPY_FREE_VARS_r11 699 -#define _COPY_FREE_VARS_r22 700 -#define _COPY_FREE_VARS_r33 701 -#define _CREATE_INIT_FRAME_r01 702 -#define _DELETE_ATTR_r10 703 -#define _DELETE_DEREF_r00 704 -#define _DELETE_FAST_r00 705 -#define _DELETE_GLOBAL_r00 706 -#define _DELETE_NAME_r00 707 -#define _DELETE_SUBSCR_r20 708 -#define _DEOPT_r00 709 -#define _DEOPT_r10 710 -#define _DEOPT_r20 711 -#define _DEOPT_r30 712 -#define _DICT_MERGE_r10 713 -#define _DICT_UPDATE_r10 714 -#define _DO_CALL_r01 715 -#define _DO_CALL_FUNCTION_EX_r31 716 -#define _DO_CALL_KW_r11 717 -#define _DYNAMIC_EXIT_r00 718 -#define _DYNAMIC_EXIT_r10 719 -#define _DYNAMIC_EXIT_r20 720 -#define _DYNAMIC_EXIT_r30 721 -#define _END_FOR_r10 722 -#define _END_SEND_r21 723 -#define _ERROR_POP_N_r00 724 -#define _EXIT_INIT_CHECK_r10 725 -#define _EXIT_TRACE_r00 726 -#define _EXIT_TRACE_r10 727 -#define _EXIT_TRACE_r20 728 -#define _EXIT_TRACE_r30 729 -#define _EXPAND_METHOD_r00 730 -#define _EXPAND_METHOD_KW_r11 731 -#define _FATAL_ERROR_r00 732 -#define _FATAL_ERROR_r11 733 -#define _FATAL_ERROR_r22 734 -#define _FATAL_ERROR_r33 735 -#define _FORMAT_SIMPLE_r11 736 -#define _FORMAT_WITH_SPEC_r21 737 -#define _FOR_ITER_r23 738 -#define _FOR_ITER_GEN_FRAME_r03 739 -#define _FOR_ITER_GEN_FRAME_r13 740 -#define _FOR_ITER_GEN_FRAME_r23 741 -#define _FOR_ITER_TIER_TWO_r23 742 -#define _GET_AITER_r11 743 -#define _GET_ANEXT_r12 744 -#define _GET_AWAITABLE_r11 745 -#define _GET_ITER_r12 746 -#define _GET_LEN_r12 747 -#define _GET_YIELD_FROM_ITER_r11 748 -#define _GUARD_BINARY_OP_EXTEND_r22 749 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r02 750 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r12 751 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r22 752 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r33 753 -#define _GUARD_CALLABLE_ISINSTANCE_r03 754 -#define _GUARD_CALLABLE_ISINSTANCE_r13 755 -#define _GUARD_CALLABLE_ISINSTANCE_r23 756 -#define _GUARD_CALLABLE_ISINSTANCE_r33 757 -#define _GUARD_CALLABLE_LEN_r03 758 -#define _GUARD_CALLABLE_LEN_r13 759 -#define _GUARD_CALLABLE_LEN_r23 760 -#define _GUARD_CALLABLE_LEN_r33 761 -#define _GUARD_CALLABLE_LIST_APPEND_r03 762 -#define _GUARD_CALLABLE_LIST_APPEND_r13 763 -#define _GUARD_CALLABLE_LIST_APPEND_r23 764 -#define _GUARD_CALLABLE_LIST_APPEND_r33 765 -#define _GUARD_CALLABLE_STR_1_r03 766 -#define _GUARD_CALLABLE_STR_1_r13 767 -#define _GUARD_CALLABLE_STR_1_r23 768 -#define _GUARD_CALLABLE_STR_1_r33 769 -#define _GUARD_CALLABLE_TUPLE_1_r03 770 -#define _GUARD_CALLABLE_TUPLE_1_r13 771 -#define _GUARD_CALLABLE_TUPLE_1_r23 772 -#define _GUARD_CALLABLE_TUPLE_1_r33 773 -#define _GUARD_CALLABLE_TYPE_1_r03 774 -#define _GUARD_CALLABLE_TYPE_1_r13 775 -#define _GUARD_CALLABLE_TYPE_1_r23 776 -#define _GUARD_CALLABLE_TYPE_1_r33 777 -#define _GUARD_DORV_NO_DICT_r01 778 -#define _GUARD_DORV_NO_DICT_r11 779 -#define _GUARD_DORV_NO_DICT_r22 780 -#define _GUARD_DORV_NO_DICT_r33 781 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 782 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 783 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 784 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 785 -#define _GUARD_GLOBALS_VERSION_r00 786 -#define _GUARD_GLOBALS_VERSION_r11 787 -#define _GUARD_GLOBALS_VERSION_r22 788 -#define _GUARD_GLOBALS_VERSION_r33 789 -#define _GUARD_IP_RETURN_GENERATOR_r00 790 -#define _GUARD_IP_RETURN_GENERATOR_r11 791 -#define _GUARD_IP_RETURN_GENERATOR_r22 792 -#define _GUARD_IP_RETURN_GENERATOR_r33 793 -#define _GUARD_IP_RETURN_VALUE_r00 794 -#define _GUARD_IP_RETURN_VALUE_r11 795 -#define _GUARD_IP_RETURN_VALUE_r22 796 -#define _GUARD_IP_RETURN_VALUE_r33 797 -#define _GUARD_IP_YIELD_VALUE_r00 798 -#define _GUARD_IP_YIELD_VALUE_r11 799 -#define _GUARD_IP_YIELD_VALUE_r22 800 -#define _GUARD_IP_YIELD_VALUE_r33 801 -#define _GUARD_IP__PUSH_FRAME_r00 802 -#define _GUARD_IP__PUSH_FRAME_r11 803 -#define _GUARD_IP__PUSH_FRAME_r22 804 -#define _GUARD_IP__PUSH_FRAME_r33 805 -#define _GUARD_IS_FALSE_POP_r00 806 -#define _GUARD_IS_FALSE_POP_r10 807 -#define _GUARD_IS_FALSE_POP_r21 808 -#define _GUARD_IS_FALSE_POP_r32 809 -#define _GUARD_IS_NONE_POP_r00 810 -#define _GUARD_IS_NONE_POP_r10 811 -#define _GUARD_IS_NONE_POP_r21 812 -#define _GUARD_IS_NONE_POP_r32 813 -#define _GUARD_IS_NOT_NONE_POP_r10 814 -#define _GUARD_IS_TRUE_POP_r00 815 -#define _GUARD_IS_TRUE_POP_r10 816 -#define _GUARD_IS_TRUE_POP_r21 817 -#define _GUARD_IS_TRUE_POP_r32 818 -#define _GUARD_KEYS_VERSION_r01 819 -#define _GUARD_KEYS_VERSION_r11 820 -#define _GUARD_KEYS_VERSION_r22 821 -#define _GUARD_KEYS_VERSION_r33 822 -#define _GUARD_NOS_COMPACT_ASCII_r02 823 -#define _GUARD_NOS_COMPACT_ASCII_r12 824 -#define _GUARD_NOS_COMPACT_ASCII_r22 825 -#define _GUARD_NOS_COMPACT_ASCII_r33 826 -#define _GUARD_NOS_DICT_r02 827 -#define _GUARD_NOS_DICT_r12 828 -#define _GUARD_NOS_DICT_r22 829 -#define _GUARD_NOS_DICT_r33 830 -#define _GUARD_NOS_FLOAT_r02 831 -#define _GUARD_NOS_FLOAT_r12 832 -#define _GUARD_NOS_FLOAT_r22 833 -#define _GUARD_NOS_FLOAT_r33 834 -#define _GUARD_NOS_INT_r02 835 -#define _GUARD_NOS_INT_r12 836 -#define _GUARD_NOS_INT_r22 837 -#define _GUARD_NOS_INT_r33 838 -#define _GUARD_NOS_LIST_r02 839 -#define _GUARD_NOS_LIST_r12 840 -#define _GUARD_NOS_LIST_r22 841 -#define _GUARD_NOS_LIST_r33 842 -#define _GUARD_NOS_NOT_NULL_r02 843 -#define _GUARD_NOS_NOT_NULL_r12 844 -#define _GUARD_NOS_NOT_NULL_r22 845 -#define _GUARD_NOS_NOT_NULL_r33 846 -#define _GUARD_NOS_NULL_r02 847 -#define _GUARD_NOS_NULL_r12 848 -#define _GUARD_NOS_NULL_r22 849 -#define _GUARD_NOS_NULL_r33 850 -#define _GUARD_NOS_OVERFLOWED_r02 851 -#define _GUARD_NOS_OVERFLOWED_r12 852 -#define _GUARD_NOS_OVERFLOWED_r22 853 -#define _GUARD_NOS_OVERFLOWED_r33 854 -#define _GUARD_NOS_TUPLE_r02 855 -#define _GUARD_NOS_TUPLE_r12 856 -#define _GUARD_NOS_TUPLE_r22 857 -#define _GUARD_NOS_TUPLE_r33 858 -#define _GUARD_NOS_UNICODE_r02 859 -#define _GUARD_NOS_UNICODE_r12 860 -#define _GUARD_NOS_UNICODE_r22 861 -#define _GUARD_NOS_UNICODE_r33 862 -#define _GUARD_NOT_EXHAUSTED_LIST_r02 863 -#define _GUARD_NOT_EXHAUSTED_LIST_r12 864 -#define _GUARD_NOT_EXHAUSTED_LIST_r22 865 -#define _GUARD_NOT_EXHAUSTED_LIST_r33 866 -#define _GUARD_NOT_EXHAUSTED_RANGE_r02 867 -#define _GUARD_NOT_EXHAUSTED_RANGE_r12 868 -#define _GUARD_NOT_EXHAUSTED_RANGE_r22 869 -#define _GUARD_NOT_EXHAUSTED_RANGE_r33 870 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 871 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 872 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 873 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 874 -#define _GUARD_THIRD_NULL_r03 875 -#define _GUARD_THIRD_NULL_r13 876 -#define _GUARD_THIRD_NULL_r23 877 -#define _GUARD_THIRD_NULL_r33 878 -#define _GUARD_TOS_ANY_SET_r01 879 -#define _GUARD_TOS_ANY_SET_r11 880 -#define _GUARD_TOS_ANY_SET_r22 881 -#define _GUARD_TOS_ANY_SET_r33 882 -#define _GUARD_TOS_DICT_r01 883 -#define _GUARD_TOS_DICT_r11 884 -#define _GUARD_TOS_DICT_r22 885 -#define _GUARD_TOS_DICT_r33 886 -#define _GUARD_TOS_FLOAT_r01 887 -#define _GUARD_TOS_FLOAT_r11 888 -#define _GUARD_TOS_FLOAT_r22 889 -#define _GUARD_TOS_FLOAT_r33 890 -#define _GUARD_TOS_INT_r01 891 -#define _GUARD_TOS_INT_r11 892 -#define _GUARD_TOS_INT_r22 893 -#define _GUARD_TOS_INT_r33 894 -#define _GUARD_TOS_LIST_r01 895 -#define _GUARD_TOS_LIST_r11 896 -#define _GUARD_TOS_LIST_r22 897 -#define _GUARD_TOS_LIST_r33 898 -#define _GUARD_TOS_OVERFLOWED_r01 899 -#define _GUARD_TOS_OVERFLOWED_r11 900 -#define _GUARD_TOS_OVERFLOWED_r22 901 -#define _GUARD_TOS_OVERFLOWED_r33 902 -#define _GUARD_TOS_SLICE_r01 903 -#define _GUARD_TOS_SLICE_r11 904 -#define _GUARD_TOS_SLICE_r22 905 -#define _GUARD_TOS_SLICE_r33 906 -#define _GUARD_TOS_TUPLE_r01 907 -#define _GUARD_TOS_TUPLE_r11 908 -#define _GUARD_TOS_TUPLE_r22 909 -#define _GUARD_TOS_TUPLE_r33 910 -#define _GUARD_TOS_UNICODE_r01 911 -#define _GUARD_TOS_UNICODE_r11 912 -#define _GUARD_TOS_UNICODE_r22 913 -#define _GUARD_TOS_UNICODE_r33 914 -#define _GUARD_TYPE_VERSION_r01 915 -#define _GUARD_TYPE_VERSION_r11 916 -#define _GUARD_TYPE_VERSION_r22 917 -#define _GUARD_TYPE_VERSION_r33 918 -#define _GUARD_TYPE_VERSION_AND_LOCK_r01 919 -#define _GUARD_TYPE_VERSION_AND_LOCK_r11 920 -#define _GUARD_TYPE_VERSION_AND_LOCK_r22 921 -#define _GUARD_TYPE_VERSION_AND_LOCK_r33 922 -#define _HANDLE_PENDING_AND_DEOPT_r00 923 -#define _HANDLE_PENDING_AND_DEOPT_r10 924 -#define _HANDLE_PENDING_AND_DEOPT_r20 925 -#define _HANDLE_PENDING_AND_DEOPT_r30 926 -#define _IMPORT_FROM_r12 927 -#define _IMPORT_NAME_r21 928 -#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 929 -#define _INIT_CALL_PY_EXACT_ARGS_r01 930 -#define _INIT_CALL_PY_EXACT_ARGS_0_r01 931 -#define _INIT_CALL_PY_EXACT_ARGS_1_r01 932 -#define _INIT_CALL_PY_EXACT_ARGS_2_r01 933 -#define _INIT_CALL_PY_EXACT_ARGS_3_r01 934 -#define _INIT_CALL_PY_EXACT_ARGS_4_r01 935 -#define _INSERT_NULL_r10 936 -#define _INSTRUMENTED_FOR_ITER_r23 937 -#define _INSTRUMENTED_INSTRUCTION_r00 938 -#define _INSTRUMENTED_JUMP_FORWARD_r00 939 -#define _INSTRUMENTED_JUMP_FORWARD_r11 940 -#define _INSTRUMENTED_JUMP_FORWARD_r22 941 -#define _INSTRUMENTED_JUMP_FORWARD_r33 942 -#define _INSTRUMENTED_LINE_r00 943 -#define _INSTRUMENTED_NOT_TAKEN_r00 944 -#define _INSTRUMENTED_NOT_TAKEN_r11 945 -#define _INSTRUMENTED_NOT_TAKEN_r22 946 -#define _INSTRUMENTED_NOT_TAKEN_r33 947 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 948 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 949 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 950 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 951 -#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 952 -#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 953 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 954 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 955 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 956 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 957 -#define _IS_NONE_r11 958 -#define _IS_OP_r03 959 -#define _IS_OP_r13 960 -#define _IS_OP_r23 961 -#define _ITER_CHECK_LIST_r02 962 -#define _ITER_CHECK_LIST_r12 963 -#define _ITER_CHECK_LIST_r22 964 -#define _ITER_CHECK_LIST_r33 965 -#define _ITER_CHECK_RANGE_r02 966 -#define _ITER_CHECK_RANGE_r12 967 -#define _ITER_CHECK_RANGE_r22 968 -#define _ITER_CHECK_RANGE_r33 969 -#define _ITER_CHECK_TUPLE_r02 970 -#define _ITER_CHECK_TUPLE_r12 971 -#define _ITER_CHECK_TUPLE_r22 972 -#define _ITER_CHECK_TUPLE_r33 973 -#define _ITER_JUMP_LIST_r02 974 -#define _ITER_JUMP_LIST_r12 975 -#define _ITER_JUMP_LIST_r22 976 -#define _ITER_JUMP_LIST_r33 977 -#define _ITER_JUMP_RANGE_r02 978 -#define _ITER_JUMP_RANGE_r12 979 -#define _ITER_JUMP_RANGE_r22 980 -#define _ITER_JUMP_RANGE_r33 981 -#define _ITER_JUMP_TUPLE_r02 982 -#define _ITER_JUMP_TUPLE_r12 983 -#define _ITER_JUMP_TUPLE_r22 984 -#define _ITER_JUMP_TUPLE_r33 985 -#define _ITER_NEXT_LIST_r23 986 -#define _ITER_NEXT_LIST_TIER_TWO_r23 987 -#define _ITER_NEXT_RANGE_r03 988 -#define _ITER_NEXT_RANGE_r13 989 -#define _ITER_NEXT_RANGE_r23 990 -#define _ITER_NEXT_TUPLE_r03 991 -#define _ITER_NEXT_TUPLE_r13 992 -#define _ITER_NEXT_TUPLE_r23 993 -#define _JUMP_BACKWARD_NO_INTERRUPT_r00 994 -#define _JUMP_BACKWARD_NO_INTERRUPT_r11 995 -#define _JUMP_BACKWARD_NO_INTERRUPT_r22 996 -#define _JUMP_BACKWARD_NO_INTERRUPT_r33 997 -#define _JUMP_TO_TOP_r00 998 -#define _LIST_APPEND_r10 999 -#define _LIST_EXTEND_r10 1000 -#define _LOAD_ATTR_r10 1001 -#define _LOAD_ATTR_CLASS_r11 1002 -#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_r11 1003 -#define _LOAD_ATTR_INSTANCE_VALUE_r02 1004 -#define _LOAD_ATTR_INSTANCE_VALUE_r12 1005 -#define _LOAD_ATTR_INSTANCE_VALUE_r23 1006 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 1007 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 1008 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 1009 -#define _LOAD_ATTR_METHOD_NO_DICT_r02 1010 -#define _LOAD_ATTR_METHOD_NO_DICT_r12 1011 -#define _LOAD_ATTR_METHOD_NO_DICT_r23 1012 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 1013 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 1014 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 1015 -#define _LOAD_ATTR_MODULE_r11 1016 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 1017 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 1018 -#define _LOAD_ATTR_PROPERTY_FRAME_r11 1019 -#define _LOAD_ATTR_SLOT_r02 1020 -#define _LOAD_ATTR_SLOT_r12 1021 -#define _LOAD_ATTR_SLOT_r23 1022 -#define _LOAD_ATTR_WITH_HINT_r12 1023 -#define _LOAD_BUILD_CLASS_r01 1024 -#define _LOAD_BYTECODE_r00 1025 -#define _LOAD_COMMON_CONSTANT_r01 1026 -#define _LOAD_COMMON_CONSTANT_r12 1027 -#define _LOAD_COMMON_CONSTANT_r23 1028 -#define _LOAD_CONST_r01 1029 -#define _LOAD_CONST_r12 1030 -#define _LOAD_CONST_r23 1031 -#define _LOAD_CONST_INLINE_r01 1032 -#define _LOAD_CONST_INLINE_r12 1033 -#define _LOAD_CONST_INLINE_r23 1034 -#define _LOAD_CONST_INLINE_BORROW_r01 1035 -#define _LOAD_CONST_INLINE_BORROW_r12 1036 -#define _LOAD_CONST_INLINE_BORROW_r23 1037 -#define _LOAD_CONST_UNDER_INLINE_r02 1038 -#define _LOAD_CONST_UNDER_INLINE_r12 1039 -#define _LOAD_CONST_UNDER_INLINE_r23 1040 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r02 1041 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r12 1042 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r23 1043 -#define _LOAD_DEREF_r01 1044 -#define _LOAD_FAST_r01 1045 -#define _LOAD_FAST_r12 1046 -#define _LOAD_FAST_r23 1047 -#define _LOAD_FAST_0_r01 1048 -#define _LOAD_FAST_0_r12 1049 -#define _LOAD_FAST_0_r23 1050 -#define _LOAD_FAST_1_r01 1051 -#define _LOAD_FAST_1_r12 1052 -#define _LOAD_FAST_1_r23 1053 -#define _LOAD_FAST_2_r01 1054 -#define _LOAD_FAST_2_r12 1055 -#define _LOAD_FAST_2_r23 1056 -#define _LOAD_FAST_3_r01 1057 -#define _LOAD_FAST_3_r12 1058 -#define _LOAD_FAST_3_r23 1059 -#define _LOAD_FAST_4_r01 1060 -#define _LOAD_FAST_4_r12 1061 -#define _LOAD_FAST_4_r23 1062 -#define _LOAD_FAST_5_r01 1063 -#define _LOAD_FAST_5_r12 1064 -#define _LOAD_FAST_5_r23 1065 -#define _LOAD_FAST_6_r01 1066 -#define _LOAD_FAST_6_r12 1067 -#define _LOAD_FAST_6_r23 1068 -#define _LOAD_FAST_7_r01 1069 -#define _LOAD_FAST_7_r12 1070 -#define _LOAD_FAST_7_r23 1071 -#define _LOAD_FAST_AND_CLEAR_r01 1072 -#define _LOAD_FAST_AND_CLEAR_r12 1073 -#define _LOAD_FAST_AND_CLEAR_r23 1074 -#define _LOAD_FAST_BORROW_r01 1075 -#define _LOAD_FAST_BORROW_r12 1076 -#define _LOAD_FAST_BORROW_r23 1077 -#define _LOAD_FAST_BORROW_0_r01 1078 -#define _LOAD_FAST_BORROW_0_r12 1079 -#define _LOAD_FAST_BORROW_0_r23 1080 -#define _LOAD_FAST_BORROW_1_r01 1081 -#define _LOAD_FAST_BORROW_1_r12 1082 -#define _LOAD_FAST_BORROW_1_r23 1083 -#define _LOAD_FAST_BORROW_2_r01 1084 -#define _LOAD_FAST_BORROW_2_r12 1085 -#define _LOAD_FAST_BORROW_2_r23 1086 -#define _LOAD_FAST_BORROW_3_r01 1087 -#define _LOAD_FAST_BORROW_3_r12 1088 -#define _LOAD_FAST_BORROW_3_r23 1089 -#define _LOAD_FAST_BORROW_4_r01 1090 -#define _LOAD_FAST_BORROW_4_r12 1091 -#define _LOAD_FAST_BORROW_4_r23 1092 -#define _LOAD_FAST_BORROW_5_r01 1093 -#define _LOAD_FAST_BORROW_5_r12 1094 -#define _LOAD_FAST_BORROW_5_r23 1095 -#define _LOAD_FAST_BORROW_6_r01 1096 -#define _LOAD_FAST_BORROW_6_r12 1097 -#define _LOAD_FAST_BORROW_6_r23 1098 -#define _LOAD_FAST_BORROW_7_r01 1099 -#define _LOAD_FAST_BORROW_7_r12 1100 -#define _LOAD_FAST_BORROW_7_r23 1101 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1102 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1103 -#define _LOAD_FAST_CHECK_r01 1104 -#define _LOAD_FAST_CHECK_r12 1105 -#define _LOAD_FAST_CHECK_r23 1106 -#define _LOAD_FAST_LOAD_FAST_r02 1107 -#define _LOAD_FAST_LOAD_FAST_r13 1108 -#define _LOAD_FROM_DICT_OR_DEREF_r11 1109 -#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1110 -#define _LOAD_GLOBAL_r00 1111 -#define _LOAD_GLOBAL_BUILTINS_r01 1112 -#define _LOAD_GLOBAL_MODULE_r01 1113 -#define _LOAD_LOCALS_r01 1114 -#define _LOAD_LOCALS_r12 1115 -#define _LOAD_LOCALS_r23 1116 -#define _LOAD_NAME_r01 1117 -#define _LOAD_SMALL_INT_r01 1118 -#define _LOAD_SMALL_INT_r12 1119 -#define _LOAD_SMALL_INT_r23 1120 -#define _LOAD_SMALL_INT_0_r01 1121 -#define _LOAD_SMALL_INT_0_r12 1122 -#define _LOAD_SMALL_INT_0_r23 1123 -#define _LOAD_SMALL_INT_1_r01 1124 -#define _LOAD_SMALL_INT_1_r12 1125 -#define _LOAD_SMALL_INT_1_r23 1126 -#define _LOAD_SMALL_INT_2_r01 1127 -#define _LOAD_SMALL_INT_2_r12 1128 -#define _LOAD_SMALL_INT_2_r23 1129 -#define _LOAD_SMALL_INT_3_r01 1130 -#define _LOAD_SMALL_INT_3_r12 1131 -#define _LOAD_SMALL_INT_3_r23 1132 -#define _LOAD_SPECIAL_r00 1133 -#define _LOAD_SUPER_ATTR_ATTR_r31 1134 -#define _LOAD_SUPER_ATTR_METHOD_r32 1135 -#define _MAKE_CALLARGS_A_TUPLE_r33 1136 -#define _MAKE_CELL_r00 1137 -#define _MAKE_FUNCTION_r11 1138 -#define _MAKE_WARM_r00 1139 -#define _MAKE_WARM_r11 1140 -#define _MAKE_WARM_r22 1141 -#define _MAKE_WARM_r33 1142 -#define _MAP_ADD_r20 1143 -#define _MATCH_CLASS_r31 1144 -#define _MATCH_KEYS_r23 1145 -#define _MATCH_MAPPING_r02 1146 -#define _MATCH_MAPPING_r12 1147 -#define _MATCH_MAPPING_r23 1148 -#define _MATCH_SEQUENCE_r02 1149 -#define _MATCH_SEQUENCE_r12 1150 -#define _MATCH_SEQUENCE_r23 1151 -#define _MAYBE_EXPAND_METHOD_r00 1152 -#define _MAYBE_EXPAND_METHOD_KW_r11 1153 -#define _MONITOR_CALL_r00 1154 -#define _MONITOR_CALL_KW_r11 1155 -#define _MONITOR_JUMP_BACKWARD_r00 1156 -#define _MONITOR_JUMP_BACKWARD_r11 1157 -#define _MONITOR_JUMP_BACKWARD_r22 1158 -#define _MONITOR_JUMP_BACKWARD_r33 1159 -#define _MONITOR_RESUME_r00 1160 -#define _NOP_r00 1161 -#define _NOP_r11 1162 -#define _NOP_r22 1163 -#define _NOP_r33 1164 -#define _POP_CALL_r20 1165 -#define _POP_CALL_LOAD_CONST_INLINE_BORROW_r21 1166 -#define _POP_CALL_ONE_r30 1167 -#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW_r31 1168 -#define _POP_CALL_TWO_r30 1169 -#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW_r31 1170 -#define _POP_EXCEPT_r10 1171 -#define _POP_ITER_r20 1172 -#define _POP_JUMP_IF_FALSE_r00 1173 -#define _POP_JUMP_IF_FALSE_r10 1174 -#define _POP_JUMP_IF_FALSE_r21 1175 -#define _POP_JUMP_IF_FALSE_r32 1176 -#define _POP_JUMP_IF_TRUE_r00 1177 -#define _POP_JUMP_IF_TRUE_r10 1178 -#define _POP_JUMP_IF_TRUE_r21 1179 -#define _POP_JUMP_IF_TRUE_r32 1180 -#define _POP_TOP_r10 1181 -#define _POP_TOP_FLOAT_r00 1182 -#define _POP_TOP_FLOAT_r10 1183 -#define _POP_TOP_FLOAT_r21 1184 -#define _POP_TOP_FLOAT_r32 1185 -#define _POP_TOP_INT_r00 1186 -#define _POP_TOP_INT_r10 1187 -#define _POP_TOP_INT_r21 1188 -#define _POP_TOP_INT_r32 1189 -#define _POP_TOP_LOAD_CONST_INLINE_r11 1190 -#define _POP_TOP_LOAD_CONST_INLINE_BORROW_r11 1191 -#define _POP_TOP_NOP_r00 1192 -#define _POP_TOP_NOP_r10 1193 -#define _POP_TOP_NOP_r21 1194 -#define _POP_TOP_NOP_r32 1195 -#define _POP_TOP_UNICODE_r00 1196 -#define _POP_TOP_UNICODE_r10 1197 -#define _POP_TOP_UNICODE_r21 1198 -#define _POP_TOP_UNICODE_r32 1199 -#define _POP_TWO_r20 1200 -#define _POP_TWO_LOAD_CONST_INLINE_BORROW_r21 1201 -#define _PUSH_EXC_INFO_r02 1202 -#define _PUSH_EXC_INFO_r12 1203 -#define _PUSH_EXC_INFO_r23 1204 -#define _PUSH_FRAME_r10 1205 -#define _PUSH_NULL_r01 1206 -#define _PUSH_NULL_r12 1207 -#define _PUSH_NULL_r23 1208 -#define _PUSH_NULL_CONDITIONAL_r00 1209 -#define _PY_FRAME_GENERAL_r01 1210 -#define _PY_FRAME_KW_r11 1211 -#define _QUICKEN_RESUME_r00 1212 -#define _QUICKEN_RESUME_r11 1213 -#define _QUICKEN_RESUME_r22 1214 -#define _QUICKEN_RESUME_r33 1215 -#define _REPLACE_WITH_TRUE_r11 1216 -#define _RESUME_CHECK_r00 1217 -#define _RESUME_CHECK_r11 1218 -#define _RESUME_CHECK_r22 1219 -#define _RESUME_CHECK_r33 1220 -#define _RETURN_GENERATOR_r01 1221 -#define _RETURN_VALUE_r11 1222 -#define _SAVE_RETURN_OFFSET_r00 1223 -#define _SAVE_RETURN_OFFSET_r11 1224 -#define _SAVE_RETURN_OFFSET_r22 1225 -#define _SAVE_RETURN_OFFSET_r33 1226 -#define _SEND_r22 1227 -#define _SEND_GEN_FRAME_r22 1228 -#define _SETUP_ANNOTATIONS_r00 1229 -#define _SET_ADD_r10 1230 -#define _SET_FUNCTION_ATTRIBUTE_r01 1231 -#define _SET_FUNCTION_ATTRIBUTE_r11 1232 -#define _SET_FUNCTION_ATTRIBUTE_r21 1233 -#define _SET_FUNCTION_ATTRIBUTE_r32 1234 -#define _SET_IP_r00 1235 -#define _SET_IP_r11 1236 -#define _SET_IP_r22 1237 -#define _SET_IP_r33 1238 -#define _SET_UPDATE_r10 1239 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r02 1240 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r12 1241 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r22 1242 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r32 1243 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r03 1244 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r13 1245 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r23 1246 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r33 1247 -#define _SPILL_OR_RELOAD_r01 1248 -#define _SPILL_OR_RELOAD_r02 1249 -#define _SPILL_OR_RELOAD_r03 1250 -#define _SPILL_OR_RELOAD_r10 1251 -#define _SPILL_OR_RELOAD_r12 1252 -#define _SPILL_OR_RELOAD_r13 1253 -#define _SPILL_OR_RELOAD_r20 1254 -#define _SPILL_OR_RELOAD_r21 1255 -#define _SPILL_OR_RELOAD_r23 1256 -#define _SPILL_OR_RELOAD_r30 1257 -#define _SPILL_OR_RELOAD_r31 1258 -#define _SPILL_OR_RELOAD_r32 1259 -#define _START_EXECUTOR_r00 1260 -#define _STORE_ATTR_r20 1261 -#define _STORE_ATTR_INSTANCE_VALUE_r21 1262 -#define _STORE_ATTR_SLOT_r21 1263 -#define _STORE_ATTR_WITH_HINT_r21 1264 -#define _STORE_DEREF_r10 1265 -#define _STORE_FAST_LOAD_FAST_r11 1266 -#define _STORE_FAST_STORE_FAST_r20 1267 -#define _STORE_GLOBAL_r10 1268 -#define _STORE_NAME_r10 1269 -#define _STORE_SLICE_r30 1270 -#define _STORE_SUBSCR_r30 1271 -#define _STORE_SUBSCR_DICT_r31 1272 -#define _STORE_SUBSCR_LIST_INT_r32 1273 -#define _SWAP_r11 1274 -#define _SWAP_2_r02 1275 -#define _SWAP_2_r12 1276 -#define _SWAP_2_r22 1277 -#define _SWAP_2_r33 1278 -#define _SWAP_3_r03 1279 -#define _SWAP_3_r13 1280 -#define _SWAP_3_r23 1281 -#define _SWAP_3_r33 1282 -#define _SWAP_FAST_r01 1283 -#define _SWAP_FAST_r11 1284 -#define _SWAP_FAST_r22 1285 -#define _SWAP_FAST_r33 1286 -#define _SWAP_FAST_0_r01 1287 -#define _SWAP_FAST_0_r11 1288 -#define _SWAP_FAST_0_r22 1289 -#define _SWAP_FAST_0_r33 1290 -#define _SWAP_FAST_1_r01 1291 -#define _SWAP_FAST_1_r11 1292 -#define _SWAP_FAST_1_r22 1293 -#define _SWAP_FAST_1_r33 1294 -#define _SWAP_FAST_2_r01 1295 -#define _SWAP_FAST_2_r11 1296 -#define _SWAP_FAST_2_r22 1297 -#define _SWAP_FAST_2_r33 1298 -#define _SWAP_FAST_3_r01 1299 -#define _SWAP_FAST_3_r11 1300 -#define _SWAP_FAST_3_r22 1301 -#define _SWAP_FAST_3_r33 1302 -#define _SWAP_FAST_4_r01 1303 -#define _SWAP_FAST_4_r11 1304 -#define _SWAP_FAST_4_r22 1305 -#define _SWAP_FAST_4_r33 1306 -#define _SWAP_FAST_5_r01 1307 -#define _SWAP_FAST_5_r11 1308 -#define _SWAP_FAST_5_r22 1309 -#define _SWAP_FAST_5_r33 1310 -#define _SWAP_FAST_6_r01 1311 -#define _SWAP_FAST_6_r11 1312 -#define _SWAP_FAST_6_r22 1313 -#define _SWAP_FAST_6_r33 1314 -#define _SWAP_FAST_7_r01 1315 -#define _SWAP_FAST_7_r11 1316 -#define _SWAP_FAST_7_r22 1317 -#define _SWAP_FAST_7_r33 1318 -#define _TIER2_RESUME_CHECK_r00 1319 -#define _TIER2_RESUME_CHECK_r11 1320 -#define _TIER2_RESUME_CHECK_r22 1321 -#define _TIER2_RESUME_CHECK_r33 1322 -#define _TO_BOOL_r11 1323 -#define _TO_BOOL_BOOL_r01 1324 -#define _TO_BOOL_BOOL_r11 1325 -#define _TO_BOOL_BOOL_r22 1326 -#define _TO_BOOL_BOOL_r33 1327 -#define _TO_BOOL_INT_r11 1328 -#define _TO_BOOL_LIST_r11 1329 -#define _TO_BOOL_NONE_r01 1330 -#define _TO_BOOL_NONE_r11 1331 -#define _TO_BOOL_NONE_r22 1332 -#define _TO_BOOL_NONE_r33 1333 -#define _TO_BOOL_STR_r11 1334 -#define _TRACE_RECORD_r00 1335 -#define _UNARY_INVERT_r11 1336 -#define _UNARY_NEGATIVE_r11 1337 -#define _UNARY_NOT_r01 1338 -#define _UNARY_NOT_r11 1339 -#define _UNARY_NOT_r22 1340 -#define _UNARY_NOT_r33 1341 -#define _UNPACK_EX_r10 1342 -#define _UNPACK_SEQUENCE_r10 1343 -#define _UNPACK_SEQUENCE_LIST_r10 1344 -#define _UNPACK_SEQUENCE_TUPLE_r10 1345 -#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1346 -#define _WITH_EXCEPT_START_r33 1347 -#define _YIELD_VALUE_r11 1348 -#define MAX_UOP_REGS_ID 1348 +#define MAX_UOP_ID 559 +#define _BINARY_OP_r21 560 +#define _BINARY_OP_ADD_FLOAT_r03 561 +#define _BINARY_OP_ADD_FLOAT_r13 562 +#define _BINARY_OP_ADD_FLOAT_r23 563 +#define _BINARY_OP_ADD_INT_r03 564 +#define _BINARY_OP_ADD_INT_r13 565 +#define _BINARY_OP_ADD_INT_r23 566 +#define _BINARY_OP_ADD_UNICODE_r03 567 +#define _BINARY_OP_ADD_UNICODE_r13 568 +#define _BINARY_OP_ADD_UNICODE_r23 569 +#define _BINARY_OP_EXTEND_r21 570 +#define _BINARY_OP_INPLACE_ADD_UNICODE_r21 571 +#define _BINARY_OP_MULTIPLY_FLOAT_r03 572 +#define _BINARY_OP_MULTIPLY_FLOAT_r13 573 +#define _BINARY_OP_MULTIPLY_FLOAT_r23 574 +#define _BINARY_OP_MULTIPLY_INT_r03 575 +#define _BINARY_OP_MULTIPLY_INT_r13 576 +#define _BINARY_OP_MULTIPLY_INT_r23 577 +#define _BINARY_OP_SUBSCR_CHECK_FUNC_r23 578 +#define _BINARY_OP_SUBSCR_DICT_r21 579 +#define _BINARY_OP_SUBSCR_INIT_CALL_r01 580 +#define _BINARY_OP_SUBSCR_INIT_CALL_r11 581 +#define _BINARY_OP_SUBSCR_INIT_CALL_r21 582 +#define _BINARY_OP_SUBSCR_INIT_CALL_r31 583 +#define _BINARY_OP_SUBSCR_LIST_INT_r23 584 +#define _BINARY_OP_SUBSCR_LIST_SLICE_r21 585 +#define _BINARY_OP_SUBSCR_NCSTR_INT_r23 586 +#define _BINARY_OP_SUBSCR_STR_INT_r23 587 +#define _BINARY_OP_SUBSCR_TUPLE_INT_r03 588 +#define _BINARY_OP_SUBSCR_TUPLE_INT_r13 589 +#define _BINARY_OP_SUBSCR_TUPLE_INT_r23 590 +#define _BINARY_OP_SUBTRACT_FLOAT_r03 591 +#define _BINARY_OP_SUBTRACT_FLOAT_r13 592 +#define _BINARY_OP_SUBTRACT_FLOAT_r23 593 +#define _BINARY_OP_SUBTRACT_INT_r03 594 +#define _BINARY_OP_SUBTRACT_INT_r13 595 +#define _BINARY_OP_SUBTRACT_INT_r23 596 +#define _BINARY_SLICE_r31 597 +#define _BUILD_INTERPOLATION_r01 598 +#define _BUILD_LIST_r01 599 +#define _BUILD_MAP_r01 600 +#define _BUILD_SET_r01 601 +#define _BUILD_SLICE_r01 602 +#define _BUILD_STRING_r01 603 +#define _BUILD_TEMPLATE_r21 604 +#define _BUILD_TUPLE_r01 605 +#define _CALL_BUILTIN_CLASS_r01 606 +#define _CALL_BUILTIN_FAST_r01 607 +#define _CALL_BUILTIN_FAST_WITH_KEYWORDS_r01 608 +#define _CALL_BUILTIN_O_r03 609 +#define _CALL_INTRINSIC_1_r11 610 +#define _CALL_INTRINSIC_2_r21 611 +#define _CALL_ISINSTANCE_r31 612 +#define _CALL_KW_NON_PY_r11 613 +#define _CALL_LEN_r33 614 +#define _CALL_LIST_APPEND_r03 615 +#define _CALL_LIST_APPEND_r13 616 +#define _CALL_LIST_APPEND_r23 617 +#define _CALL_LIST_APPEND_r33 618 +#define _CALL_METHOD_DESCRIPTOR_FAST_r01 619 +#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r01 620 +#define _CALL_METHOD_DESCRIPTOR_NOARGS_r01 621 +#define _CALL_METHOD_DESCRIPTOR_O_r03 622 +#define _CALL_NON_PY_GENERAL_r01 623 +#define _CALL_STR_1_r32 624 +#define _CALL_TUPLE_1_r32 625 +#define _CALL_TYPE_1_r02 626 +#define _CALL_TYPE_1_r12 627 +#define _CALL_TYPE_1_r22 628 +#define _CALL_TYPE_1_r32 629 +#define _CHECK_AND_ALLOCATE_OBJECT_r00 630 +#define _CHECK_ATTR_CLASS_r01 631 +#define _CHECK_ATTR_CLASS_r11 632 +#define _CHECK_ATTR_CLASS_r22 633 +#define _CHECK_ATTR_CLASS_r33 634 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r01 635 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r11 636 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r22 637 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r33 638 +#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS_r00 639 +#define _CHECK_EG_MATCH_r22 640 +#define _CHECK_EXC_MATCH_r22 641 +#define _CHECK_FUNCTION_EXACT_ARGS_r00 642 +#define _CHECK_FUNCTION_VERSION_r00 643 +#define _CHECK_FUNCTION_VERSION_INLINE_r00 644 +#define _CHECK_FUNCTION_VERSION_INLINE_r11 645 +#define _CHECK_FUNCTION_VERSION_INLINE_r22 646 +#define _CHECK_FUNCTION_VERSION_INLINE_r33 647 +#define _CHECK_FUNCTION_VERSION_KW_r11 648 +#define _CHECK_IS_NOT_PY_CALLABLE_r00 649 +#define _CHECK_IS_NOT_PY_CALLABLE_KW_r11 650 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r01 651 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r11 652 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r22 653 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r33 654 +#define _CHECK_METHOD_VERSION_r00 655 +#define _CHECK_METHOD_VERSION_KW_r11 656 +#define _CHECK_PEP_523_r00 657 +#define _CHECK_PEP_523_r11 658 +#define _CHECK_PEP_523_r22 659 +#define _CHECK_PEP_523_r33 660 +#define _CHECK_PERIODIC_r00 661 +#define _CHECK_PERIODIC_AT_END_r00 662 +#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM_r00 663 +#define _CHECK_RECURSION_REMAINING_r00 664 +#define _CHECK_RECURSION_REMAINING_r11 665 +#define _CHECK_RECURSION_REMAINING_r22 666 +#define _CHECK_RECURSION_REMAINING_r33 667 +#define _CHECK_STACK_SPACE_r00 668 +#define _CHECK_STACK_SPACE_OPERAND_r00 669 +#define _CHECK_STACK_SPACE_OPERAND_r11 670 +#define _CHECK_STACK_SPACE_OPERAND_r22 671 +#define _CHECK_STACK_SPACE_OPERAND_r33 672 +#define _CHECK_VALIDITY_r00 673 +#define _CHECK_VALIDITY_r11 674 +#define _CHECK_VALIDITY_r22 675 +#define _CHECK_VALIDITY_r33 676 +#define _COLD_DYNAMIC_EXIT_r00 677 +#define _COLD_EXIT_r00 678 +#define _COMPARE_OP_r21 679 +#define _COMPARE_OP_FLOAT_r03 680 +#define _COMPARE_OP_FLOAT_r13 681 +#define _COMPARE_OP_FLOAT_r23 682 +#define _COMPARE_OP_INT_r23 683 +#define _COMPARE_OP_STR_r23 684 +#define _CONTAINS_OP_r21 685 +#define _CONTAINS_OP_DICT_r21 686 +#define _CONTAINS_OP_SET_r21 687 +#define _CONVERT_VALUE_r11 688 +#define _COPY_r01 689 +#define _COPY_1_r02 690 +#define _COPY_1_r12 691 +#define _COPY_1_r23 692 +#define _COPY_2_r03 693 +#define _COPY_2_r13 694 +#define _COPY_2_r23 695 +#define _COPY_3_r03 696 +#define _COPY_3_r13 697 +#define _COPY_3_r23 698 +#define _COPY_3_r33 699 +#define _COPY_FREE_VARS_r00 700 +#define _COPY_FREE_VARS_r11 701 +#define _COPY_FREE_VARS_r22 702 +#define _COPY_FREE_VARS_r33 703 +#define _CREATE_INIT_FRAME_r01 704 +#define _DELETE_ATTR_r10 705 +#define _DELETE_DEREF_r00 706 +#define _DELETE_FAST_r00 707 +#define _DELETE_GLOBAL_r00 708 +#define _DELETE_NAME_r00 709 +#define _DELETE_SUBSCR_r20 710 +#define _DEOPT_r00 711 +#define _DEOPT_r10 712 +#define _DEOPT_r20 713 +#define _DEOPT_r30 714 +#define _DICT_MERGE_r10 715 +#define _DICT_UPDATE_r10 716 +#define _DO_CALL_r01 717 +#define _DO_CALL_FUNCTION_EX_r31 718 +#define _DO_CALL_KW_r11 719 +#define _DYNAMIC_EXIT_r00 720 +#define _DYNAMIC_EXIT_r10 721 +#define _DYNAMIC_EXIT_r20 722 +#define _DYNAMIC_EXIT_r30 723 +#define _END_FOR_r10 724 +#define _END_SEND_r21 725 +#define _ERROR_POP_N_r00 726 +#define _EXIT_INIT_CHECK_r10 727 +#define _EXIT_TRACE_r00 728 +#define _EXIT_TRACE_r10 729 +#define _EXIT_TRACE_r20 730 +#define _EXIT_TRACE_r30 731 +#define _EXPAND_METHOD_r00 732 +#define _EXPAND_METHOD_KW_r11 733 +#define _FATAL_ERROR_r00 734 +#define _FATAL_ERROR_r11 735 +#define _FATAL_ERROR_r22 736 +#define _FATAL_ERROR_r33 737 +#define _FORMAT_SIMPLE_r11 738 +#define _FORMAT_WITH_SPEC_r21 739 +#define _FOR_ITER_r23 740 +#define _FOR_ITER_GEN_FRAME_r03 741 +#define _FOR_ITER_GEN_FRAME_r13 742 +#define _FOR_ITER_GEN_FRAME_r23 743 +#define _FOR_ITER_TIER_TWO_r23 744 +#define _GET_AITER_r11 745 +#define _GET_ANEXT_r12 746 +#define _GET_AWAITABLE_r11 747 +#define _GET_ITER_r12 748 +#define _GET_LEN_r12 749 +#define _GET_YIELD_FROM_ITER_r11 750 +#define _GUARD_BINARY_OP_EXTEND_r22 751 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r02 752 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r12 753 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r22 754 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r33 755 +#define _GUARD_CALLABLE_ISINSTANCE_r03 756 +#define _GUARD_CALLABLE_ISINSTANCE_r13 757 +#define _GUARD_CALLABLE_ISINSTANCE_r23 758 +#define _GUARD_CALLABLE_ISINSTANCE_r33 759 +#define _GUARD_CALLABLE_LEN_r03 760 +#define _GUARD_CALLABLE_LEN_r13 761 +#define _GUARD_CALLABLE_LEN_r23 762 +#define _GUARD_CALLABLE_LEN_r33 763 +#define _GUARD_CALLABLE_LIST_APPEND_r03 764 +#define _GUARD_CALLABLE_LIST_APPEND_r13 765 +#define _GUARD_CALLABLE_LIST_APPEND_r23 766 +#define _GUARD_CALLABLE_LIST_APPEND_r33 767 +#define _GUARD_CALLABLE_STR_1_r03 768 +#define _GUARD_CALLABLE_STR_1_r13 769 +#define _GUARD_CALLABLE_STR_1_r23 770 +#define _GUARD_CALLABLE_STR_1_r33 771 +#define _GUARD_CALLABLE_TUPLE_1_r03 772 +#define _GUARD_CALLABLE_TUPLE_1_r13 773 +#define _GUARD_CALLABLE_TUPLE_1_r23 774 +#define _GUARD_CALLABLE_TUPLE_1_r33 775 +#define _GUARD_CALLABLE_TYPE_1_r03 776 +#define _GUARD_CALLABLE_TYPE_1_r13 777 +#define _GUARD_CALLABLE_TYPE_1_r23 778 +#define _GUARD_CALLABLE_TYPE_1_r33 779 +#define _GUARD_DORV_NO_DICT_r01 780 +#define _GUARD_DORV_NO_DICT_r11 781 +#define _GUARD_DORV_NO_DICT_r22 782 +#define _GUARD_DORV_NO_DICT_r33 783 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 784 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 785 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 786 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 787 +#define _GUARD_GLOBALS_VERSION_r00 788 +#define _GUARD_GLOBALS_VERSION_r11 789 +#define _GUARD_GLOBALS_VERSION_r22 790 +#define _GUARD_GLOBALS_VERSION_r33 791 +#define _GUARD_IP_RETURN_GENERATOR_r00 792 +#define _GUARD_IP_RETURN_GENERATOR_r11 793 +#define _GUARD_IP_RETURN_GENERATOR_r22 794 +#define _GUARD_IP_RETURN_GENERATOR_r33 795 +#define _GUARD_IP_RETURN_VALUE_r00 796 +#define _GUARD_IP_RETURN_VALUE_r11 797 +#define _GUARD_IP_RETURN_VALUE_r22 798 +#define _GUARD_IP_RETURN_VALUE_r33 799 +#define _GUARD_IP_YIELD_VALUE_r00 800 +#define _GUARD_IP_YIELD_VALUE_r11 801 +#define _GUARD_IP_YIELD_VALUE_r22 802 +#define _GUARD_IP_YIELD_VALUE_r33 803 +#define _GUARD_IP__PUSH_FRAME_r00 804 +#define _GUARD_IP__PUSH_FRAME_r11 805 +#define _GUARD_IP__PUSH_FRAME_r22 806 +#define _GUARD_IP__PUSH_FRAME_r33 807 +#define _GUARD_IS_FALSE_POP_r00 808 +#define _GUARD_IS_FALSE_POP_r10 809 +#define _GUARD_IS_FALSE_POP_r21 810 +#define _GUARD_IS_FALSE_POP_r32 811 +#define _GUARD_IS_NONE_POP_r00 812 +#define _GUARD_IS_NONE_POP_r10 813 +#define _GUARD_IS_NONE_POP_r21 814 +#define _GUARD_IS_NONE_POP_r32 815 +#define _GUARD_IS_NOT_NONE_POP_r10 816 +#define _GUARD_IS_TRUE_POP_r00 817 +#define _GUARD_IS_TRUE_POP_r10 818 +#define _GUARD_IS_TRUE_POP_r21 819 +#define _GUARD_IS_TRUE_POP_r32 820 +#define _GUARD_KEYS_VERSION_r01 821 +#define _GUARD_KEYS_VERSION_r11 822 +#define _GUARD_KEYS_VERSION_r22 823 +#define _GUARD_KEYS_VERSION_r33 824 +#define _GUARD_NOS_COMPACT_ASCII_r02 825 +#define _GUARD_NOS_COMPACT_ASCII_r12 826 +#define _GUARD_NOS_COMPACT_ASCII_r22 827 +#define _GUARD_NOS_COMPACT_ASCII_r33 828 +#define _GUARD_NOS_DICT_r02 829 +#define _GUARD_NOS_DICT_r12 830 +#define _GUARD_NOS_DICT_r22 831 +#define _GUARD_NOS_DICT_r33 832 +#define _GUARD_NOS_FLOAT_r02 833 +#define _GUARD_NOS_FLOAT_r12 834 +#define _GUARD_NOS_FLOAT_r22 835 +#define _GUARD_NOS_FLOAT_r33 836 +#define _GUARD_NOS_INT_r02 837 +#define _GUARD_NOS_INT_r12 838 +#define _GUARD_NOS_INT_r22 839 +#define _GUARD_NOS_INT_r33 840 +#define _GUARD_NOS_LIST_r02 841 +#define _GUARD_NOS_LIST_r12 842 +#define _GUARD_NOS_LIST_r22 843 +#define _GUARD_NOS_LIST_r33 844 +#define _GUARD_NOS_NOT_NULL_r02 845 +#define _GUARD_NOS_NOT_NULL_r12 846 +#define _GUARD_NOS_NOT_NULL_r22 847 +#define _GUARD_NOS_NOT_NULL_r33 848 +#define _GUARD_NOS_NULL_r02 849 +#define _GUARD_NOS_NULL_r12 850 +#define _GUARD_NOS_NULL_r22 851 +#define _GUARD_NOS_NULL_r33 852 +#define _GUARD_NOS_OVERFLOWED_r02 853 +#define _GUARD_NOS_OVERFLOWED_r12 854 +#define _GUARD_NOS_OVERFLOWED_r22 855 +#define _GUARD_NOS_OVERFLOWED_r33 856 +#define _GUARD_NOS_TUPLE_r02 857 +#define _GUARD_NOS_TUPLE_r12 858 +#define _GUARD_NOS_TUPLE_r22 859 +#define _GUARD_NOS_TUPLE_r33 860 +#define _GUARD_NOS_UNICODE_r02 861 +#define _GUARD_NOS_UNICODE_r12 862 +#define _GUARD_NOS_UNICODE_r22 863 +#define _GUARD_NOS_UNICODE_r33 864 +#define _GUARD_NOT_EXHAUSTED_LIST_r02 865 +#define _GUARD_NOT_EXHAUSTED_LIST_r12 866 +#define _GUARD_NOT_EXHAUSTED_LIST_r22 867 +#define _GUARD_NOT_EXHAUSTED_LIST_r33 868 +#define _GUARD_NOT_EXHAUSTED_RANGE_r02 869 +#define _GUARD_NOT_EXHAUSTED_RANGE_r12 870 +#define _GUARD_NOT_EXHAUSTED_RANGE_r22 871 +#define _GUARD_NOT_EXHAUSTED_RANGE_r33 872 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 873 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 874 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 875 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 876 +#define _GUARD_THIRD_NULL_r03 877 +#define _GUARD_THIRD_NULL_r13 878 +#define _GUARD_THIRD_NULL_r23 879 +#define _GUARD_THIRD_NULL_r33 880 +#define _GUARD_TOS_ANY_SET_r01 881 +#define _GUARD_TOS_ANY_SET_r11 882 +#define _GUARD_TOS_ANY_SET_r22 883 +#define _GUARD_TOS_ANY_SET_r33 884 +#define _GUARD_TOS_DICT_r01 885 +#define _GUARD_TOS_DICT_r11 886 +#define _GUARD_TOS_DICT_r22 887 +#define _GUARD_TOS_DICT_r33 888 +#define _GUARD_TOS_FLOAT_r01 889 +#define _GUARD_TOS_FLOAT_r11 890 +#define _GUARD_TOS_FLOAT_r22 891 +#define _GUARD_TOS_FLOAT_r33 892 +#define _GUARD_TOS_INT_r01 893 +#define _GUARD_TOS_INT_r11 894 +#define _GUARD_TOS_INT_r22 895 +#define _GUARD_TOS_INT_r33 896 +#define _GUARD_TOS_LIST_r01 897 +#define _GUARD_TOS_LIST_r11 898 +#define _GUARD_TOS_LIST_r22 899 +#define _GUARD_TOS_LIST_r33 900 +#define _GUARD_TOS_OVERFLOWED_r01 901 +#define _GUARD_TOS_OVERFLOWED_r11 902 +#define _GUARD_TOS_OVERFLOWED_r22 903 +#define _GUARD_TOS_OVERFLOWED_r33 904 +#define _GUARD_TOS_SLICE_r01 905 +#define _GUARD_TOS_SLICE_r11 906 +#define _GUARD_TOS_SLICE_r22 907 +#define _GUARD_TOS_SLICE_r33 908 +#define _GUARD_TOS_TUPLE_r01 909 +#define _GUARD_TOS_TUPLE_r11 910 +#define _GUARD_TOS_TUPLE_r22 911 +#define _GUARD_TOS_TUPLE_r33 912 +#define _GUARD_TOS_UNICODE_r01 913 +#define _GUARD_TOS_UNICODE_r11 914 +#define _GUARD_TOS_UNICODE_r22 915 +#define _GUARD_TOS_UNICODE_r33 916 +#define _GUARD_TYPE_VERSION_r01 917 +#define _GUARD_TYPE_VERSION_r11 918 +#define _GUARD_TYPE_VERSION_r22 919 +#define _GUARD_TYPE_VERSION_r33 920 +#define _GUARD_TYPE_VERSION_AND_LOCK_r01 921 +#define _GUARD_TYPE_VERSION_AND_LOCK_r11 922 +#define _GUARD_TYPE_VERSION_AND_LOCK_r22 923 +#define _GUARD_TYPE_VERSION_AND_LOCK_r33 924 +#define _HANDLE_PENDING_AND_DEOPT_r00 925 +#define _HANDLE_PENDING_AND_DEOPT_r10 926 +#define _HANDLE_PENDING_AND_DEOPT_r20 927 +#define _HANDLE_PENDING_AND_DEOPT_r30 928 +#define _IMPORT_FROM_r12 929 +#define _IMPORT_NAME_r21 930 +#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 931 +#define _INIT_CALL_PY_EXACT_ARGS_r01 932 +#define _INIT_CALL_PY_EXACT_ARGS_0_r01 933 +#define _INIT_CALL_PY_EXACT_ARGS_1_r01 934 +#define _INIT_CALL_PY_EXACT_ARGS_2_r01 935 +#define _INIT_CALL_PY_EXACT_ARGS_3_r01 936 +#define _INIT_CALL_PY_EXACT_ARGS_4_r01 937 +#define _INSERT_NULL_r10 938 +#define _INSTRUMENTED_FOR_ITER_r23 939 +#define _INSTRUMENTED_INSTRUCTION_r00 940 +#define _INSTRUMENTED_JUMP_FORWARD_r00 941 +#define _INSTRUMENTED_JUMP_FORWARD_r11 942 +#define _INSTRUMENTED_JUMP_FORWARD_r22 943 +#define _INSTRUMENTED_JUMP_FORWARD_r33 944 +#define _INSTRUMENTED_LINE_r00 945 +#define _INSTRUMENTED_NOT_TAKEN_r00 946 +#define _INSTRUMENTED_NOT_TAKEN_r11 947 +#define _INSTRUMENTED_NOT_TAKEN_r22 948 +#define _INSTRUMENTED_NOT_TAKEN_r33 949 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 950 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 951 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 952 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 953 +#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 954 +#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 955 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 956 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 957 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 958 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 959 +#define _IS_NONE_r11 960 +#define _IS_OP_r03 961 +#define _IS_OP_r13 962 +#define _IS_OP_r23 963 +#define _ITER_CHECK_LIST_r02 964 +#define _ITER_CHECK_LIST_r12 965 +#define _ITER_CHECK_LIST_r22 966 +#define _ITER_CHECK_LIST_r33 967 +#define _ITER_CHECK_RANGE_r02 968 +#define _ITER_CHECK_RANGE_r12 969 +#define _ITER_CHECK_RANGE_r22 970 +#define _ITER_CHECK_RANGE_r33 971 +#define _ITER_CHECK_TUPLE_r02 972 +#define _ITER_CHECK_TUPLE_r12 973 +#define _ITER_CHECK_TUPLE_r22 974 +#define _ITER_CHECK_TUPLE_r33 975 +#define _ITER_JUMP_LIST_r02 976 +#define _ITER_JUMP_LIST_r12 977 +#define _ITER_JUMP_LIST_r22 978 +#define _ITER_JUMP_LIST_r33 979 +#define _ITER_JUMP_RANGE_r02 980 +#define _ITER_JUMP_RANGE_r12 981 +#define _ITER_JUMP_RANGE_r22 982 +#define _ITER_JUMP_RANGE_r33 983 +#define _ITER_JUMP_TUPLE_r02 984 +#define _ITER_JUMP_TUPLE_r12 985 +#define _ITER_JUMP_TUPLE_r22 986 +#define _ITER_JUMP_TUPLE_r33 987 +#define _ITER_NEXT_LIST_r23 988 +#define _ITER_NEXT_LIST_TIER_TWO_r23 989 +#define _ITER_NEXT_RANGE_r03 990 +#define _ITER_NEXT_RANGE_r13 991 +#define _ITER_NEXT_RANGE_r23 992 +#define _ITER_NEXT_TUPLE_r03 993 +#define _ITER_NEXT_TUPLE_r13 994 +#define _ITER_NEXT_TUPLE_r23 995 +#define _JUMP_BACKWARD_NO_INTERRUPT_r00 996 +#define _JUMP_BACKWARD_NO_INTERRUPT_r11 997 +#define _JUMP_BACKWARD_NO_INTERRUPT_r22 998 +#define _JUMP_BACKWARD_NO_INTERRUPT_r33 999 +#define _JUMP_TO_TOP_r00 1000 +#define _LIST_APPEND_r10 1001 +#define _LIST_EXTEND_r10 1002 +#define _LOAD_ATTR_r10 1003 +#define _LOAD_ATTR_CLASS_r11 1004 +#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_r11 1005 +#define _LOAD_ATTR_INSTANCE_VALUE_r02 1006 +#define _LOAD_ATTR_INSTANCE_VALUE_r12 1007 +#define _LOAD_ATTR_INSTANCE_VALUE_r23 1008 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 1009 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 1010 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 1011 +#define _LOAD_ATTR_METHOD_NO_DICT_r02 1012 +#define _LOAD_ATTR_METHOD_NO_DICT_r12 1013 +#define _LOAD_ATTR_METHOD_NO_DICT_r23 1014 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 1015 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 1016 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 1017 +#define _LOAD_ATTR_MODULE_r11 1018 +#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 1019 +#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 1020 +#define _LOAD_ATTR_PROPERTY_FRAME_r11 1021 +#define _LOAD_ATTR_SLOT_r02 1022 +#define _LOAD_ATTR_SLOT_r12 1023 +#define _LOAD_ATTR_SLOT_r23 1024 +#define _LOAD_ATTR_WITH_HINT_r12 1025 +#define _LOAD_BUILD_CLASS_r01 1026 +#define _LOAD_BYTECODE_r00 1027 +#define _LOAD_COMMON_CONSTANT_r01 1028 +#define _LOAD_COMMON_CONSTANT_r12 1029 +#define _LOAD_COMMON_CONSTANT_r23 1030 +#define _LOAD_CONST_r01 1031 +#define _LOAD_CONST_r12 1032 +#define _LOAD_CONST_r23 1033 +#define _LOAD_CONST_INLINE_r01 1034 +#define _LOAD_CONST_INLINE_r12 1035 +#define _LOAD_CONST_INLINE_r23 1036 +#define _LOAD_CONST_INLINE_BORROW_r01 1037 +#define _LOAD_CONST_INLINE_BORROW_r12 1038 +#define _LOAD_CONST_INLINE_BORROW_r23 1039 +#define _LOAD_CONST_UNDER_INLINE_r02 1040 +#define _LOAD_CONST_UNDER_INLINE_r12 1041 +#define _LOAD_CONST_UNDER_INLINE_r23 1042 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r02 1043 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r12 1044 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r23 1045 +#define _LOAD_DEREF_r01 1046 +#define _LOAD_FAST_r01 1047 +#define _LOAD_FAST_r12 1048 +#define _LOAD_FAST_r23 1049 +#define _LOAD_FAST_0_r01 1050 +#define _LOAD_FAST_0_r12 1051 +#define _LOAD_FAST_0_r23 1052 +#define _LOAD_FAST_1_r01 1053 +#define _LOAD_FAST_1_r12 1054 +#define _LOAD_FAST_1_r23 1055 +#define _LOAD_FAST_2_r01 1056 +#define _LOAD_FAST_2_r12 1057 +#define _LOAD_FAST_2_r23 1058 +#define _LOAD_FAST_3_r01 1059 +#define _LOAD_FAST_3_r12 1060 +#define _LOAD_FAST_3_r23 1061 +#define _LOAD_FAST_4_r01 1062 +#define _LOAD_FAST_4_r12 1063 +#define _LOAD_FAST_4_r23 1064 +#define _LOAD_FAST_5_r01 1065 +#define _LOAD_FAST_5_r12 1066 +#define _LOAD_FAST_5_r23 1067 +#define _LOAD_FAST_6_r01 1068 +#define _LOAD_FAST_6_r12 1069 +#define _LOAD_FAST_6_r23 1070 +#define _LOAD_FAST_7_r01 1071 +#define _LOAD_FAST_7_r12 1072 +#define _LOAD_FAST_7_r23 1073 +#define _LOAD_FAST_AND_CLEAR_r01 1074 +#define _LOAD_FAST_AND_CLEAR_r12 1075 +#define _LOAD_FAST_AND_CLEAR_r23 1076 +#define _LOAD_FAST_BORROW_r01 1077 +#define _LOAD_FAST_BORROW_r12 1078 +#define _LOAD_FAST_BORROW_r23 1079 +#define _LOAD_FAST_BORROW_0_r01 1080 +#define _LOAD_FAST_BORROW_0_r12 1081 +#define _LOAD_FAST_BORROW_0_r23 1082 +#define _LOAD_FAST_BORROW_1_r01 1083 +#define _LOAD_FAST_BORROW_1_r12 1084 +#define _LOAD_FAST_BORROW_1_r23 1085 +#define _LOAD_FAST_BORROW_2_r01 1086 +#define _LOAD_FAST_BORROW_2_r12 1087 +#define _LOAD_FAST_BORROW_2_r23 1088 +#define _LOAD_FAST_BORROW_3_r01 1089 +#define _LOAD_FAST_BORROW_3_r12 1090 +#define _LOAD_FAST_BORROW_3_r23 1091 +#define _LOAD_FAST_BORROW_4_r01 1092 +#define _LOAD_FAST_BORROW_4_r12 1093 +#define _LOAD_FAST_BORROW_4_r23 1094 +#define _LOAD_FAST_BORROW_5_r01 1095 +#define _LOAD_FAST_BORROW_5_r12 1096 +#define _LOAD_FAST_BORROW_5_r23 1097 +#define _LOAD_FAST_BORROW_6_r01 1098 +#define _LOAD_FAST_BORROW_6_r12 1099 +#define _LOAD_FAST_BORROW_6_r23 1100 +#define _LOAD_FAST_BORROW_7_r01 1101 +#define _LOAD_FAST_BORROW_7_r12 1102 +#define _LOAD_FAST_BORROW_7_r23 1103 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1104 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1105 +#define _LOAD_FAST_CHECK_r01 1106 +#define _LOAD_FAST_CHECK_r12 1107 +#define _LOAD_FAST_CHECK_r23 1108 +#define _LOAD_FAST_LOAD_FAST_r02 1109 +#define _LOAD_FAST_LOAD_FAST_r13 1110 +#define _LOAD_FROM_DICT_OR_DEREF_r11 1111 +#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1112 +#define _LOAD_GLOBAL_r00 1113 +#define _LOAD_GLOBAL_BUILTINS_r01 1114 +#define _LOAD_GLOBAL_MODULE_r01 1115 +#define _LOAD_LOCALS_r01 1116 +#define _LOAD_LOCALS_r12 1117 +#define _LOAD_LOCALS_r23 1118 +#define _LOAD_NAME_r01 1119 +#define _LOAD_SMALL_INT_r01 1120 +#define _LOAD_SMALL_INT_r12 1121 +#define _LOAD_SMALL_INT_r23 1122 +#define _LOAD_SMALL_INT_0_r01 1123 +#define _LOAD_SMALL_INT_0_r12 1124 +#define _LOAD_SMALL_INT_0_r23 1125 +#define _LOAD_SMALL_INT_1_r01 1126 +#define _LOAD_SMALL_INT_1_r12 1127 +#define _LOAD_SMALL_INT_1_r23 1128 +#define _LOAD_SMALL_INT_2_r01 1129 +#define _LOAD_SMALL_INT_2_r12 1130 +#define _LOAD_SMALL_INT_2_r23 1131 +#define _LOAD_SMALL_INT_3_r01 1132 +#define _LOAD_SMALL_INT_3_r12 1133 +#define _LOAD_SMALL_INT_3_r23 1134 +#define _LOAD_SPECIAL_r00 1135 +#define _LOAD_SUPER_ATTR_ATTR_r31 1136 +#define _LOAD_SUPER_ATTR_METHOD_r32 1137 +#define _MAKE_CALLARGS_A_TUPLE_r33 1138 +#define _MAKE_CELL_r00 1139 +#define _MAKE_FUNCTION_r11 1140 +#define _MAKE_WARM_r00 1141 +#define _MAKE_WARM_r11 1142 +#define _MAKE_WARM_r22 1143 +#define _MAKE_WARM_r33 1144 +#define _MAP_ADD_r20 1145 +#define _MATCH_CLASS_r31 1146 +#define _MATCH_KEYS_r23 1147 +#define _MATCH_MAPPING_r02 1148 +#define _MATCH_MAPPING_r12 1149 +#define _MATCH_MAPPING_r23 1150 +#define _MATCH_SEQUENCE_r02 1151 +#define _MATCH_SEQUENCE_r12 1152 +#define _MATCH_SEQUENCE_r23 1153 +#define _MAYBE_EXPAND_METHOD_r00 1154 +#define _MAYBE_EXPAND_METHOD_KW_r11 1155 +#define _MONITOR_CALL_r00 1156 +#define _MONITOR_CALL_KW_r11 1157 +#define _MONITOR_JUMP_BACKWARD_r00 1158 +#define _MONITOR_JUMP_BACKWARD_r11 1159 +#define _MONITOR_JUMP_BACKWARD_r22 1160 +#define _MONITOR_JUMP_BACKWARD_r33 1161 +#define _MONITOR_RESUME_r00 1162 +#define _NOP_r00 1163 +#define _NOP_r11 1164 +#define _NOP_r22 1165 +#define _NOP_r33 1166 +#define _POP_CALL_r20 1167 +#define _POP_CALL_LOAD_CONST_INLINE_BORROW_r21 1168 +#define _POP_CALL_ONE_r30 1169 +#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW_r31 1170 +#define _POP_CALL_TWO_r30 1171 +#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW_r31 1172 +#define _POP_EXCEPT_r10 1173 +#define _POP_ITER_r20 1174 +#define _POP_JUMP_IF_FALSE_r00 1175 +#define _POP_JUMP_IF_FALSE_r10 1176 +#define _POP_JUMP_IF_FALSE_r21 1177 +#define _POP_JUMP_IF_FALSE_r32 1178 +#define _POP_JUMP_IF_TRUE_r00 1179 +#define _POP_JUMP_IF_TRUE_r10 1180 +#define _POP_JUMP_IF_TRUE_r21 1181 +#define _POP_JUMP_IF_TRUE_r32 1182 +#define _POP_TOP_r10 1183 +#define _POP_TOP_FLOAT_r00 1184 +#define _POP_TOP_FLOAT_r10 1185 +#define _POP_TOP_FLOAT_r21 1186 +#define _POP_TOP_FLOAT_r32 1187 +#define _POP_TOP_INT_r00 1188 +#define _POP_TOP_INT_r10 1189 +#define _POP_TOP_INT_r21 1190 +#define _POP_TOP_INT_r32 1191 +#define _POP_TOP_LOAD_CONST_INLINE_r11 1192 +#define _POP_TOP_LOAD_CONST_INLINE_BORROW_r11 1193 +#define _POP_TOP_NOP_r00 1194 +#define _POP_TOP_NOP_r10 1195 +#define _POP_TOP_NOP_r21 1196 +#define _POP_TOP_NOP_r32 1197 +#define _POP_TOP_UNICODE_r00 1198 +#define _POP_TOP_UNICODE_r10 1199 +#define _POP_TOP_UNICODE_r21 1200 +#define _POP_TOP_UNICODE_r32 1201 +#define _POP_TWO_r20 1202 +#define _POP_TWO_LOAD_CONST_INLINE_BORROW_r21 1203 +#define _PUSH_EXC_INFO_r02 1204 +#define _PUSH_EXC_INFO_r12 1205 +#define _PUSH_EXC_INFO_r23 1206 +#define _PUSH_FRAME_r10 1207 +#define _PUSH_NULL_r01 1208 +#define _PUSH_NULL_r12 1209 +#define _PUSH_NULL_r23 1210 +#define _PUSH_NULL_CONDITIONAL_r00 1211 +#define _PY_FRAME_GENERAL_r01 1212 +#define _PY_FRAME_KW_r11 1213 +#define _QUICKEN_RESUME_r00 1214 +#define _QUICKEN_RESUME_r11 1215 +#define _QUICKEN_RESUME_r22 1216 +#define _QUICKEN_RESUME_r33 1217 +#define _REPLACE_WITH_TRUE_r11 1218 +#define _RESUME_CHECK_r00 1219 +#define _RESUME_CHECK_r11 1220 +#define _RESUME_CHECK_r22 1221 +#define _RESUME_CHECK_r33 1222 +#define _RETURN_GENERATOR_r01 1223 +#define _RETURN_VALUE_r11 1224 +#define _SAVE_RETURN_OFFSET_r00 1225 +#define _SAVE_RETURN_OFFSET_r11 1226 +#define _SAVE_RETURN_OFFSET_r22 1227 +#define _SAVE_RETURN_OFFSET_r33 1228 +#define _SEND_r22 1229 +#define _SEND_GEN_FRAME_r22 1230 +#define _SETUP_ANNOTATIONS_r00 1231 +#define _SET_ADD_r10 1232 +#define _SET_FUNCTION_ATTRIBUTE_r01 1233 +#define _SET_FUNCTION_ATTRIBUTE_r11 1234 +#define _SET_FUNCTION_ATTRIBUTE_r21 1235 +#define _SET_FUNCTION_ATTRIBUTE_r32 1236 +#define _SET_IP_r00 1237 +#define _SET_IP_r11 1238 +#define _SET_IP_r22 1239 +#define _SET_IP_r33 1240 +#define _SET_UPDATE_r10 1241 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r02 1242 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r12 1243 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r22 1244 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r32 1245 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r03 1246 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r13 1247 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r23 1248 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r33 1249 +#define _SPILL_OR_RELOAD_r01 1250 +#define _SPILL_OR_RELOAD_r02 1251 +#define _SPILL_OR_RELOAD_r03 1252 +#define _SPILL_OR_RELOAD_r10 1253 +#define _SPILL_OR_RELOAD_r12 1254 +#define _SPILL_OR_RELOAD_r13 1255 +#define _SPILL_OR_RELOAD_r20 1256 +#define _SPILL_OR_RELOAD_r21 1257 +#define _SPILL_OR_RELOAD_r23 1258 +#define _SPILL_OR_RELOAD_r30 1259 +#define _SPILL_OR_RELOAD_r31 1260 +#define _SPILL_OR_RELOAD_r32 1261 +#define _START_EXECUTOR_r00 1262 +#define _STORE_ATTR_r20 1263 +#define _STORE_ATTR_INSTANCE_VALUE_r21 1264 +#define _STORE_ATTR_SLOT_r21 1265 +#define _STORE_ATTR_WITH_HINT_r21 1266 +#define _STORE_DEREF_r10 1267 +#define _STORE_FAST_LOAD_FAST_r11 1268 +#define _STORE_FAST_STORE_FAST_r20 1269 +#define _STORE_GLOBAL_r10 1270 +#define _STORE_NAME_r10 1271 +#define _STORE_SLICE_r30 1272 +#define _STORE_SUBSCR_r30 1273 +#define _STORE_SUBSCR_DICT_r31 1274 +#define _STORE_SUBSCR_LIST_INT_r32 1275 +#define _SWAP_r11 1276 +#define _SWAP_2_r02 1277 +#define _SWAP_2_r12 1278 +#define _SWAP_2_r22 1279 +#define _SWAP_2_r33 1280 +#define _SWAP_3_r03 1281 +#define _SWAP_3_r13 1282 +#define _SWAP_3_r23 1283 +#define _SWAP_3_r33 1284 +#define _SWAP_FAST_r01 1285 +#define _SWAP_FAST_r11 1286 +#define _SWAP_FAST_r22 1287 +#define _SWAP_FAST_r33 1288 +#define _SWAP_FAST_0_r01 1289 +#define _SWAP_FAST_0_r11 1290 +#define _SWAP_FAST_0_r22 1291 +#define _SWAP_FAST_0_r33 1292 +#define _SWAP_FAST_1_r01 1293 +#define _SWAP_FAST_1_r11 1294 +#define _SWAP_FAST_1_r22 1295 +#define _SWAP_FAST_1_r33 1296 +#define _SWAP_FAST_2_r01 1297 +#define _SWAP_FAST_2_r11 1298 +#define _SWAP_FAST_2_r22 1299 +#define _SWAP_FAST_2_r33 1300 +#define _SWAP_FAST_3_r01 1301 +#define _SWAP_FAST_3_r11 1302 +#define _SWAP_FAST_3_r22 1303 +#define _SWAP_FAST_3_r33 1304 +#define _SWAP_FAST_4_r01 1305 +#define _SWAP_FAST_4_r11 1306 +#define _SWAP_FAST_4_r22 1307 +#define _SWAP_FAST_4_r33 1308 +#define _SWAP_FAST_5_r01 1309 +#define _SWAP_FAST_5_r11 1310 +#define _SWAP_FAST_5_r22 1311 +#define _SWAP_FAST_5_r33 1312 +#define _SWAP_FAST_6_r01 1313 +#define _SWAP_FAST_6_r11 1314 +#define _SWAP_FAST_6_r22 1315 +#define _SWAP_FAST_6_r33 1316 +#define _SWAP_FAST_7_r01 1317 +#define _SWAP_FAST_7_r11 1318 +#define _SWAP_FAST_7_r22 1319 +#define _SWAP_FAST_7_r33 1320 +#define _TIER2_RESUME_CHECK_r00 1321 +#define _TIER2_RESUME_CHECK_r11 1322 +#define _TIER2_RESUME_CHECK_r22 1323 +#define _TIER2_RESUME_CHECK_r33 1324 +#define _TO_BOOL_r11 1325 +#define _TO_BOOL_BOOL_r01 1326 +#define _TO_BOOL_BOOL_r11 1327 +#define _TO_BOOL_BOOL_r22 1328 +#define _TO_BOOL_BOOL_r33 1329 +#define _TO_BOOL_INT_r11 1330 +#define _TO_BOOL_LIST_r11 1331 +#define _TO_BOOL_NONE_r01 1332 +#define _TO_BOOL_NONE_r11 1333 +#define _TO_BOOL_NONE_r22 1334 +#define _TO_BOOL_NONE_r33 1335 +#define _TO_BOOL_STR_r11 1336 +#define _TRACE_RECORD_r00 1337 +#define _UNARY_INVERT_r11 1338 +#define _UNARY_NEGATIVE_r11 1339 +#define _UNARY_NOT_r01 1340 +#define _UNARY_NOT_r11 1341 +#define _UNARY_NOT_r22 1342 +#define _UNARY_NOT_r33 1343 +#define _UNPACK_EX_r10 1344 +#define _UNPACK_SEQUENCE_r10 1345 +#define _UNPACK_SEQUENCE_LIST_r10 1346 +#define _UNPACK_SEQUENCE_TUPLE_r10 1347 +#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1348 +#define _WITH_EXCEPT_START_r33 1349 +#define _YIELD_VALUE_r11 1350 +#define MAX_UOP_REGS_ID 1350 #ifdef __cplusplus } diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index 0d49110c7e3e0c..2b23aa532aa30a 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -121,6 +121,7 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_BINARY_OP_SUBSCR_LIST_INT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, [_BINARY_OP_SUBSCR_LIST_SLICE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_BINARY_OP_SUBSCR_STR_INT] = HAS_DEOPT_FLAG, + [_BINARY_OP_SUBSCR_NCSTR_INT] = HAS_DEOPT_FLAG, [_GUARD_NOS_TUPLE] = HAS_EXIT_FLAG, [_GUARD_TOS_TUPLE] = HAS_EXIT_FLAG, [_GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS] = HAS_DEOPT_FLAG, @@ -1143,6 +1144,15 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { { -1, -1, -1 }, }, }, + [_BINARY_OP_SUBSCR_NCSTR_INT] = { + .best = { 2, 2, 2, 2 }, + .entries = { + { -1, -1, -1 }, + { -1, -1, -1 }, + { 3, 2, _BINARY_OP_SUBSCR_NCSTR_INT_r23 }, + { -1, -1, -1 }, + }, + }, [_GUARD_NOS_TUPLE] = { .best = { 0, 1, 2, 3 }, .entries = { @@ -3496,6 +3506,7 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_BINARY_OP_SUBSCR_LIST_INT_r23] = _BINARY_OP_SUBSCR_LIST_INT, [_BINARY_OP_SUBSCR_LIST_SLICE_r21] = _BINARY_OP_SUBSCR_LIST_SLICE, [_BINARY_OP_SUBSCR_STR_INT_r23] = _BINARY_OP_SUBSCR_STR_INT, + [_BINARY_OP_SUBSCR_NCSTR_INT_r23] = _BINARY_OP_SUBSCR_NCSTR_INT, [_GUARD_NOS_TUPLE_r02] = _GUARD_NOS_TUPLE, [_GUARD_NOS_TUPLE_r12] = _GUARD_NOS_TUPLE, [_GUARD_NOS_TUPLE_r22] = _GUARD_NOS_TUPLE, @@ -4026,6 +4037,8 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_BINARY_OP_SUBSCR_LIST_INT_r23] = "_BINARY_OP_SUBSCR_LIST_INT_r23", [_BINARY_OP_SUBSCR_LIST_SLICE] = "_BINARY_OP_SUBSCR_LIST_SLICE", [_BINARY_OP_SUBSCR_LIST_SLICE_r21] = "_BINARY_OP_SUBSCR_LIST_SLICE_r21", + [_BINARY_OP_SUBSCR_NCSTR_INT] = "_BINARY_OP_SUBSCR_NCSTR_INT", + [_BINARY_OP_SUBSCR_NCSTR_INT_r23] = "_BINARY_OP_SUBSCR_NCSTR_INT_r23", [_BINARY_OP_SUBSCR_STR_INT] = "_BINARY_OP_SUBSCR_STR_INT", [_BINARY_OP_SUBSCR_STR_INT_r23] = "_BINARY_OP_SUBSCR_STR_INT_r23", [_BINARY_OP_SUBSCR_TUPLE_INT] = "_BINARY_OP_SUBSCR_TUPLE_INT", @@ -5201,6 +5214,8 @@ int _PyUop_num_popped(int opcode, int oparg) return 2; case _BINARY_OP_SUBSCR_STR_INT: return 2; + case _BINARY_OP_SUBSCR_NCSTR_INT: + return 2; case _GUARD_NOS_TUPLE: return 0; case _GUARD_TOS_TUPLE: diff --git a/Include/opcode_ids.h b/Include/opcode_ids.h index 0d066c169019a7..c6dbb263f7434f 100644 --- a/Include/opcode_ids.h +++ b/Include/opcode_ids.h @@ -142,77 +142,78 @@ extern "C" { #define BINARY_OP_SUBSCR_GETITEM 136 #define BINARY_OP_SUBSCR_LIST_INT 137 #define BINARY_OP_SUBSCR_LIST_SLICE 138 -#define BINARY_OP_SUBSCR_STR_INT 139 -#define BINARY_OP_SUBSCR_TUPLE_INT 140 -#define BINARY_OP_SUBTRACT_FLOAT 141 -#define BINARY_OP_SUBTRACT_INT 142 -#define CALL_ALLOC_AND_ENTER_INIT 143 -#define CALL_BOUND_METHOD_EXACT_ARGS 144 -#define CALL_BOUND_METHOD_GENERAL 145 -#define CALL_BUILTIN_CLASS 146 -#define CALL_BUILTIN_FAST 147 -#define CALL_BUILTIN_FAST_WITH_KEYWORDS 148 -#define CALL_BUILTIN_O 149 -#define CALL_ISINSTANCE 150 -#define CALL_KW_BOUND_METHOD 151 -#define CALL_KW_NON_PY 152 -#define CALL_KW_PY 153 -#define CALL_LEN 154 -#define CALL_LIST_APPEND 155 -#define CALL_METHOD_DESCRIPTOR_FAST 156 -#define CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 157 -#define CALL_METHOD_DESCRIPTOR_NOARGS 158 -#define CALL_METHOD_DESCRIPTOR_O 159 -#define CALL_NON_PY_GENERAL 160 -#define CALL_PY_EXACT_ARGS 161 -#define CALL_PY_GENERAL 162 -#define CALL_STR_1 163 -#define CALL_TUPLE_1 164 -#define CALL_TYPE_1 165 -#define COMPARE_OP_FLOAT 166 -#define COMPARE_OP_INT 167 -#define COMPARE_OP_STR 168 -#define CONTAINS_OP_DICT 169 -#define CONTAINS_OP_SET 170 -#define FOR_ITER_GEN 171 -#define FOR_ITER_LIST 172 -#define FOR_ITER_RANGE 173 -#define FOR_ITER_TUPLE 174 -#define JUMP_BACKWARD_JIT 175 -#define JUMP_BACKWARD_NO_JIT 176 -#define LOAD_ATTR_CLASS 177 -#define LOAD_ATTR_CLASS_WITH_METACLASS_CHECK 178 -#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN 179 -#define LOAD_ATTR_INSTANCE_VALUE 180 -#define LOAD_ATTR_METHOD_LAZY_DICT 181 -#define LOAD_ATTR_METHOD_NO_DICT 182 -#define LOAD_ATTR_METHOD_WITH_VALUES 183 -#define LOAD_ATTR_MODULE 184 -#define LOAD_ATTR_NONDESCRIPTOR_NO_DICT 185 -#define LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 186 -#define LOAD_ATTR_PROPERTY 187 -#define LOAD_ATTR_SLOT 188 -#define LOAD_ATTR_WITH_HINT 189 -#define LOAD_GLOBAL_BUILTIN 190 -#define LOAD_GLOBAL_MODULE 191 -#define LOAD_SUPER_ATTR_ATTR 192 -#define LOAD_SUPER_ATTR_METHOD 193 -#define RESUME_CHECK 194 -#define SEND_GEN 195 -#define STORE_ATTR_INSTANCE_VALUE 196 -#define STORE_ATTR_SLOT 197 -#define STORE_ATTR_WITH_HINT 198 -#define STORE_SUBSCR_DICT 199 -#define STORE_SUBSCR_LIST_INT 200 -#define TO_BOOL_ALWAYS_TRUE 201 -#define TO_BOOL_BOOL 202 -#define TO_BOOL_INT 203 -#define TO_BOOL_LIST 204 -#define TO_BOOL_NONE 205 -#define TO_BOOL_STR 206 -#define UNPACK_SEQUENCE_LIST 207 -#define UNPACK_SEQUENCE_TUPLE 208 -#define UNPACK_SEQUENCE_TWO_TUPLE 209 +#define BINARY_OP_SUBSCR_NCSTR_INT 139 +#define BINARY_OP_SUBSCR_STR_INT 140 +#define BINARY_OP_SUBSCR_TUPLE_INT 141 +#define BINARY_OP_SUBTRACT_FLOAT 142 +#define BINARY_OP_SUBTRACT_INT 143 +#define CALL_ALLOC_AND_ENTER_INIT 144 +#define CALL_BOUND_METHOD_EXACT_ARGS 145 +#define CALL_BOUND_METHOD_GENERAL 146 +#define CALL_BUILTIN_CLASS 147 +#define CALL_BUILTIN_FAST 148 +#define CALL_BUILTIN_FAST_WITH_KEYWORDS 149 +#define CALL_BUILTIN_O 150 +#define CALL_ISINSTANCE 151 +#define CALL_KW_BOUND_METHOD 152 +#define CALL_KW_NON_PY 153 +#define CALL_KW_PY 154 +#define CALL_LEN 155 +#define CALL_LIST_APPEND 156 +#define CALL_METHOD_DESCRIPTOR_FAST 157 +#define CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 158 +#define CALL_METHOD_DESCRIPTOR_NOARGS 159 +#define CALL_METHOD_DESCRIPTOR_O 160 +#define CALL_NON_PY_GENERAL 161 +#define CALL_PY_EXACT_ARGS 162 +#define CALL_PY_GENERAL 163 +#define CALL_STR_1 164 +#define CALL_TUPLE_1 165 +#define CALL_TYPE_1 166 +#define COMPARE_OP_FLOAT 167 +#define COMPARE_OP_INT 168 +#define COMPARE_OP_STR 169 +#define CONTAINS_OP_DICT 170 +#define CONTAINS_OP_SET 171 +#define FOR_ITER_GEN 172 +#define FOR_ITER_LIST 173 +#define FOR_ITER_RANGE 174 +#define FOR_ITER_TUPLE 175 +#define JUMP_BACKWARD_JIT 176 +#define JUMP_BACKWARD_NO_JIT 177 +#define LOAD_ATTR_CLASS 178 +#define LOAD_ATTR_CLASS_WITH_METACLASS_CHECK 179 +#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN 180 +#define LOAD_ATTR_INSTANCE_VALUE 181 +#define LOAD_ATTR_METHOD_LAZY_DICT 182 +#define LOAD_ATTR_METHOD_NO_DICT 183 +#define LOAD_ATTR_METHOD_WITH_VALUES 184 +#define LOAD_ATTR_MODULE 185 +#define LOAD_ATTR_NONDESCRIPTOR_NO_DICT 186 +#define LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 187 +#define LOAD_ATTR_PROPERTY 188 +#define LOAD_ATTR_SLOT 189 +#define LOAD_ATTR_WITH_HINT 190 +#define LOAD_GLOBAL_BUILTIN 191 +#define LOAD_GLOBAL_MODULE 192 +#define LOAD_SUPER_ATTR_ATTR 193 +#define LOAD_SUPER_ATTR_METHOD 194 +#define RESUME_CHECK 195 +#define SEND_GEN 196 +#define STORE_ATTR_INSTANCE_VALUE 197 +#define STORE_ATTR_SLOT 198 +#define STORE_ATTR_WITH_HINT 199 +#define STORE_SUBSCR_DICT 200 +#define STORE_SUBSCR_LIST_INT 201 +#define TO_BOOL_ALWAYS_TRUE 202 +#define TO_BOOL_BOOL 203 +#define TO_BOOL_INT 204 +#define TO_BOOL_LIST 205 +#define TO_BOOL_NONE 206 +#define TO_BOOL_STR 207 +#define UNPACK_SEQUENCE_LIST 208 +#define UNPACK_SEQUENCE_TUPLE 209 +#define UNPACK_SEQUENCE_TWO_TUPLE 210 #define INSTRUMENTED_END_FOR 233 #define INSTRUMENTED_POP_ITER 234 #define INSTRUMENTED_END_SEND 235 diff --git a/Lib/_opcode_metadata.py b/Lib/_opcode_metadata.py index b3dce93710a23f..62e71f9ba661f6 100644 --- a/Lib/_opcode_metadata.py +++ b/Lib/_opcode_metadata.py @@ -26,6 +26,7 @@ "BINARY_OP_SUBSCR_LIST_SLICE", "BINARY_OP_SUBSCR_TUPLE_INT", "BINARY_OP_SUBSCR_STR_INT", + "BINARY_OP_SUBSCR_NCSTR_INT", "BINARY_OP_SUBSCR_DICT", "BINARY_OP_SUBSCR_GETITEM", "BINARY_OP_INPLACE_ADD_UNICODE", @@ -133,77 +134,78 @@ 'BINARY_OP_SUBSCR_GETITEM': 136, 'BINARY_OP_SUBSCR_LIST_INT': 137, 'BINARY_OP_SUBSCR_LIST_SLICE': 138, - 'BINARY_OP_SUBSCR_STR_INT': 139, - 'BINARY_OP_SUBSCR_TUPLE_INT': 140, - 'BINARY_OP_SUBTRACT_FLOAT': 141, - 'BINARY_OP_SUBTRACT_INT': 142, - 'CALL_ALLOC_AND_ENTER_INIT': 143, - 'CALL_BOUND_METHOD_EXACT_ARGS': 144, - 'CALL_BOUND_METHOD_GENERAL': 145, - 'CALL_BUILTIN_CLASS': 146, - 'CALL_BUILTIN_FAST': 147, - 'CALL_BUILTIN_FAST_WITH_KEYWORDS': 148, - 'CALL_BUILTIN_O': 149, - 'CALL_ISINSTANCE': 150, - 'CALL_KW_BOUND_METHOD': 151, - 'CALL_KW_NON_PY': 152, - 'CALL_KW_PY': 153, - 'CALL_LEN': 154, - 'CALL_LIST_APPEND': 155, - 'CALL_METHOD_DESCRIPTOR_FAST': 156, - 'CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS': 157, - 'CALL_METHOD_DESCRIPTOR_NOARGS': 158, - 'CALL_METHOD_DESCRIPTOR_O': 159, - 'CALL_NON_PY_GENERAL': 160, - 'CALL_PY_EXACT_ARGS': 161, - 'CALL_PY_GENERAL': 162, - 'CALL_STR_1': 163, - 'CALL_TUPLE_1': 164, - 'CALL_TYPE_1': 165, - 'COMPARE_OP_FLOAT': 166, - 'COMPARE_OP_INT': 167, - 'COMPARE_OP_STR': 168, - 'CONTAINS_OP_DICT': 169, - 'CONTAINS_OP_SET': 170, - 'FOR_ITER_GEN': 171, - 'FOR_ITER_LIST': 172, - 'FOR_ITER_RANGE': 173, - 'FOR_ITER_TUPLE': 174, - 'JUMP_BACKWARD_JIT': 175, - 'JUMP_BACKWARD_NO_JIT': 176, - 'LOAD_ATTR_CLASS': 177, - 'LOAD_ATTR_CLASS_WITH_METACLASS_CHECK': 178, - 'LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN': 179, - 'LOAD_ATTR_INSTANCE_VALUE': 180, - 'LOAD_ATTR_METHOD_LAZY_DICT': 181, - 'LOAD_ATTR_METHOD_NO_DICT': 182, - 'LOAD_ATTR_METHOD_WITH_VALUES': 183, - 'LOAD_ATTR_MODULE': 184, - 'LOAD_ATTR_NONDESCRIPTOR_NO_DICT': 185, - 'LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES': 186, - 'LOAD_ATTR_PROPERTY': 187, - 'LOAD_ATTR_SLOT': 188, - 'LOAD_ATTR_WITH_HINT': 189, - 'LOAD_GLOBAL_BUILTIN': 190, - 'LOAD_GLOBAL_MODULE': 191, - 'LOAD_SUPER_ATTR_ATTR': 192, - 'LOAD_SUPER_ATTR_METHOD': 193, - 'RESUME_CHECK': 194, - 'SEND_GEN': 195, - 'STORE_ATTR_INSTANCE_VALUE': 196, - 'STORE_ATTR_SLOT': 197, - 'STORE_ATTR_WITH_HINT': 198, - 'STORE_SUBSCR_DICT': 199, - 'STORE_SUBSCR_LIST_INT': 200, - 'TO_BOOL_ALWAYS_TRUE': 201, - 'TO_BOOL_BOOL': 202, - 'TO_BOOL_INT': 203, - 'TO_BOOL_LIST': 204, - 'TO_BOOL_NONE': 205, - 'TO_BOOL_STR': 206, - 'UNPACK_SEQUENCE_LIST': 207, - 'UNPACK_SEQUENCE_TUPLE': 208, - 'UNPACK_SEQUENCE_TWO_TUPLE': 209, + 'BINARY_OP_SUBSCR_NCSTR_INT': 139, + 'BINARY_OP_SUBSCR_STR_INT': 140, + 'BINARY_OP_SUBSCR_TUPLE_INT': 141, + 'BINARY_OP_SUBTRACT_FLOAT': 142, + 'BINARY_OP_SUBTRACT_INT': 143, + 'CALL_ALLOC_AND_ENTER_INIT': 144, + 'CALL_BOUND_METHOD_EXACT_ARGS': 145, + 'CALL_BOUND_METHOD_GENERAL': 146, + 'CALL_BUILTIN_CLASS': 147, + 'CALL_BUILTIN_FAST': 148, + 'CALL_BUILTIN_FAST_WITH_KEYWORDS': 149, + 'CALL_BUILTIN_O': 150, + 'CALL_ISINSTANCE': 151, + 'CALL_KW_BOUND_METHOD': 152, + 'CALL_KW_NON_PY': 153, + 'CALL_KW_PY': 154, + 'CALL_LEN': 155, + 'CALL_LIST_APPEND': 156, + 'CALL_METHOD_DESCRIPTOR_FAST': 157, + 'CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS': 158, + 'CALL_METHOD_DESCRIPTOR_NOARGS': 159, + 'CALL_METHOD_DESCRIPTOR_O': 160, + 'CALL_NON_PY_GENERAL': 161, + 'CALL_PY_EXACT_ARGS': 162, + 'CALL_PY_GENERAL': 163, + 'CALL_STR_1': 164, + 'CALL_TUPLE_1': 165, + 'CALL_TYPE_1': 166, + 'COMPARE_OP_FLOAT': 167, + 'COMPARE_OP_INT': 168, + 'COMPARE_OP_STR': 169, + 'CONTAINS_OP_DICT': 170, + 'CONTAINS_OP_SET': 171, + 'FOR_ITER_GEN': 172, + 'FOR_ITER_LIST': 173, + 'FOR_ITER_RANGE': 174, + 'FOR_ITER_TUPLE': 175, + 'JUMP_BACKWARD_JIT': 176, + 'JUMP_BACKWARD_NO_JIT': 177, + 'LOAD_ATTR_CLASS': 178, + 'LOAD_ATTR_CLASS_WITH_METACLASS_CHECK': 179, + 'LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN': 180, + 'LOAD_ATTR_INSTANCE_VALUE': 181, + 'LOAD_ATTR_METHOD_LAZY_DICT': 182, + 'LOAD_ATTR_METHOD_NO_DICT': 183, + 'LOAD_ATTR_METHOD_WITH_VALUES': 184, + 'LOAD_ATTR_MODULE': 185, + 'LOAD_ATTR_NONDESCRIPTOR_NO_DICT': 186, + 'LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES': 187, + 'LOAD_ATTR_PROPERTY': 188, + 'LOAD_ATTR_SLOT': 189, + 'LOAD_ATTR_WITH_HINT': 190, + 'LOAD_GLOBAL_BUILTIN': 191, + 'LOAD_GLOBAL_MODULE': 192, + 'LOAD_SUPER_ATTR_ATTR': 193, + 'LOAD_SUPER_ATTR_METHOD': 194, + 'RESUME_CHECK': 195, + 'SEND_GEN': 196, + 'STORE_ATTR_INSTANCE_VALUE': 197, + 'STORE_ATTR_SLOT': 198, + 'STORE_ATTR_WITH_HINT': 199, + 'STORE_SUBSCR_DICT': 200, + 'STORE_SUBSCR_LIST_INT': 201, + 'TO_BOOL_ALWAYS_TRUE': 202, + 'TO_BOOL_BOOL': 203, + 'TO_BOOL_INT': 204, + 'TO_BOOL_LIST': 205, + 'TO_BOOL_NONE': 206, + 'TO_BOOL_STR': 207, + 'UNPACK_SEQUENCE_LIST': 208, + 'UNPACK_SEQUENCE_TUPLE': 209, + 'UNPACK_SEQUENCE_TWO_TUPLE': 210, } opmap = { diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 366bca44f83f16..971b662ebbe006 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -594,6 +594,7 @@ dummy_func( BINARY_OP_SUBSCR_LIST_SLICE, BINARY_OP_SUBSCR_TUPLE_INT, BINARY_OP_SUBSCR_STR_INT, + BINARY_OP_SUBSCR_NCSTR_INT, BINARY_OP_SUBSCR_DICT, BINARY_OP_SUBSCR_GETITEM, BINARY_OP_INPLACE_ADD_UNICODE, @@ -963,6 +964,29 @@ dummy_func( res = PyStackRef_FromPyObjectBorrow(res_o); } + macro(BINARY_OP_SUBSCR_NCSTR_INT) = + _GUARD_TOS_INT + _GUARD_NOS_UNICODE + unused/5 + _BINARY_OP_SUBSCR_NCSTR_INT + _POP_TOP_INT + POP_TOP; + + op(_BINARY_OP_SUBSCR_NCSTR_INT, (str_st, sub_st -- res, s, i)) { + PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); + PyObject *str = PyStackRef_AsPyObjectBorrow(str_st); + + 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); + // Specialize for reading an ASCII character from any string: + Py_UCS4 c = PyUnicode_READ_CHAR(str, index); + DEOPT_IF(Py_ARRAY_LENGTH(_Py_SINGLETON(strings).ascii) <= c); + STAT_INC(BINARY_OP, hit); + PyObject *res_o = (PyObject*)&_Py_SINGLETON(strings).ascii[c]; + INPUTS_DEAD(); + s = str_st; + i = sub_st; + res = PyStackRef_FromPyObjectBorrow(res_o); + } + op(_GUARD_NOS_TUPLE, (nos, unused -- nos, unused)) { PyObject *o = PyStackRef_AsPyObjectBorrow(nos); EXIT_IF(!PyTuple_CheckExact(o)); diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 3fe7a3200269c3..7af8dc062aef56 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -5344,6 +5344,58 @@ break; } + case _BINARY_OP_SUBSCR_NCSTR_INT_r23: { + CHECK_CURRENT_CACHED_VALUES(2); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef sub_st; + _PyStackRef str_st; + _PyStackRef res; + _PyStackRef s; + _PyStackRef i; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + sub_st = _stack_item_1; + str_st = _stack_item_0; + 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)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache1 = sub_st; + _tos_cache0 = str_st; + SET_CURRENT_CACHED_VALUES(2); + JUMP_TO_JUMP_TARGET(); + } + Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; + if (PyUnicode_GET_LENGTH(str) <= index) { + UOP_STAT_INC(uopcode, miss); + _tos_cache1 = sub_st; + _tos_cache0 = str_st; + SET_CURRENT_CACHED_VALUES(2); + JUMP_TO_JUMP_TARGET(); + } + Py_UCS4 c = PyUnicode_READ_CHAR(str, index); + if (Py_ARRAY_LENGTH(_Py_SINGLETON(strings).ascii) <= c) { + UOP_STAT_INC(uopcode, miss); + _tos_cache1 = sub_st; + _tos_cache0 = str_st; + SET_CURRENT_CACHED_VALUES(2); + JUMP_TO_JUMP_TARGET(); + } + STAT_INC(BINARY_OP, hit); + PyObject *res_o = (PyObject*)&_Py_SINGLETON(strings).ascii[c]; + s = str_st; + i = sub_st; + res = PyStackRef_FromPyObjectBorrow(res_o); + _tos_cache2 = i; + _tos_cache1 = s; + _tos_cache0 = res; + SET_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + case _GUARD_NOS_TUPLE_r02: { CHECK_CURRENT_CACHED_VALUES(0); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index a1d5a98255c405..42b9b98f45d1b4 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -914,6 +914,95 @@ DISPATCH(); } + TARGET(BINARY_OP_SUBSCR_NCSTR_INT) { + #if _Py_TAIL_CALL_INTERP + int opcode = BINARY_OP_SUBSCR_NCSTR_INT; + (void)(opcode); + #endif + _Py_CODEUNIT* const this_instr = next_instr; + (void)this_instr; + frame->instr_ptr = next_instr; + next_instr += 6; + INSTRUCTION_STATS(BINARY_OP_SUBSCR_NCSTR_INT); + static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size"); + _PyStackRef value; + _PyStackRef nos; + _PyStackRef str_st; + _PyStackRef sub_st; + _PyStackRef res; + _PyStackRef s; + _PyStackRef i; + // _GUARD_TOS_INT + { + value = stack_pointer[-1]; + PyObject *value_o = PyStackRef_AsPyObjectBorrow(value); + if (!_PyLong_CheckExactAndCompact(value_o)) { + UPDATE_MISS_STATS(BINARY_OP); + assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); + JUMP_TO_PREDICTED(BINARY_OP); + } + } + // _GUARD_NOS_UNICODE + { + nos = stack_pointer[-2]; + 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); + } + } + /* Skip 5 cache entries */ + // _BINARY_OP_SUBSCR_NCSTR_INT + { + sub_st = value; + 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); + } + 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]; + s = str_st; + i = sub_st; + res = PyStackRef_FromPyObjectBorrow(res_o); + } + // _POP_TOP_INT + { + value = i; + assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value))); + PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc); + } + // _POP_TOP + { + value = s; + stack_pointer[-2] = res; + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + _PyFrame_SetStackPointer(frame, stack_pointer); + PyStackRef_XCLOSE(value); + stack_pointer = _PyFrame_GetStackPointer(frame); + } + DISPATCH(); + } + TARGET(BINARY_OP_SUBSCR_STR_INT) { #if _Py_TAIL_CALL_INTERP int opcode = BINARY_OP_SUBSCR_STR_INT; diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h index 267e707dc597fb..24afd8004fdf9f 100644 --- a/Python/opcode_targets.h +++ b/Python/opcode_targets.h @@ -139,6 +139,7 @@ static void *opcode_targets_table[256] = { &&TARGET_BINARY_OP_SUBSCR_GETITEM, &&TARGET_BINARY_OP_SUBSCR_LIST_INT, &&TARGET_BINARY_OP_SUBSCR_LIST_SLICE, + &&TARGET_BINARY_OP_SUBSCR_NCSTR_INT, &&TARGET_BINARY_OP_SUBSCR_STR_INT, &&TARGET_BINARY_OP_SUBSCR_TUPLE_INT, &&TARGET_BINARY_OP_SUBTRACT_FLOAT, @@ -232,7 +233,6 @@ static void *opcode_targets_table[256] = { &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, - &&_unknown_opcode, &&TARGET_INSTRUMENTED_END_FOR, &&TARGET_INSTRUMENTED_POP_ITER, &&TARGET_INSTRUMENTED_END_SEND, @@ -469,7 +469,7 @@ static void *opcode_tracing_targets_table[256] = { &&TARGET_TRACE_RECORD, &&TARGET_TRACE_RECORD, &&TARGET_TRACE_RECORD, - &&_unknown_opcode, + &&TARGET_TRACE_RECORD, &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, @@ -542,6 +542,7 @@ static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_DICT(TAIL_CALL_ static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_GETITEM(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_LIST_INT(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_LIST_SLICE(TAIL_CALL_PARAMS); +static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_NCSTR_INT(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_STR_INT(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_TUPLE_INT(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBTRACT_FLOAT(TAIL_CALL_PARAMS); @@ -780,6 +781,7 @@ static py_tail_call_funcptr instruction_funcptr_handler_table[256] = { [BINARY_OP_SUBSCR_GETITEM] = _TAIL_CALL_BINARY_OP_SUBSCR_GETITEM, [BINARY_OP_SUBSCR_LIST_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_LIST_INT, [BINARY_OP_SUBSCR_LIST_SLICE] = _TAIL_CALL_BINARY_OP_SUBSCR_LIST_SLICE, + [BINARY_OP_SUBSCR_NCSTR_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_NCSTR_INT, [BINARY_OP_SUBSCR_STR_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_STR_INT, [BINARY_OP_SUBSCR_TUPLE_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_TUPLE_INT, [BINARY_OP_SUBTRACT_FLOAT] = _TAIL_CALL_BINARY_OP_SUBTRACT_FLOAT, @@ -1001,7 +1003,6 @@ static py_tail_call_funcptr instruction_funcptr_handler_table[256] = { [125] = _TAIL_CALL_UNKNOWN_OPCODE, [126] = _TAIL_CALL_UNKNOWN_OPCODE, [127] = _TAIL_CALL_UNKNOWN_OPCODE, - [210] = _TAIL_CALL_UNKNOWN_OPCODE, [211] = _TAIL_CALL_UNKNOWN_OPCODE, [212] = _TAIL_CALL_UNKNOWN_OPCODE, [213] = _TAIL_CALL_UNKNOWN_OPCODE, @@ -1038,6 +1039,7 @@ static py_tail_call_funcptr instruction_funcptr_tracing_table[256] = { [BINARY_OP_SUBSCR_GETITEM] = _TAIL_CALL_TRACE_RECORD, [BINARY_OP_SUBSCR_LIST_INT] = _TAIL_CALL_TRACE_RECORD, [BINARY_OP_SUBSCR_LIST_SLICE] = _TAIL_CALL_TRACE_RECORD, + [BINARY_OP_SUBSCR_NCSTR_INT] = _TAIL_CALL_TRACE_RECORD, [BINARY_OP_SUBSCR_STR_INT] = _TAIL_CALL_TRACE_RECORD, [BINARY_OP_SUBSCR_TUPLE_INT] = _TAIL_CALL_TRACE_RECORD, [BINARY_OP_SUBTRACT_FLOAT] = _TAIL_CALL_TRACE_RECORD, @@ -1259,7 +1261,6 @@ static py_tail_call_funcptr instruction_funcptr_tracing_table[256] = { [125] = _TAIL_CALL_UNKNOWN_OPCODE, [126] = _TAIL_CALL_UNKNOWN_OPCODE, [127] = _TAIL_CALL_UNKNOWN_OPCODE, - [210] = _TAIL_CALL_UNKNOWN_OPCODE, [211] = _TAIL_CALL_UNKNOWN_OPCODE, [212] = _TAIL_CALL_UNKNOWN_OPCODE, [213] = _TAIL_CALL_UNKNOWN_OPCODE, diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index f23769c37c954d..8a0a4726b85d02 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -787,6 +787,22 @@ break; } + case _BINARY_OP_SUBSCR_NCSTR_INT: { + JitOptRef res; + JitOptRef s; + JitOptRef i; + res = sym_new_not_null(ctx); + s = sym_new_not_null(ctx); + i = sym_new_not_null(ctx); + CHECK_STACK_BOUNDS(1); + stack_pointer[-2] = res; + stack_pointer[-1] = s; + stack_pointer[0] = i; + stack_pointer += 1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + break; + } + case _GUARD_NOS_TUPLE: { JitOptRef nos; nos = stack_pointer[-2]; diff --git a/Python/specialize.c b/Python/specialize.c index e9302157e7782a..b31dec1ded9ba6 100644 --- a/Python/specialize.c +++ b/Python/specialize.c @@ -2240,9 +2240,14 @@ _Py_Specialize_BinaryOp(_PyStackRef lhs_st, _PyStackRef rhs_st, _Py_CODEUNIT *in specialize(instr, BINARY_OP_SUBSCR_TUPLE_INT); return; } - if (PyUnicode_CheckExact(lhs) && PyUnicode_IS_COMPACT_ASCII(lhs)) { - specialize(instr, BINARY_OP_SUBSCR_STR_INT); - return; + if (PyUnicode_CheckExact(lhs)) { + if (PyUnicode_IS_COMPACT_ASCII(lhs)) { + specialize(instr, BINARY_OP_SUBSCR_STR_INT); + return; + } else { + specialize(instr, BINARY_OP_SUBSCR_NCSTR_INT); + return; + } } } if (PyDict_CheckExact(lhs)) { From f69803d0512b3e11288bd5132b86627831d6b534 Mon Sep 17 00:00:00 2001 From: Chris Eibl <138194463+chris-eibl@users.noreply.github.com> Date: Sun, 4 Jan 2026 09:09:58 +0100 Subject: [PATCH 02/10] BINARY_OP_SUBSCR_NCSTR_INT -> BINARY_OP_SUBSCR_USTR_INT --- Include/internal/pycore_opcode_metadata.h | 16 +-- Include/internal/pycore_uop_ids.h | 16 +-- Include/internal/pycore_uop_metadata.h | 14 +-- Include/opcode_ids.h | 6 +- Lib/_opcode_metadata.py | 8 +- Python/bytecodes.c | 8 +- Python/executor_cases.c.h | 2 +- Python/generated_cases.c.h | 134 +++++++++++----------- Python/opcode_targets.h | 8 +- Python/optimizer_cases.c.h | 2 +- Python/specialize.c | 2 +- 11 files changed, 108 insertions(+), 108 deletions(-) diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h index 006de127895201..e9e99048bc4de2 100644 --- a/Include/internal/pycore_opcode_metadata.h +++ b/Include/internal/pycore_opcode_metadata.h @@ -62,12 +62,12 @@ int _PyOpcode_num_popped(int opcode, int oparg) { return 2; case BINARY_OP_SUBSCR_LIST_SLICE: return 2; - case BINARY_OP_SUBSCR_NCSTR_INT: - return 2; case BINARY_OP_SUBSCR_STR_INT: return 2; case BINARY_OP_SUBSCR_TUPLE_INT: return 2; + case BINARY_OP_SUBSCR_USTR_INT: + return 2; case BINARY_OP_SUBTRACT_FLOAT: return 2; case BINARY_OP_SUBTRACT_INT: @@ -549,12 +549,12 @@ int _PyOpcode_num_pushed(int opcode, int oparg) { return 1; case BINARY_OP_SUBSCR_LIST_SLICE: return 1; - case BINARY_OP_SUBSCR_NCSTR_INT: - return 1; case BINARY_OP_SUBSCR_STR_INT: return 1; case BINARY_OP_SUBSCR_TUPLE_INT: return 1; + case BINARY_OP_SUBSCR_USTR_INT: + return 1; case BINARY_OP_SUBTRACT_FLOAT: return 1; case BINARY_OP_SUBTRACT_INT: @@ -1094,9 +1094,9 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [BINARY_OP_SUBSCR_GETITEM] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, [BINARY_OP_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_SUBSCR_LIST_SLICE] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, - [BINARY_OP_SUBSCR_NCSTR_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 | HAS_ESCAPES_FLAG }, + [BINARY_OP_SUBSCR_USTR_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_SUBTRACT_FLOAT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG }, [BINARY_OP_SUBTRACT_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG }, [BINARY_SLICE] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, @@ -1345,9 +1345,9 @@ _PyOpcode_macro_expansion[256] = { [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 = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_LIST, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_LIST_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_LIST_SLICE] = { .nuops = 3, .uops = { { _GUARD_TOS_SLICE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_LIST, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_LIST_SLICE, OPARG_SIMPLE, 5 } } }, - [BINARY_OP_SUBSCR_NCSTR_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_NCSTR_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_STR_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_COMPACT_ASCII, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_STR_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_TUPLE_INT] = { .nuops = 6, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_TUPLE, OPARG_SIMPLE, 0 }, { _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_TUPLE_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP, OPARG_SIMPLE, 5 } } }, + [BINARY_OP_SUBSCR_USTR_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_USTR_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBTRACT_FLOAT] = { .nuops = 5, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBTRACT_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 } } }, [BINARY_SLICE] = { .nuops = 1, .uops = { { _BINARY_SLICE, OPARG_SIMPLE, 0 } } }, @@ -1538,9 +1538,9 @@ const char *_PyOpcode_OpName[267] = { [BINARY_OP_SUBSCR_GETITEM] = "BINARY_OP_SUBSCR_GETITEM", [BINARY_OP_SUBSCR_LIST_INT] = "BINARY_OP_SUBSCR_LIST_INT", [BINARY_OP_SUBSCR_LIST_SLICE] = "BINARY_OP_SUBSCR_LIST_SLICE", - [BINARY_OP_SUBSCR_NCSTR_INT] = "BINARY_OP_SUBSCR_NCSTR_INT", [BINARY_OP_SUBSCR_STR_INT] = "BINARY_OP_SUBSCR_STR_INT", [BINARY_OP_SUBSCR_TUPLE_INT] = "BINARY_OP_SUBSCR_TUPLE_INT", + [BINARY_OP_SUBSCR_USTR_INT] = "BINARY_OP_SUBSCR_USTR_INT", [BINARY_OP_SUBTRACT_FLOAT] = "BINARY_OP_SUBTRACT_FLOAT", [BINARY_OP_SUBTRACT_INT] = "BINARY_OP_SUBTRACT_INT", [BINARY_SLICE] = "BINARY_SLICE", @@ -1835,9 +1835,9 @@ const uint8_t _PyOpcode_Deopt[256] = { [BINARY_OP_SUBSCR_GETITEM] = BINARY_OP, [BINARY_OP_SUBSCR_LIST_INT] = BINARY_OP, [BINARY_OP_SUBSCR_LIST_SLICE] = BINARY_OP, - [BINARY_OP_SUBSCR_NCSTR_INT] = BINARY_OP, [BINARY_OP_SUBSCR_STR_INT] = BINARY_OP, [BINARY_OP_SUBSCR_TUPLE_INT] = BINARY_OP, + [BINARY_OP_SUBSCR_USTR_INT] = BINARY_OP, [BINARY_OP_SUBTRACT_FLOAT] = BINARY_OP, [BINARY_OP_SUBTRACT_INT] = BINARY_OP, [BINARY_SLICE] = BINARY_SLICE, diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index 7dd90879741a3f..ad170592dc2584 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -24,9 +24,9 @@ extern "C" { #define _BINARY_OP_SUBSCR_INIT_CALL 312 #define _BINARY_OP_SUBSCR_LIST_INT 313 #define _BINARY_OP_SUBSCR_LIST_SLICE 314 -#define _BINARY_OP_SUBSCR_NCSTR_INT 315 -#define _BINARY_OP_SUBSCR_STR_INT 316 -#define _BINARY_OP_SUBSCR_TUPLE_INT 317 +#define _BINARY_OP_SUBSCR_STR_INT 315 +#define _BINARY_OP_SUBSCR_TUPLE_INT 316 +#define _BINARY_OP_SUBSCR_USTR_INT 317 #define _BINARY_OP_SUBTRACT_FLOAT 318 #define _BINARY_OP_SUBTRACT_INT 319 #define _BINARY_SLICE 320 @@ -389,11 +389,11 @@ extern "C" { #define _BINARY_OP_SUBSCR_INIT_CALL_r31 583 #define _BINARY_OP_SUBSCR_LIST_INT_r23 584 #define _BINARY_OP_SUBSCR_LIST_SLICE_r21 585 -#define _BINARY_OP_SUBSCR_NCSTR_INT_r23 586 -#define _BINARY_OP_SUBSCR_STR_INT_r23 587 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r03 588 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r13 589 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r23 590 +#define _BINARY_OP_SUBSCR_STR_INT_r23 586 +#define _BINARY_OP_SUBSCR_TUPLE_INT_r03 587 +#define _BINARY_OP_SUBSCR_TUPLE_INT_r13 588 +#define _BINARY_OP_SUBSCR_TUPLE_INT_r23 589 +#define _BINARY_OP_SUBSCR_USTR_INT_r23 590 #define _BINARY_OP_SUBTRACT_FLOAT_r03 591 #define _BINARY_OP_SUBTRACT_FLOAT_r13 592 #define _BINARY_OP_SUBTRACT_FLOAT_r23 593 diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index 2b23aa532aa30a..d65769edc6e45a 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -121,7 +121,7 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_BINARY_OP_SUBSCR_LIST_INT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, [_BINARY_OP_SUBSCR_LIST_SLICE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_BINARY_OP_SUBSCR_STR_INT] = HAS_DEOPT_FLAG, - [_BINARY_OP_SUBSCR_NCSTR_INT] = HAS_DEOPT_FLAG, + [_BINARY_OP_SUBSCR_USTR_INT] = HAS_DEOPT_FLAG, [_GUARD_NOS_TUPLE] = HAS_EXIT_FLAG, [_GUARD_TOS_TUPLE] = HAS_EXIT_FLAG, [_GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS] = HAS_DEOPT_FLAG, @@ -1144,12 +1144,12 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { { -1, -1, -1 }, }, }, - [_BINARY_OP_SUBSCR_NCSTR_INT] = { + [_BINARY_OP_SUBSCR_USTR_INT] = { .best = { 2, 2, 2, 2 }, .entries = { { -1, -1, -1 }, { -1, -1, -1 }, - { 3, 2, _BINARY_OP_SUBSCR_NCSTR_INT_r23 }, + { 3, 2, _BINARY_OP_SUBSCR_USTR_INT_r23 }, { -1, -1, -1 }, }, }, @@ -3506,7 +3506,7 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_BINARY_OP_SUBSCR_LIST_INT_r23] = _BINARY_OP_SUBSCR_LIST_INT, [_BINARY_OP_SUBSCR_LIST_SLICE_r21] = _BINARY_OP_SUBSCR_LIST_SLICE, [_BINARY_OP_SUBSCR_STR_INT_r23] = _BINARY_OP_SUBSCR_STR_INT, - [_BINARY_OP_SUBSCR_NCSTR_INT_r23] = _BINARY_OP_SUBSCR_NCSTR_INT, + [_BINARY_OP_SUBSCR_USTR_INT_r23] = _BINARY_OP_SUBSCR_USTR_INT, [_GUARD_NOS_TUPLE_r02] = _GUARD_NOS_TUPLE, [_GUARD_NOS_TUPLE_r12] = _GUARD_NOS_TUPLE, [_GUARD_NOS_TUPLE_r22] = _GUARD_NOS_TUPLE, @@ -4037,14 +4037,14 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_BINARY_OP_SUBSCR_LIST_INT_r23] = "_BINARY_OP_SUBSCR_LIST_INT_r23", [_BINARY_OP_SUBSCR_LIST_SLICE] = "_BINARY_OP_SUBSCR_LIST_SLICE", [_BINARY_OP_SUBSCR_LIST_SLICE_r21] = "_BINARY_OP_SUBSCR_LIST_SLICE_r21", - [_BINARY_OP_SUBSCR_NCSTR_INT] = "_BINARY_OP_SUBSCR_NCSTR_INT", - [_BINARY_OP_SUBSCR_NCSTR_INT_r23] = "_BINARY_OP_SUBSCR_NCSTR_INT_r23", [_BINARY_OP_SUBSCR_STR_INT] = "_BINARY_OP_SUBSCR_STR_INT", [_BINARY_OP_SUBSCR_STR_INT_r23] = "_BINARY_OP_SUBSCR_STR_INT_r23", [_BINARY_OP_SUBSCR_TUPLE_INT] = "_BINARY_OP_SUBSCR_TUPLE_INT", [_BINARY_OP_SUBSCR_TUPLE_INT_r03] = "_BINARY_OP_SUBSCR_TUPLE_INT_r03", [_BINARY_OP_SUBSCR_TUPLE_INT_r13] = "_BINARY_OP_SUBSCR_TUPLE_INT_r13", [_BINARY_OP_SUBSCR_TUPLE_INT_r23] = "_BINARY_OP_SUBSCR_TUPLE_INT_r23", + [_BINARY_OP_SUBSCR_USTR_INT] = "_BINARY_OP_SUBSCR_USTR_INT", + [_BINARY_OP_SUBSCR_USTR_INT_r23] = "_BINARY_OP_SUBSCR_USTR_INT_r23", [_BINARY_OP_SUBTRACT_FLOAT] = "_BINARY_OP_SUBTRACT_FLOAT", [_BINARY_OP_SUBTRACT_FLOAT_r03] = "_BINARY_OP_SUBTRACT_FLOAT_r03", [_BINARY_OP_SUBTRACT_FLOAT_r13] = "_BINARY_OP_SUBTRACT_FLOAT_r13", @@ -5214,7 +5214,7 @@ int _PyUop_num_popped(int opcode, int oparg) return 2; case _BINARY_OP_SUBSCR_STR_INT: return 2; - case _BINARY_OP_SUBSCR_NCSTR_INT: + case _BINARY_OP_SUBSCR_USTR_INT: return 2; case _GUARD_NOS_TUPLE: return 0; diff --git a/Include/opcode_ids.h b/Include/opcode_ids.h index c6dbb263f7434f..b17c1fa140d904 100644 --- a/Include/opcode_ids.h +++ b/Include/opcode_ids.h @@ -142,9 +142,9 @@ extern "C" { #define BINARY_OP_SUBSCR_GETITEM 136 #define BINARY_OP_SUBSCR_LIST_INT 137 #define BINARY_OP_SUBSCR_LIST_SLICE 138 -#define BINARY_OP_SUBSCR_NCSTR_INT 139 -#define BINARY_OP_SUBSCR_STR_INT 140 -#define BINARY_OP_SUBSCR_TUPLE_INT 141 +#define BINARY_OP_SUBSCR_STR_INT 139 +#define BINARY_OP_SUBSCR_TUPLE_INT 140 +#define BINARY_OP_SUBSCR_USTR_INT 141 #define BINARY_OP_SUBTRACT_FLOAT 142 #define BINARY_OP_SUBTRACT_INT 143 #define CALL_ALLOC_AND_ENTER_INIT 144 diff --git a/Lib/_opcode_metadata.py b/Lib/_opcode_metadata.py index 62e71f9ba661f6..7d6997a88696c0 100644 --- a/Lib/_opcode_metadata.py +++ b/Lib/_opcode_metadata.py @@ -26,7 +26,7 @@ "BINARY_OP_SUBSCR_LIST_SLICE", "BINARY_OP_SUBSCR_TUPLE_INT", "BINARY_OP_SUBSCR_STR_INT", - "BINARY_OP_SUBSCR_NCSTR_INT", + "BINARY_OP_SUBSCR_USTR_INT", "BINARY_OP_SUBSCR_DICT", "BINARY_OP_SUBSCR_GETITEM", "BINARY_OP_INPLACE_ADD_UNICODE", @@ -134,9 +134,9 @@ 'BINARY_OP_SUBSCR_GETITEM': 136, 'BINARY_OP_SUBSCR_LIST_INT': 137, 'BINARY_OP_SUBSCR_LIST_SLICE': 138, - 'BINARY_OP_SUBSCR_NCSTR_INT': 139, - 'BINARY_OP_SUBSCR_STR_INT': 140, - 'BINARY_OP_SUBSCR_TUPLE_INT': 141, + 'BINARY_OP_SUBSCR_STR_INT': 139, + 'BINARY_OP_SUBSCR_TUPLE_INT': 140, + 'BINARY_OP_SUBSCR_USTR_INT': 141, 'BINARY_OP_SUBTRACT_FLOAT': 142, 'BINARY_OP_SUBTRACT_INT': 143, 'CALL_ALLOC_AND_ENTER_INIT': 144, diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 971b662ebbe006..d0304ee1023055 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -594,7 +594,7 @@ dummy_func( BINARY_OP_SUBSCR_LIST_SLICE, BINARY_OP_SUBSCR_TUPLE_INT, BINARY_OP_SUBSCR_STR_INT, - BINARY_OP_SUBSCR_NCSTR_INT, + BINARY_OP_SUBSCR_USTR_INT, BINARY_OP_SUBSCR_DICT, BINARY_OP_SUBSCR_GETITEM, BINARY_OP_INPLACE_ADD_UNICODE, @@ -964,10 +964,10 @@ dummy_func( res = PyStackRef_FromPyObjectBorrow(res_o); } - macro(BINARY_OP_SUBSCR_NCSTR_INT) = - _GUARD_TOS_INT + _GUARD_NOS_UNICODE + unused/5 + _BINARY_OP_SUBSCR_NCSTR_INT + _POP_TOP_INT + POP_TOP; + macro(BINARY_OP_SUBSCR_USTR_INT) = + _GUARD_TOS_INT + _GUARD_NOS_UNICODE + unused/5 + _BINARY_OP_SUBSCR_USTR_INT + _POP_TOP_INT + POP_TOP; - op(_BINARY_OP_SUBSCR_NCSTR_INT, (str_st, sub_st -- res, s, i)) { + op(_BINARY_OP_SUBSCR_USTR_INT, (str_st, sub_st -- res, s, i)) { PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); PyObject *str = PyStackRef_AsPyObjectBorrow(str_st); diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 7af8dc062aef56..30c707abf3a3e5 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -5344,7 +5344,7 @@ break; } - case _BINARY_OP_SUBSCR_NCSTR_INT_r23: { + case _BINARY_OP_SUBSCR_USTR_INT_r23: { CHECK_CURRENT_CACHED_VALUES(2); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); _PyStackRef sub_st; diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 42b9b98f45d1b4..9a160169396453 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -914,16 +914,16 @@ DISPATCH(); } - TARGET(BINARY_OP_SUBSCR_NCSTR_INT) { + TARGET(BINARY_OP_SUBSCR_STR_INT) { #if _Py_TAIL_CALL_INTERP - int opcode = BINARY_OP_SUBSCR_NCSTR_INT; + int opcode = BINARY_OP_SUBSCR_STR_INT; (void)(opcode); #endif _Py_CODEUNIT* const this_instr = next_instr; (void)this_instr; frame->instr_ptr = next_instr; next_instr += 6; - INSTRUCTION_STATS(BINARY_OP_SUBSCR_NCSTR_INT); + INSTRUCTION_STATS(BINARY_OP_SUBSCR_STR_INT); static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size"); _PyStackRef value; _PyStackRef nos; @@ -942,7 +942,7 @@ JUMP_TO_PREDICTED(BINARY_OP); } } - // _GUARD_NOS_UNICODE + // _GUARD_NOS_COMPACT_ASCII { nos = stack_pointer[-2]; PyObject *o = PyStackRef_AsPyObjectBorrow(nos); @@ -951,9 +951,14 @@ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); JUMP_TO_PREDICTED(BINARY_OP); } + if (!PyUnicode_IS_COMPACT_ASCII(o)) { + UPDATE_MISS_STATS(BINARY_OP); + assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); + JUMP_TO_PREDICTED(BINARY_OP); + } } /* Skip 5 cache entries */ - // _BINARY_OP_SUBSCR_NCSTR_INT + // _BINARY_OP_SUBSCR_STR_INT { sub_st = value; str_st = nos; @@ -972,12 +977,8 @@ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); JUMP_TO_PREDICTED(BINARY_OP); } - 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); - } + uint8_t c = PyUnicode_1BYTE_DATA(str)[index]; + assert(c < 128); STAT_INC(BINARY_OP, hit); PyObject *res_o = (PyObject*)&_Py_SINGLETON(strings).ascii[c]; s = str_st; @@ -1003,24 +1004,24 @@ DISPATCH(); } - TARGET(BINARY_OP_SUBSCR_STR_INT) { + TARGET(BINARY_OP_SUBSCR_TUPLE_INT) { #if _Py_TAIL_CALL_INTERP - int opcode = BINARY_OP_SUBSCR_STR_INT; + int opcode = BINARY_OP_SUBSCR_TUPLE_INT; (void)(opcode); #endif _Py_CODEUNIT* const this_instr = next_instr; (void)this_instr; frame->instr_ptr = next_instr; next_instr += 6; - INSTRUCTION_STATS(BINARY_OP_SUBSCR_STR_INT); + INSTRUCTION_STATS(BINARY_OP_SUBSCR_TUPLE_INT); static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size"); _PyStackRef value; _PyStackRef nos; - _PyStackRef str_st; + _PyStackRef tuple_st; _PyStackRef sub_st; _PyStackRef res; - _PyStackRef s; - _PyStackRef i; + _PyStackRef ts; + _PyStackRef ss; // _GUARD_TOS_INT { value = stack_pointer[-1]; @@ -1031,58 +1032,60 @@ JUMP_TO_PREDICTED(BINARY_OP); } } - // _GUARD_NOS_COMPACT_ASCII + // _GUARD_NOS_TUPLE { nos = stack_pointer[-2]; 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); - } - if (!PyUnicode_IS_COMPACT_ASCII(o)) { + if (!PyTuple_CheckExact(o)) { 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 + // _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS { sub_st = value; - str_st = nos; + tuple_st = nos; PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); - PyObject *str = PyStackRef_AsPyObjectBorrow(str_st); + PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st); assert(PyLong_CheckExact(sub)); - assert(PyUnicode_CheckExact(str)); + assert(PyTuple_CheckExact(tuple)); 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) { + if (index >= PyTuple_GET_SIZE(tuple)) { UPDATE_MISS_STATS(BINARY_OP); assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); JUMP_TO_PREDICTED(BINARY_OP); } - uint8_t c = PyUnicode_1BYTE_DATA(str)[index]; - assert(c < 128); + } + /* Skip 5 cache entries */ + // _BINARY_OP_SUBSCR_TUPLE_INT + { + PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); + PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st); + assert(PyLong_CheckExact(sub)); + assert(PyTuple_CheckExact(tuple)); STAT_INC(BINARY_OP, hit); - PyObject *res_o = (PyObject*)&_Py_SINGLETON(strings).ascii[c]; - s = str_st; - i = sub_st; - res = PyStackRef_FromPyObjectBorrow(res_o); + Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; + PyObject *res_o = PyTuple_GET_ITEM(tuple, index); + assert(res_o != NULL); + res = PyStackRef_FromPyObjectNew(res_o); + ts = tuple_st; + ss = sub_st; } // _POP_TOP_INT { - value = i; + value = ss; assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value))); PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc); } // _POP_TOP { - value = s; + value = ts; stack_pointer[-2] = res; stack_pointer += -1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); @@ -1093,24 +1096,24 @@ DISPATCH(); } - TARGET(BINARY_OP_SUBSCR_TUPLE_INT) { + TARGET(BINARY_OP_SUBSCR_USTR_INT) { #if _Py_TAIL_CALL_INTERP - int opcode = BINARY_OP_SUBSCR_TUPLE_INT; + int opcode = BINARY_OP_SUBSCR_USTR_INT; (void)(opcode); #endif _Py_CODEUNIT* const this_instr = next_instr; (void)this_instr; frame->instr_ptr = next_instr; next_instr += 6; - INSTRUCTION_STATS(BINARY_OP_SUBSCR_TUPLE_INT); + INSTRUCTION_STATS(BINARY_OP_SUBSCR_USTR_INT); static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size"); _PyStackRef value; _PyStackRef nos; - _PyStackRef tuple_st; + _PyStackRef str_st; _PyStackRef sub_st; _PyStackRef res; - _PyStackRef ts; - _PyStackRef ss; + _PyStackRef s; + _PyStackRef i; // _GUARD_TOS_INT { value = stack_pointer[-1]; @@ -1121,60 +1124,57 @@ JUMP_TO_PREDICTED(BINARY_OP); } } - // _GUARD_NOS_TUPLE + // _GUARD_NOS_UNICODE { nos = stack_pointer[-2]; PyObject *o = PyStackRef_AsPyObjectBorrow(nos); - if (!PyTuple_CheckExact(o)) { + if (!PyUnicode_CheckExact(o)) { UPDATE_MISS_STATS(BINARY_OP); assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); JUMP_TO_PREDICTED(BINARY_OP); } } - // _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS + /* Skip 5 cache entries */ + // _BINARY_OP_SUBSCR_USTR_INT { sub_st = value; - tuple_st = nos; + str_st = nos; PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); - PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st); + PyObject *str = PyStackRef_AsPyObjectBorrow(str_st); assert(PyLong_CheckExact(sub)); - assert(PyTuple_CheckExact(tuple)); + 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 (index >= PyTuple_GET_SIZE(tuple)) { + if (PyUnicode_GET_LENGTH(str) <= index) { + UPDATE_MISS_STATS(BINARY_OP); + assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); + JUMP_TO_PREDICTED(BINARY_OP); + } + 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_TUPLE_INT - { - PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); - PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st); - assert(PyLong_CheckExact(sub)); - assert(PyTuple_CheckExact(tuple)); STAT_INC(BINARY_OP, hit); - Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; - PyObject *res_o = PyTuple_GET_ITEM(tuple, index); - assert(res_o != NULL); - res = PyStackRef_FromPyObjectNew(res_o); - ts = tuple_st; - ss = sub_st; + PyObject *res_o = (PyObject*)&_Py_SINGLETON(strings).ascii[c]; + s = str_st; + i = sub_st; + res = PyStackRef_FromPyObjectBorrow(res_o); } // _POP_TOP_INT { - value = ss; + value = i; assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value))); PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc); } // _POP_TOP { - value = ts; + value = s; stack_pointer[-2] = res; stack_pointer += -1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h index 24afd8004fdf9f..01c93f51b97a0d 100644 --- a/Python/opcode_targets.h +++ b/Python/opcode_targets.h @@ -139,9 +139,9 @@ static void *opcode_targets_table[256] = { &&TARGET_BINARY_OP_SUBSCR_GETITEM, &&TARGET_BINARY_OP_SUBSCR_LIST_INT, &&TARGET_BINARY_OP_SUBSCR_LIST_SLICE, - &&TARGET_BINARY_OP_SUBSCR_NCSTR_INT, &&TARGET_BINARY_OP_SUBSCR_STR_INT, &&TARGET_BINARY_OP_SUBSCR_TUPLE_INT, + &&TARGET_BINARY_OP_SUBSCR_USTR_INT, &&TARGET_BINARY_OP_SUBTRACT_FLOAT, &&TARGET_BINARY_OP_SUBTRACT_INT, &&TARGET_CALL_ALLOC_AND_ENTER_INIT, @@ -542,9 +542,9 @@ static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_DICT(TAIL_CALL_ static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_GETITEM(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_LIST_INT(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_LIST_SLICE(TAIL_CALL_PARAMS); -static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_NCSTR_INT(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_STR_INT(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_TUPLE_INT(TAIL_CALL_PARAMS); +static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBSCR_USTR_INT(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBTRACT_FLOAT(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_OP_SUBTRACT_INT(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_BINARY_SLICE(TAIL_CALL_PARAMS); @@ -781,9 +781,9 @@ static py_tail_call_funcptr instruction_funcptr_handler_table[256] = { [BINARY_OP_SUBSCR_GETITEM] = _TAIL_CALL_BINARY_OP_SUBSCR_GETITEM, [BINARY_OP_SUBSCR_LIST_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_LIST_INT, [BINARY_OP_SUBSCR_LIST_SLICE] = _TAIL_CALL_BINARY_OP_SUBSCR_LIST_SLICE, - [BINARY_OP_SUBSCR_NCSTR_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_NCSTR_INT, [BINARY_OP_SUBSCR_STR_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_STR_INT, [BINARY_OP_SUBSCR_TUPLE_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_TUPLE_INT, + [BINARY_OP_SUBSCR_USTR_INT] = _TAIL_CALL_BINARY_OP_SUBSCR_USTR_INT, [BINARY_OP_SUBTRACT_FLOAT] = _TAIL_CALL_BINARY_OP_SUBTRACT_FLOAT, [BINARY_OP_SUBTRACT_INT] = _TAIL_CALL_BINARY_OP_SUBTRACT_INT, [BINARY_SLICE] = _TAIL_CALL_BINARY_SLICE, @@ -1039,9 +1039,9 @@ static py_tail_call_funcptr instruction_funcptr_tracing_table[256] = { [BINARY_OP_SUBSCR_GETITEM] = _TAIL_CALL_TRACE_RECORD, [BINARY_OP_SUBSCR_LIST_INT] = _TAIL_CALL_TRACE_RECORD, [BINARY_OP_SUBSCR_LIST_SLICE] = _TAIL_CALL_TRACE_RECORD, - [BINARY_OP_SUBSCR_NCSTR_INT] = _TAIL_CALL_TRACE_RECORD, [BINARY_OP_SUBSCR_STR_INT] = _TAIL_CALL_TRACE_RECORD, [BINARY_OP_SUBSCR_TUPLE_INT] = _TAIL_CALL_TRACE_RECORD, + [BINARY_OP_SUBSCR_USTR_INT] = _TAIL_CALL_TRACE_RECORD, [BINARY_OP_SUBTRACT_FLOAT] = _TAIL_CALL_TRACE_RECORD, [BINARY_OP_SUBTRACT_INT] = _TAIL_CALL_TRACE_RECORD, [BINARY_SLICE] = _TAIL_CALL_TRACE_RECORD, diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 8a0a4726b85d02..ee094a8ae755e4 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -787,7 +787,7 @@ break; } - case _BINARY_OP_SUBSCR_NCSTR_INT: { + case _BINARY_OP_SUBSCR_USTR_INT: { JitOptRef res; JitOptRef s; JitOptRef i; diff --git a/Python/specialize.c b/Python/specialize.c index e7c94ef87352cb..74e1a87e4c7bdb 100644 --- a/Python/specialize.c +++ b/Python/specialize.c @@ -2247,7 +2247,7 @@ _Py_Specialize_BinaryOp(_PyStackRef lhs_st, _PyStackRef rhs_st, _Py_CODEUNIT *in specialize(instr, BINARY_OP_SUBSCR_STR_INT); return; } else { - specialize(instr, BINARY_OP_SUBSCR_NCSTR_INT); + specialize(instr, BINARY_OP_SUBSCR_USTR_INT); return; } } From f7c0739a54b8bd021b93a59458c7853eeda451ca Mon Sep 17 00:00:00 2001 From: Chris Eibl <138194463+chris-eibl@users.noreply.github.com> Date: Sun, 4 Jan 2026 09:23:42 +0100 Subject: [PATCH 03/10] Use _POP_TOP_UNICODE --- Include/internal/pycore_opcode_metadata.h | 8 +++---- Python/bytecodes.c | 4 ++-- Python/generated_cases.c.h | 26 +++++++++++------------ 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h index e9e99048bc4de2..7832ca9ae7f066 100644 --- a/Include/internal/pycore_opcode_metadata.h +++ b/Include/internal/pycore_opcode_metadata.h @@ -1094,9 +1094,9 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [BINARY_OP_SUBSCR_GETITEM] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_SYNC_SP_FLAG | HAS_NEEDS_GUARD_IP_FLAG }, [BINARY_OP_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_SUBSCR_LIST_SLICE] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_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_STR_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG }, [BINARY_OP_SUBSCR_TUPLE_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, - [BINARY_OP_SUBSCR_USTR_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, + [BINARY_OP_SUBSCR_USTR_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 | HAS_ERROR_NO_POP_FLAG }, [BINARY_OP_SUBTRACT_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG }, [BINARY_SLICE] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, @@ -1345,9 +1345,9 @@ _PyOpcode_macro_expansion[256] = { [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 = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_LIST, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_LIST_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_LIST_SLICE] = { .nuops = 3, .uops = { { _GUARD_TOS_SLICE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_LIST, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_LIST_SLICE, OPARG_SIMPLE, 5 } } }, - [BINARY_OP_SUBSCR_STR_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_COMPACT_ASCII, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_STR_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP, OPARG_SIMPLE, 5 } } }, + [BINARY_OP_SUBSCR_STR_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_COMPACT_ASCII, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_STR_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_UNICODE, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_TUPLE_INT] = { .nuops = 6, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_TUPLE, OPARG_SIMPLE, 0 }, { _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_TUPLE_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP, OPARG_SIMPLE, 5 } } }, - [BINARY_OP_SUBSCR_USTR_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_USTR_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP, OPARG_SIMPLE, 5 } } }, + [BINARY_OP_SUBSCR_USTR_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_USTR_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_UNICODE, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBTRACT_FLOAT] = { .nuops = 5, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBTRACT_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 } } }, [BINARY_SLICE] = { .nuops = 1, .uops = { { _BINARY_SLICE, OPARG_SIMPLE, 0 } } }, diff --git a/Python/bytecodes.c b/Python/bytecodes.c index d0304ee1023055..bbf68b06f3cb68 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -943,7 +943,7 @@ dummy_func( } macro(BINARY_OP_SUBSCR_STR_INT) = - _GUARD_TOS_INT + _GUARD_NOS_COMPACT_ASCII + unused/5 + _BINARY_OP_SUBSCR_STR_INT + _POP_TOP_INT + POP_TOP; + _GUARD_TOS_INT + _GUARD_NOS_COMPACT_ASCII + unused/5 + _BINARY_OP_SUBSCR_STR_INT + _POP_TOP_INT + _POP_TOP_UNICODE; op(_BINARY_OP_SUBSCR_STR_INT, (str_st, sub_st -- res, s, i)) { PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); @@ -965,7 +965,7 @@ dummy_func( } macro(BINARY_OP_SUBSCR_USTR_INT) = - _GUARD_TOS_INT + _GUARD_NOS_UNICODE + unused/5 + _BINARY_OP_SUBSCR_USTR_INT + _POP_TOP_INT + POP_TOP; + _GUARD_TOS_INT + _GUARD_NOS_UNICODE + unused/5 + _BINARY_OP_SUBSCR_USTR_INT + _POP_TOP_INT + _POP_TOP_UNICODE; op(_BINARY_OP_SUBSCR_USTR_INT, (str_st, sub_st -- res, s, i)) { PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 9a160169396453..ecb175614f06f8 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -991,16 +991,15 @@ assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value))); PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc); } - // _POP_TOP + // _POP_TOP_UNICODE { value = s; - stack_pointer[-2] = res; - stack_pointer += -1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - PyStackRef_XCLOSE(value); - stack_pointer = _PyFrame_GetStackPointer(frame); + assert(PyUnicode_CheckExact(PyStackRef_AsPyObjectBorrow(value))); + PyStackRef_CLOSE_SPECIALIZED(value, _PyUnicode_ExactDealloc); } + stack_pointer[-2] = res; + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); DISPATCH(); } @@ -1172,16 +1171,15 @@ assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value))); PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc); } - // _POP_TOP + // _POP_TOP_UNICODE { value = s; - stack_pointer[-2] = res; - stack_pointer += -1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - PyStackRef_XCLOSE(value); - stack_pointer = _PyFrame_GetStackPointer(frame); + assert(PyUnicode_CheckExact(PyStackRef_AsPyObjectBorrow(value))); + PyStackRef_CLOSE_SPECIALIZED(value, _PyUnicode_ExactDealloc); } + stack_pointer[-2] = res; + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); DISPATCH(); } From 6ad8076966b0cb0990b67f8ecda74a88a3fcf18f Mon Sep 17 00:00:00 2001 From: Chris Eibl <138194463+chris-eibl@users.noreply.github.com> Date: Sun, 4 Jan 2026 10:04:56 +0100 Subject: [PATCH 04/10] move _PyLong_IsNonNegativeCompact into specialize and just assert in the bytecodes --- Python/bytecodes.c | 4 ++-- Python/executor_cases.c.h | 16 ++-------------- Python/generated_cases.c.h | 12 ++---------- Python/specialize.c | 2 +- 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/Python/bytecodes.c b/Python/bytecodes.c index bbf68b06f3cb68..e1f0f89dbd84e3 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -951,7 +951,7 @@ dummy_func( assert(PyLong_CheckExact(sub)); assert(PyUnicode_CheckExact(str)); - DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); + assert(_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; DEOPT_IF(PyUnicode_GET_LENGTH(str) <= index); uint8_t c = PyUnicode_1BYTE_DATA(str)[index]; @@ -973,7 +973,7 @@ dummy_func( assert(PyLong_CheckExact(sub)); assert(PyUnicode_CheckExact(str)); - DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); + assert(_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; DEOPT_IF(PyUnicode_GET_LENGTH(str) <= index); // Specialize for reading an ASCII character from any string: diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 30c707abf3a3e5..dd17f89c67bc4c 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -5314,13 +5314,7 @@ PyObject *str = PyStackRef_AsPyObjectBorrow(str_st); assert(PyLong_CheckExact(sub)); assert(PyUnicode_CheckExact(str)); - if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { - UOP_STAT_INC(uopcode, miss); - _tos_cache1 = sub_st; - _tos_cache0 = str_st; - SET_CURRENT_CACHED_VALUES(2); - JUMP_TO_JUMP_TARGET(); - } + assert(_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; if (PyUnicode_GET_LENGTH(str) <= index) { UOP_STAT_INC(uopcode, miss); @@ -5360,13 +5354,7 @@ PyObject *str = PyStackRef_AsPyObjectBorrow(str_st); assert(PyLong_CheckExact(sub)); assert(PyUnicode_CheckExact(str)); - if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { - UOP_STAT_INC(uopcode, miss); - _tos_cache1 = sub_st; - _tos_cache0 = str_st; - SET_CURRENT_CACHED_VALUES(2); - JUMP_TO_JUMP_TARGET(); - } + assert(_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; if (PyUnicode_GET_LENGTH(str) <= index) { UOP_STAT_INC(uopcode, miss); diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index ecb175614f06f8..c2d18d18f4f25e 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -966,11 +966,7 @@ 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); - } + assert(_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; if (PyUnicode_GET_LENGTH(str) <= index) { UPDATE_MISS_STATS(BINARY_OP); @@ -1142,11 +1138,7 @@ 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); - } + assert(_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; if (PyUnicode_GET_LENGTH(str) <= index) { UPDATE_MISS_STATS(BINARY_OP); diff --git a/Python/specialize.c b/Python/specialize.c index 74e1a87e4c7bdb..31b7fd364cd8be 100644 --- a/Python/specialize.c +++ b/Python/specialize.c @@ -2242,7 +2242,7 @@ _Py_Specialize_BinaryOp(_PyStackRef lhs_st, _PyStackRef rhs_st, _Py_CODEUNIT *in specialize(instr, BINARY_OP_SUBSCR_TUPLE_INT); return; } - if (PyUnicode_CheckExact(lhs)) { + if (PyUnicode_CheckExact(lhs) && _PyLong_IsNonNegativeCompact((PyLongObject*)rhs)) { if (PyUnicode_IS_COMPACT_ASCII(lhs)) { specialize(instr, BINARY_OP_SUBSCR_STR_INT); return; From e7e3f40e35e915123b954066b3074c2f47925b4b Mon Sep 17 00:00:00 2001 From: Chris Eibl <138194463+chris-eibl@users.noreply.github.com> Date: Sun, 4 Jan 2026 10:51:59 +0100 Subject: [PATCH 05/10] Narrow the result type of _BINARY_OP_SUBSCR_USTR_INT to str in the JIT --- Python/optimizer_bytecodes.c | 6 ++++++ Python/optimizer_cases.c.h | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c index b01ed3eaeeacb2..e92eb2b75a291a 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -334,6 +334,12 @@ dummy_func(void) { i = sub_st; } + op(_BINARY_OP_SUBSCR_USTR_INT, (str_st, sub_st -- res, s, i)) { + res = sym_new_type(ctx, &PyUnicode_Type); + s = str_st; + i = sub_st; + } + op(_GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS, (tuple_st, sub_st -- tuple_st, sub_st)) { assert(sym_matches_type(tuple_st, &PyTuple_Type)); if (sym_is_const(ctx, sub_st)) { diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index ee094a8ae755e4..52360f8119df4c 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -788,12 +788,16 @@ } case _BINARY_OP_SUBSCR_USTR_INT: { + JitOptRef sub_st; + JitOptRef str_st; JitOptRef res; JitOptRef s; JitOptRef i; - res = sym_new_not_null(ctx); - s = sym_new_not_null(ctx); - i = sym_new_not_null(ctx); + sub_st = stack_pointer[-1]; + str_st = stack_pointer[-2]; + res = sym_new_type(ctx, &PyUnicode_Type); + s = str_st; + i = sub_st; CHECK_STACK_BOUNDS(1); stack_pointer[-2] = res; stack_pointer[-1] = s; From c56ca350eef260680a3f9ad3080a61044774534f Mon Sep 17 00:00:00 2001 From: Chris Eibl <138194463+chris-eibl@users.noreply.github.com> Date: Sun, 4 Jan 2026 11:05:11 +0100 Subject: [PATCH 06/10] add tests --- Lib/test/test_capi/test_opt.py | 40 ++++++++++++++++++++++++++++++++++ Lib/test/test_opcache.py | 1 + 2 files changed, 41 insertions(+) diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index 041a9a37172fa9..19d9ea9eab289f 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -1904,6 +1904,26 @@ def testfunc(n): self.assertNotIn("_GUARD_TOS_UNICODE", uops) self.assertIn("_BINARY_OP_ADD_UNICODE", uops) + def test_binary_subcsr_ustr_int_narrows_to_str(self): + def testfunc(n): + x = [] + s = "바이트코f드_특수화" + for _ in range(n): + y = s[4] # _BINARY_OP_SUBSCR_USTR_INT + z = "bar" + y # (_GUARD_TOS_UNICODE) + _BINARY_OP_ADD_UNICODE + x.append(z) + return x + + res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) + self.assertEqual(res, ["barf"] * TIER2_THRESHOLD) + self.assertIsNotNone(ex) + uops = get_opnames(ex) + self.assertIn("_BINARY_OP_SUBSCR_USTR_INT", uops) + # _BINARY_OP_SUBSCR_USTR_INT narrows the result to 'str' so + # the unicode guard before _BINARY_OP_ADD_UNICODE is removed. + self.assertNotIn("_GUARD_TOS_UNICODE", uops) + self.assertIn("_BINARY_OP_ADD_UNICODE", uops) + def test_binary_op_subscr_str_int(self): def testfunc(n): x = 0 @@ -1924,6 +1944,26 @@ def testfunc(n): self.assertLessEqual(count_ops(ex, "_POP_TOP"), 2) self.assertLessEqual(count_ops(ex, "_POP_TOP_INT"), 1) + def test_binary_op_subscr_ustr_int(self): + def testfunc(n): + x = 0 + s = "hello바" + for _ in range(n): + c = s[1] # _BINARY_OP_SUBSCR_USTR_INT + if c == 'e': + x += 1 + return x + + res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) + self.assertEqual(res, TIER2_THRESHOLD) + self.assertIsNotNone(ex) + uops = get_opnames(ex) + self.assertIn("_BINARY_OP_SUBSCR_USTR_INT", uops) + self.assertIn("_COMPARE_OP_STR", uops) + self.assertIn("_POP_TOP_NOP", uops) + self.assertLessEqual(count_ops(ex, "_POP_TOP"), 2) + self.assertLessEqual(count_ops(ex, "_POP_TOP_INT"), 1) + def test_call_type_1_guards_removed(self): def testfunc(n): x = 0 diff --git a/Lib/test/test_opcache.py b/Lib/test/test_opcache.py index 4df88d0f16885f..be9b52b8bc45e2 100644 --- a/Lib/test/test_opcache.py +++ b/Lib/test/test_opcache.py @@ -1792,6 +1792,7 @@ def binary_subscr_str_int_non_compact(): self.assertEqual(a[idx], expected) binary_subscr_str_int_non_compact() + self.assert_specialized(binary_subscr_str_int_non_compact, "BINARY_OP_SUBSCR_USTR_INT") self.assert_no_opcode(binary_subscr_str_int_non_compact, "BINARY_OP_SUBSCR_STR_INT") def binary_subscr_getitems(): From 5685681166f34903697f77c5fd2869b7c27a3f3c Mon Sep 17 00:00:00 2001 From: Chris Eibl <138194463+chris-eibl@users.noreply.github.com> Date: Sun, 4 Jan 2026 11:11:16 +0100 Subject: [PATCH 07/10] blurb it --- .../2026-01-04-11-08-20.gh-issue-139757.AR6LG0.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2026-01-04-11-08-20.gh-issue-139757.AR6LG0.rst diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-01-04-11-08-20.gh-issue-139757.AR6LG0.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-01-04-11-08-20.gh-issue-139757.AR6LG0.rst new file mode 100644 index 00000000000000..089b6ef14dee92 --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-01-04-11-08-20.gh-issue-139757.AR6LG0.rst @@ -0,0 +1,2 @@ +Add ``BINARY_OP_SUBSCR_USTR_INT`` to specialize reading an ASCII character +from any string. Patch by Chris Eibl. From 00a2bb4a06a0df396e63d4ac464dc721583b17a9 Mon Sep 17 00:00:00 2001 From: Chris Eibl <138194463+chris-eibl@users.noreply.github.com> Date: Sun, 4 Jan 2026 11:35:46 +0100 Subject: [PATCH 08/10] fix DEOPT_IF and INPUTS_DEAD --- Python/bytecodes.c | 8 ++++---- Python/executor_cases.c.h | 16 ++++++++++++++-- Python/generated_cases.c.h | 12 ++++++++++-- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/Python/bytecodes.c b/Python/bytecodes.c index e1f0f89dbd84e3..54d00b1a975af5 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -951,16 +951,16 @@ dummy_func( assert(PyLong_CheckExact(sub)); assert(PyUnicode_CheckExact(str)); - assert(_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); + DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject*)sub)); Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; DEOPT_IF(PyUnicode_GET_LENGTH(str) <= index); uint8_t c = PyUnicode_1BYTE_DATA(str)[index]; assert(c < 128); STAT_INC(BINARY_OP, hit); PyObject *res_o = (PyObject*)&_Py_SINGLETON(strings).ascii[c]; - INPUTS_DEAD(); s = str_st; i = sub_st; + INPUTS_DEAD(); res = PyStackRef_FromPyObjectBorrow(res_o); } @@ -973,7 +973,7 @@ dummy_func( assert(PyLong_CheckExact(sub)); assert(PyUnicode_CheckExact(str)); - assert(_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); + DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject*)sub)); Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; DEOPT_IF(PyUnicode_GET_LENGTH(str) <= index); // Specialize for reading an ASCII character from any string: @@ -981,9 +981,9 @@ dummy_func( DEOPT_IF(Py_ARRAY_LENGTH(_Py_SINGLETON(strings).ascii) <= c); STAT_INC(BINARY_OP, hit); PyObject *res_o = (PyObject*)&_Py_SINGLETON(strings).ascii[c]; - INPUTS_DEAD(); s = str_st; i = sub_st; + INPUTS_DEAD(); res = PyStackRef_FromPyObjectBorrow(res_o); } diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index dd17f89c67bc4c..b6374d7ec12ccb 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -5314,7 +5314,13 @@ PyObject *str = PyStackRef_AsPyObjectBorrow(str_st); assert(PyLong_CheckExact(sub)); assert(PyUnicode_CheckExact(str)); - assert(_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); + if (!_PyLong_IsNonNegativeCompact((PyLongObject*)sub)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache1 = sub_st; + _tos_cache0 = str_st; + SET_CURRENT_CACHED_VALUES(2); + JUMP_TO_JUMP_TARGET(); + } Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; if (PyUnicode_GET_LENGTH(str) <= index) { UOP_STAT_INC(uopcode, miss); @@ -5354,7 +5360,13 @@ PyObject *str = PyStackRef_AsPyObjectBorrow(str_st); assert(PyLong_CheckExact(sub)); assert(PyUnicode_CheckExact(str)); - assert(_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); + if (!_PyLong_IsNonNegativeCompact((PyLongObject*)sub)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache1 = sub_st; + _tos_cache0 = str_st; + SET_CURRENT_CACHED_VALUES(2); + JUMP_TO_JUMP_TARGET(); + } Py_ssize_t index = ((PyLongObject*)sub)->long_value.ob_digit[0]; if (PyUnicode_GET_LENGTH(str) <= index) { UOP_STAT_INC(uopcode, miss); diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index c2d18d18f4f25e..bd78365a4f0a9c 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -966,7 +966,11 @@ PyObject *str = PyStackRef_AsPyObjectBorrow(str_st); assert(PyLong_CheckExact(sub)); assert(PyUnicode_CheckExact(str)); - assert(_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); + 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); @@ -1138,7 +1142,11 @@ PyObject *str = PyStackRef_AsPyObjectBorrow(str_st); assert(PyLong_CheckExact(sub)); assert(PyUnicode_CheckExact(str)); - assert(_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); + 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); From d41332ed43f66dda3efd67e7fe2a70bbd1040087 Mon Sep 17 00:00:00 2001 From: Chris Eibl <138194463+chris-eibl@users.noreply.github.com> Date: Sun, 4 Jan 2026 12:47:17 +0100 Subject: [PATCH 09/10] bump magic number - better safe than sorry --- Include/internal/pycore_magic_number.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Include/internal/pycore_magic_number.h b/Include/internal/pycore_magic_number.h index 2fb46a6df50bb3..bb327a141305c1 100644 --- a/Include/internal/pycore_magic_number.h +++ b/Include/internal/pycore_magic_number.h @@ -287,6 +287,7 @@ Known values: Python 3.15a1 3654 (Fix missing exception handlers in logical expression) Python 3.15a1 3655 (Fix miscompilation of some module-level annotations) Python 3.15a1 3656 (Add TRACE_RECORD instruction, for platforms with switch based interpreter) + Python 3.15a4 3657 (Add BINARY_OP_SUBSCR_USTR_INT) Python 3.16 will start with 3700 @@ -300,7 +301,7 @@ PC/launcher.c must also be updated. */ -#define PYC_MAGIC_NUMBER 3656 +#define PYC_MAGIC_NUMBER 3657 /* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes (little-endian) and then appending b'\r\n'. */ #define PYC_MAGIC_NUMBER_TOKEN \ From 6956fcec8ca72707fd6a39cfafbe248c91fdc51b Mon Sep 17 00:00:00 2001 From: Ken Jin Date: Sun, 4 Jan 2026 13:21:22 +0000 Subject: [PATCH 10/10] Update Include/internal/pycore_magic_number.h Co-authored-by: Chris Eibl <138194463+chris-eibl@users.noreply.github.com> --- Include/internal/pycore_magic_number.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Include/internal/pycore_magic_number.h b/Include/internal/pycore_magic_number.h index bb327a141305c1..09954856204a10 100644 --- a/Include/internal/pycore_magic_number.h +++ b/Include/internal/pycore_magic_number.h @@ -286,7 +286,7 @@ Known values: Python 3.15a1 3653 (Fix handling of opcodes that may leave operands on the stack when optimizing LOAD_FAST) Python 3.15a1 3654 (Fix missing exception handlers in logical expression) Python 3.15a1 3655 (Fix miscompilation of some module-level annotations) - Python 3.15a1 3656 (Add TRACE_RECORD instruction, for platforms with switch based interpreter) + Python 3.15a2 3656 (Add TRACE_RECORD instruction, for platforms with switch based interpreter) Python 3.15a4 3657 (Add BINARY_OP_SUBSCR_USTR_INT)