From 18f3c59e57e5d30218210136060310310b10ff72 Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Fri, 2 Jan 2026 11:31:41 +0000 Subject: [PATCH 01/10] Update docstrings of `typing.Hashable`, `typing.List`, etc., to reflect their deprecation (#143295) --- Lib/typing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/typing.py b/Lib/typing.py index eb0519986a8952..1a2ef8c086f772 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1562,9 +1562,9 @@ def __init__(self, origin, nparams, *, inst=True, name=None, defaults=()): self._nparams = nparams self._defaults = defaults if origin.__module__ == 'builtins': - self.__doc__ = f'A generic version of {origin.__qualname__}.' + self.__doc__ = f'Deprecated alias to {origin.__qualname__}.' else: - self.__doc__ = f'A generic version of {origin.__module__}.{origin.__qualname__}.' + self.__doc__ = f'Deprecated alias to {origin.__module__}.{origin.__qualname__}.' @_tp_cache def __getitem__(self, params): From 315f474d1113f602139c05b7b1afdb5f094fa7a4 Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Fri, 2 Jan 2026 20:58:14 +0900 Subject: [PATCH 02/10] gh-139757: Add _GUARD_NOS_COMPACT_ASCII for compact ascii optimization (gh-143332) --- Include/internal/pycore_opcode_metadata.h | 2 +- Include/internal/pycore_uop_ids.h | 1837 +++++++++++---------- Include/internal/pycore_uop_metadata.h | 21 + Python/bytecodes.c | 10 +- Python/executor_cases.c.h | 122 +- Python/generated_cases.c.h | 12 +- Python/optimizer_bytecodes.c | 4 + Python/optimizer_cases.c.h | 7 + 8 files changed, 1082 insertions(+), 933 deletions(-) diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h index 830b49352e23a3..ad8bab0080847d 100644 --- a/Include/internal/pycore_opcode_metadata.h +++ b/Include/internal/pycore_opcode_metadata.h @@ -1340,7 +1340,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_STR_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, 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, 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 } } }, [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 } } }, diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index e6e6c8266024aa..fa5355c8dbb5c6 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -145,41 +145,42 @@ extern "C" { #define _GUARD_IS_NOT_NONE_POP 400 #define _GUARD_IS_TRUE_POP 401 #define _GUARD_KEYS_VERSION 402 -#define _GUARD_NOS_DICT 403 -#define _GUARD_NOS_FLOAT 404 -#define _GUARD_NOS_INT 405 -#define _GUARD_NOS_LIST 406 -#define _GUARD_NOS_NOT_NULL 407 -#define _GUARD_NOS_NULL 408 -#define _GUARD_NOS_OVERFLOWED 409 -#define _GUARD_NOS_TUPLE 410 -#define _GUARD_NOS_UNICODE 411 -#define _GUARD_NOT_EXHAUSTED_LIST 412 -#define _GUARD_NOT_EXHAUSTED_RANGE 413 -#define _GUARD_NOT_EXHAUSTED_TUPLE 414 -#define _GUARD_THIRD_NULL 415 -#define _GUARD_TOS_ANY_SET 416 -#define _GUARD_TOS_DICT 417 -#define _GUARD_TOS_FLOAT 418 -#define _GUARD_TOS_INT 419 -#define _GUARD_TOS_LIST 420 -#define _GUARD_TOS_OVERFLOWED 421 -#define _GUARD_TOS_SLICE 422 -#define _GUARD_TOS_TUPLE 423 -#define _GUARD_TOS_UNICODE 424 -#define _GUARD_TYPE_VERSION 425 -#define _GUARD_TYPE_VERSION_AND_LOCK 426 -#define _HANDLE_PENDING_AND_DEOPT 427 +#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 _IMPORT_FROM IMPORT_FROM #define _IMPORT_NAME IMPORT_NAME -#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 428 -#define _INIT_CALL_PY_EXACT_ARGS 429 -#define _INIT_CALL_PY_EXACT_ARGS_0 430 -#define _INIT_CALL_PY_EXACT_ARGS_1 431 -#define _INIT_CALL_PY_EXACT_ARGS_2 432 -#define _INIT_CALL_PY_EXACT_ARGS_3 433 -#define _INIT_CALL_PY_EXACT_ARGS_4 434 -#define _INSERT_NULL 435 +#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 _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER #define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION #define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD @@ -189,938 +190,942 @@ 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 436 -#define _IS_OP 437 -#define _ITER_CHECK_LIST 438 -#define _ITER_CHECK_RANGE 439 -#define _ITER_CHECK_TUPLE 440 -#define _ITER_JUMP_LIST 441 -#define _ITER_JUMP_RANGE 442 -#define _ITER_JUMP_TUPLE 443 -#define _ITER_NEXT_LIST 444 -#define _ITER_NEXT_LIST_TIER_TWO 445 -#define _ITER_NEXT_RANGE 446 -#define _ITER_NEXT_TUPLE 447 +#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 _JUMP_BACKWARD_NO_INTERRUPT JUMP_BACKWARD_NO_INTERRUPT -#define _JUMP_TO_TOP 448 +#define _JUMP_TO_TOP 449 #define _LIST_APPEND LIST_APPEND #define _LIST_EXTEND LIST_EXTEND -#define _LOAD_ATTR 449 -#define _LOAD_ATTR_CLASS 450 +#define _LOAD_ATTR 450 +#define _LOAD_ATTR_CLASS 451 #define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN -#define _LOAD_ATTR_INSTANCE_VALUE 451 -#define _LOAD_ATTR_METHOD_LAZY_DICT 452 -#define _LOAD_ATTR_METHOD_NO_DICT 453 -#define _LOAD_ATTR_METHOD_WITH_VALUES 454 -#define _LOAD_ATTR_MODULE 455 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 456 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 457 -#define _LOAD_ATTR_PROPERTY_FRAME 458 -#define _LOAD_ATTR_SLOT 459 -#define _LOAD_ATTR_WITH_HINT 460 +#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_BUILD_CLASS LOAD_BUILD_CLASS -#define _LOAD_BYTECODE 461 +#define _LOAD_BYTECODE 462 #define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT #define _LOAD_CONST LOAD_CONST -#define _LOAD_CONST_INLINE 462 -#define _LOAD_CONST_INLINE_BORROW 463 -#define _LOAD_CONST_UNDER_INLINE 464 -#define _LOAD_CONST_UNDER_INLINE_BORROW 465 +#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_DEREF LOAD_DEREF -#define _LOAD_FAST 466 -#define _LOAD_FAST_0 467 -#define _LOAD_FAST_1 468 -#define _LOAD_FAST_2 469 -#define _LOAD_FAST_3 470 -#define _LOAD_FAST_4 471 -#define _LOAD_FAST_5 472 -#define _LOAD_FAST_6 473 -#define _LOAD_FAST_7 474 +#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_AND_CLEAR LOAD_FAST_AND_CLEAR -#define _LOAD_FAST_BORROW 475 -#define _LOAD_FAST_BORROW_0 476 -#define _LOAD_FAST_BORROW_1 477 -#define _LOAD_FAST_BORROW_2 478 -#define _LOAD_FAST_BORROW_3 479 -#define _LOAD_FAST_BORROW_4 480 -#define _LOAD_FAST_BORROW_5 481 -#define _LOAD_FAST_BORROW_6 482 -#define _LOAD_FAST_BORROW_7 483 +#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_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 484 -#define _LOAD_GLOBAL_BUILTINS 485 -#define _LOAD_GLOBAL_MODULE 486 +#define _LOAD_GLOBAL 485 +#define _LOAD_GLOBAL_BUILTINS 486 +#define _LOAD_GLOBAL_MODULE 487 #define _LOAD_LOCALS LOAD_LOCALS #define _LOAD_NAME LOAD_NAME -#define _LOAD_SMALL_INT 487 -#define _LOAD_SMALL_INT_0 488 -#define _LOAD_SMALL_INT_1 489 -#define _LOAD_SMALL_INT_2 490 -#define _LOAD_SMALL_INT_3 491 -#define _LOAD_SPECIAL 492 +#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_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR #define _LOAD_SUPER_ATTR_METHOD LOAD_SUPER_ATTR_METHOD -#define _MAKE_CALLARGS_A_TUPLE 493 +#define _MAKE_CALLARGS_A_TUPLE 494 #define _MAKE_CELL MAKE_CELL #define _MAKE_FUNCTION MAKE_FUNCTION -#define _MAKE_WARM 494 +#define _MAKE_WARM 495 #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 495 -#define _MAYBE_EXPAND_METHOD_KW 496 -#define _MONITOR_CALL 497 -#define _MONITOR_CALL_KW 498 -#define _MONITOR_JUMP_BACKWARD 499 -#define _MONITOR_RESUME 500 +#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 _NOP NOP -#define _POP_CALL 501 -#define _POP_CALL_LOAD_CONST_INLINE_BORROW 502 -#define _POP_CALL_ONE 503 -#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW 504 -#define _POP_CALL_TWO 505 -#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW 506 +#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_EXCEPT POP_EXCEPT #define _POP_ITER POP_ITER -#define _POP_JUMP_IF_FALSE 507 -#define _POP_JUMP_IF_TRUE 508 +#define _POP_JUMP_IF_FALSE 508 +#define _POP_JUMP_IF_TRUE 509 #define _POP_TOP POP_TOP -#define _POP_TOP_FLOAT 509 -#define _POP_TOP_INT 510 -#define _POP_TOP_LOAD_CONST_INLINE 511 -#define _POP_TOP_LOAD_CONST_INLINE_BORROW 512 -#define _POP_TOP_NOP 513 -#define _POP_TOP_UNICODE 514 -#define _POP_TWO 515 -#define _POP_TWO_LOAD_CONST_INLINE_BORROW 516 +#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 _PUSH_EXC_INFO PUSH_EXC_INFO -#define _PUSH_FRAME 517 +#define _PUSH_FRAME 518 #define _PUSH_NULL PUSH_NULL -#define _PUSH_NULL_CONDITIONAL 518 -#define _PY_FRAME_GENERAL 519 -#define _PY_FRAME_KW 520 -#define _QUICKEN_RESUME 521 -#define _REPLACE_WITH_TRUE 522 +#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 _RESUME_CHECK RESUME_CHECK #define _RETURN_GENERATOR RETURN_GENERATOR #define _RETURN_VALUE RETURN_VALUE -#define _SAVE_RETURN_OFFSET 523 -#define _SEND 524 -#define _SEND_GEN_FRAME 525 +#define _SAVE_RETURN_OFFSET 524 +#define _SEND 525 +#define _SEND_GEN_FRAME 526 #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 526 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW 527 -#define _SPILL_OR_RELOAD 528 -#define _START_EXECUTOR 529 -#define _STORE_ATTR 530 -#define _STORE_ATTR_INSTANCE_VALUE 531 -#define _STORE_ATTR_SLOT 532 -#define _STORE_ATTR_WITH_HINT 533 +#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 _STORE_DEREF STORE_DEREF -#define _STORE_FAST 534 -#define _STORE_FAST_0 535 -#define _STORE_FAST_1 536 -#define _STORE_FAST_2 537 -#define _STORE_FAST_3 538 -#define _STORE_FAST_4 539 -#define _STORE_FAST_5 540 -#define _STORE_FAST_6 541 -#define _STORE_FAST_7 542 +#define _STORE_FAST 535 +#define _STORE_FAST_0 536 +#define _STORE_FAST_1 537 +#define _STORE_FAST_2 538 +#define _STORE_FAST_3 539 +#define _STORE_FAST_4 540 +#define _STORE_FAST_5 541 +#define _STORE_FAST_6 542 +#define _STORE_FAST_7 543 #define _STORE_GLOBAL STORE_GLOBAL #define _STORE_NAME STORE_NAME -#define _STORE_SLICE 543 -#define _STORE_SUBSCR 544 -#define _STORE_SUBSCR_DICT 545 -#define _STORE_SUBSCR_LIST_INT 546 -#define _SWAP 547 -#define _SWAP_2 548 -#define _SWAP_3 549 -#define _TIER2_RESUME_CHECK 550 -#define _TO_BOOL 551 +#define _STORE_SLICE 544 +#define _STORE_SUBSCR 545 +#define _STORE_SUBSCR_DICT 546 +#define _STORE_SUBSCR_LIST_INT 547 +#define _SWAP 548 +#define _SWAP_2 549 +#define _SWAP_3 550 +#define _TIER2_RESUME_CHECK 551 +#define _TO_BOOL 552 #define _TO_BOOL_BOOL TO_BOOL_BOOL #define _TO_BOOL_INT TO_BOOL_INT -#define _TO_BOOL_LIST 552 +#define _TO_BOOL_LIST 553 #define _TO_BOOL_NONE TO_BOOL_NONE -#define _TO_BOOL_STR 553 +#define _TO_BOOL_STR 554 #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 554 -#define _UNPACK_SEQUENCE_LIST 555 -#define _UNPACK_SEQUENCE_TUPLE 556 -#define _UNPACK_SEQUENCE_TWO_TUPLE 557 +#define _UNPACK_SEQUENCE 555 +#define _UNPACK_SEQUENCE_LIST 556 +#define _UNPACK_SEQUENCE_TUPLE 557 +#define _UNPACK_SEQUENCE_TWO_TUPLE 558 #define _WITH_EXCEPT_START WITH_EXCEPT_START #define _YIELD_VALUE YIELD_VALUE -#define MAX_UOP_ID 557 -#define _BINARY_OP_r21 558 -#define _BINARY_OP_ADD_FLOAT_r03 559 -#define _BINARY_OP_ADD_FLOAT_r13 560 -#define _BINARY_OP_ADD_FLOAT_r23 561 -#define _BINARY_OP_ADD_INT_r03 562 -#define _BINARY_OP_ADD_INT_r13 563 -#define _BINARY_OP_ADD_INT_r23 564 -#define _BINARY_OP_ADD_UNICODE_r03 565 -#define _BINARY_OP_ADD_UNICODE_r13 566 -#define _BINARY_OP_ADD_UNICODE_r23 567 -#define _BINARY_OP_EXTEND_r21 568 -#define _BINARY_OP_INPLACE_ADD_UNICODE_r21 569 -#define _BINARY_OP_MULTIPLY_FLOAT_r03 570 -#define _BINARY_OP_MULTIPLY_FLOAT_r13 571 -#define _BINARY_OP_MULTIPLY_FLOAT_r23 572 -#define _BINARY_OP_MULTIPLY_INT_r03 573 -#define _BINARY_OP_MULTIPLY_INT_r13 574 -#define _BINARY_OP_MULTIPLY_INT_r23 575 -#define _BINARY_OP_SUBSCR_CHECK_FUNC_r23 576 -#define _BINARY_OP_SUBSCR_DICT_r21 577 -#define _BINARY_OP_SUBSCR_INIT_CALL_r01 578 -#define _BINARY_OP_SUBSCR_INIT_CALL_r11 579 -#define _BINARY_OP_SUBSCR_INIT_CALL_r21 580 -#define _BINARY_OP_SUBSCR_INIT_CALL_r31 581 -#define _BINARY_OP_SUBSCR_LIST_INT_r23 582 -#define _BINARY_OP_SUBSCR_LIST_SLICE_r21 583 -#define _BINARY_OP_SUBSCR_STR_INT_r23 584 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r03 585 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r13 586 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r23 587 -#define _BINARY_OP_SUBTRACT_FLOAT_r03 588 -#define _BINARY_OP_SUBTRACT_FLOAT_r13 589 -#define _BINARY_OP_SUBTRACT_FLOAT_r23 590 -#define _BINARY_OP_SUBTRACT_INT_r03 591 -#define _BINARY_OP_SUBTRACT_INT_r13 592 -#define _BINARY_OP_SUBTRACT_INT_r23 593 -#define _BINARY_SLICE_r31 594 -#define _BUILD_INTERPOLATION_r01 595 -#define _BUILD_LIST_r01 596 -#define _BUILD_MAP_r01 597 -#define _BUILD_SET_r01 598 -#define _BUILD_SLICE_r01 599 -#define _BUILD_STRING_r01 600 -#define _BUILD_TEMPLATE_r21 601 -#define _BUILD_TUPLE_r01 602 -#define _CALL_BUILTIN_CLASS_r01 603 -#define _CALL_BUILTIN_FAST_r01 604 -#define _CALL_BUILTIN_FAST_WITH_KEYWORDS_r01 605 -#define _CALL_BUILTIN_O_r03 606 -#define _CALL_INTRINSIC_1_r11 607 -#define _CALL_INTRINSIC_2_r21 608 -#define _CALL_ISINSTANCE_r31 609 -#define _CALL_KW_NON_PY_r11 610 -#define _CALL_LEN_r33 611 -#define _CALL_LIST_APPEND_r03 612 -#define _CALL_LIST_APPEND_r13 613 -#define _CALL_LIST_APPEND_r23 614 -#define _CALL_LIST_APPEND_r33 615 -#define _CALL_METHOD_DESCRIPTOR_FAST_r01 616 -#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r01 617 -#define _CALL_METHOD_DESCRIPTOR_NOARGS_r01 618 -#define _CALL_METHOD_DESCRIPTOR_O_r03 619 -#define _CALL_NON_PY_GENERAL_r01 620 -#define _CALL_STR_1_r32 621 -#define _CALL_TUPLE_1_r32 622 -#define _CALL_TYPE_1_r02 623 -#define _CALL_TYPE_1_r12 624 -#define _CALL_TYPE_1_r22 625 -#define _CALL_TYPE_1_r32 626 -#define _CHECK_AND_ALLOCATE_OBJECT_r00 627 -#define _CHECK_ATTR_CLASS_r01 628 -#define _CHECK_ATTR_CLASS_r11 629 -#define _CHECK_ATTR_CLASS_r22 630 -#define _CHECK_ATTR_CLASS_r33 631 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r01 632 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r11 633 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r22 634 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r33 635 -#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS_r00 636 -#define _CHECK_EG_MATCH_r22 637 -#define _CHECK_EXC_MATCH_r22 638 -#define _CHECK_FUNCTION_EXACT_ARGS_r00 639 -#define _CHECK_FUNCTION_VERSION_r00 640 -#define _CHECK_FUNCTION_VERSION_INLINE_r00 641 -#define _CHECK_FUNCTION_VERSION_INLINE_r11 642 -#define _CHECK_FUNCTION_VERSION_INLINE_r22 643 -#define _CHECK_FUNCTION_VERSION_INLINE_r33 644 -#define _CHECK_FUNCTION_VERSION_KW_r11 645 -#define _CHECK_IS_NOT_PY_CALLABLE_r00 646 -#define _CHECK_IS_NOT_PY_CALLABLE_KW_r11 647 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r01 648 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r11 649 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r22 650 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r33 651 -#define _CHECK_METHOD_VERSION_r00 652 -#define _CHECK_METHOD_VERSION_KW_r11 653 -#define _CHECK_PEP_523_r00 654 -#define _CHECK_PEP_523_r11 655 -#define _CHECK_PEP_523_r22 656 -#define _CHECK_PEP_523_r33 657 -#define _CHECK_PERIODIC_r00 658 -#define _CHECK_PERIODIC_AT_END_r00 659 -#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM_r00 660 -#define _CHECK_RECURSION_REMAINING_r00 661 -#define _CHECK_RECURSION_REMAINING_r11 662 -#define _CHECK_RECURSION_REMAINING_r22 663 -#define _CHECK_RECURSION_REMAINING_r33 664 -#define _CHECK_STACK_SPACE_r00 665 -#define _CHECK_STACK_SPACE_OPERAND_r00 666 -#define _CHECK_STACK_SPACE_OPERAND_r11 667 -#define _CHECK_STACK_SPACE_OPERAND_r22 668 -#define _CHECK_STACK_SPACE_OPERAND_r33 669 -#define _CHECK_VALIDITY_r00 670 -#define _CHECK_VALIDITY_r11 671 -#define _CHECK_VALIDITY_r22 672 -#define _CHECK_VALIDITY_r33 673 -#define _COLD_DYNAMIC_EXIT_r00 674 -#define _COLD_EXIT_r00 675 -#define _COMPARE_OP_r21 676 -#define _COMPARE_OP_FLOAT_r03 677 -#define _COMPARE_OP_FLOAT_r13 678 -#define _COMPARE_OP_FLOAT_r23 679 -#define _COMPARE_OP_INT_r23 680 -#define _COMPARE_OP_STR_r23 681 -#define _CONTAINS_OP_r21 682 -#define _CONTAINS_OP_DICT_r21 683 -#define _CONTAINS_OP_SET_r21 684 -#define _CONVERT_VALUE_r11 685 -#define _COPY_r01 686 -#define _COPY_1_r02 687 -#define _COPY_1_r12 688 -#define _COPY_1_r23 689 -#define _COPY_2_r03 690 -#define _COPY_2_r13 691 -#define _COPY_2_r23 692 -#define _COPY_3_r03 693 -#define _COPY_3_r13 694 -#define _COPY_3_r23 695 -#define _COPY_3_r33 696 -#define _COPY_FREE_VARS_r00 697 -#define _COPY_FREE_VARS_r11 698 -#define _COPY_FREE_VARS_r22 699 -#define _COPY_FREE_VARS_r33 700 -#define _CREATE_INIT_FRAME_r01 701 -#define _DELETE_ATTR_r10 702 -#define _DELETE_DEREF_r00 703 -#define _DELETE_FAST_r00 704 -#define _DELETE_GLOBAL_r00 705 -#define _DELETE_NAME_r00 706 -#define _DELETE_SUBSCR_r20 707 -#define _DEOPT_r00 708 -#define _DEOPT_r10 709 -#define _DEOPT_r20 710 -#define _DEOPT_r30 711 -#define _DICT_MERGE_r10 712 -#define _DICT_UPDATE_r10 713 -#define _DO_CALL_r01 714 -#define _DO_CALL_FUNCTION_EX_r31 715 -#define _DO_CALL_KW_r11 716 -#define _DYNAMIC_EXIT_r00 717 -#define _DYNAMIC_EXIT_r10 718 -#define _DYNAMIC_EXIT_r20 719 -#define _DYNAMIC_EXIT_r30 720 -#define _END_FOR_r10 721 -#define _END_SEND_r21 722 -#define _ERROR_POP_N_r00 723 -#define _EXIT_INIT_CHECK_r10 724 -#define _EXIT_TRACE_r00 725 -#define _EXIT_TRACE_r10 726 -#define _EXIT_TRACE_r20 727 -#define _EXIT_TRACE_r30 728 -#define _EXPAND_METHOD_r00 729 -#define _EXPAND_METHOD_KW_r11 730 -#define _FATAL_ERROR_r00 731 -#define _FATAL_ERROR_r11 732 -#define _FATAL_ERROR_r22 733 -#define _FATAL_ERROR_r33 734 -#define _FORMAT_SIMPLE_r11 735 -#define _FORMAT_WITH_SPEC_r21 736 -#define _FOR_ITER_r23 737 -#define _FOR_ITER_GEN_FRAME_r03 738 -#define _FOR_ITER_GEN_FRAME_r13 739 -#define _FOR_ITER_GEN_FRAME_r23 740 -#define _FOR_ITER_TIER_TWO_r23 741 -#define _GET_AITER_r11 742 -#define _GET_ANEXT_r12 743 -#define _GET_AWAITABLE_r11 744 -#define _GET_ITER_r12 745 -#define _GET_LEN_r12 746 -#define _GET_YIELD_FROM_ITER_r11 747 -#define _GUARD_BINARY_OP_EXTEND_r22 748 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r02 749 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r12 750 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r22 751 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r33 752 -#define _GUARD_CALLABLE_ISINSTANCE_r03 753 -#define _GUARD_CALLABLE_ISINSTANCE_r13 754 -#define _GUARD_CALLABLE_ISINSTANCE_r23 755 -#define _GUARD_CALLABLE_ISINSTANCE_r33 756 -#define _GUARD_CALLABLE_LEN_r03 757 -#define _GUARD_CALLABLE_LEN_r13 758 -#define _GUARD_CALLABLE_LEN_r23 759 -#define _GUARD_CALLABLE_LEN_r33 760 -#define _GUARD_CALLABLE_LIST_APPEND_r03 761 -#define _GUARD_CALLABLE_LIST_APPEND_r13 762 -#define _GUARD_CALLABLE_LIST_APPEND_r23 763 -#define _GUARD_CALLABLE_LIST_APPEND_r33 764 -#define _GUARD_CALLABLE_STR_1_r03 765 -#define _GUARD_CALLABLE_STR_1_r13 766 -#define _GUARD_CALLABLE_STR_1_r23 767 -#define _GUARD_CALLABLE_STR_1_r33 768 -#define _GUARD_CALLABLE_TUPLE_1_r03 769 -#define _GUARD_CALLABLE_TUPLE_1_r13 770 -#define _GUARD_CALLABLE_TUPLE_1_r23 771 -#define _GUARD_CALLABLE_TUPLE_1_r33 772 -#define _GUARD_CALLABLE_TYPE_1_r03 773 -#define _GUARD_CALLABLE_TYPE_1_r13 774 -#define _GUARD_CALLABLE_TYPE_1_r23 775 -#define _GUARD_CALLABLE_TYPE_1_r33 776 -#define _GUARD_DORV_NO_DICT_r01 777 -#define _GUARD_DORV_NO_DICT_r11 778 -#define _GUARD_DORV_NO_DICT_r22 779 -#define _GUARD_DORV_NO_DICT_r33 780 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 781 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 782 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 783 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 784 -#define _GUARD_GLOBALS_VERSION_r00 785 -#define _GUARD_GLOBALS_VERSION_r11 786 -#define _GUARD_GLOBALS_VERSION_r22 787 -#define _GUARD_GLOBALS_VERSION_r33 788 -#define _GUARD_IP_RETURN_GENERATOR_r00 789 -#define _GUARD_IP_RETURN_GENERATOR_r11 790 -#define _GUARD_IP_RETURN_GENERATOR_r22 791 -#define _GUARD_IP_RETURN_GENERATOR_r33 792 -#define _GUARD_IP_RETURN_VALUE_r00 793 -#define _GUARD_IP_RETURN_VALUE_r11 794 -#define _GUARD_IP_RETURN_VALUE_r22 795 -#define _GUARD_IP_RETURN_VALUE_r33 796 -#define _GUARD_IP_YIELD_VALUE_r00 797 -#define _GUARD_IP_YIELD_VALUE_r11 798 -#define _GUARD_IP_YIELD_VALUE_r22 799 -#define _GUARD_IP_YIELD_VALUE_r33 800 -#define _GUARD_IP__PUSH_FRAME_r00 801 -#define _GUARD_IP__PUSH_FRAME_r11 802 -#define _GUARD_IP__PUSH_FRAME_r22 803 -#define _GUARD_IP__PUSH_FRAME_r33 804 -#define _GUARD_IS_FALSE_POP_r00 805 -#define _GUARD_IS_FALSE_POP_r10 806 -#define _GUARD_IS_FALSE_POP_r21 807 -#define _GUARD_IS_FALSE_POP_r32 808 -#define _GUARD_IS_NONE_POP_r00 809 -#define _GUARD_IS_NONE_POP_r10 810 -#define _GUARD_IS_NONE_POP_r21 811 -#define _GUARD_IS_NONE_POP_r32 812 -#define _GUARD_IS_NOT_NONE_POP_r10 813 -#define _GUARD_IS_TRUE_POP_r00 814 -#define _GUARD_IS_TRUE_POP_r10 815 -#define _GUARD_IS_TRUE_POP_r21 816 -#define _GUARD_IS_TRUE_POP_r32 817 -#define _GUARD_KEYS_VERSION_r01 818 -#define _GUARD_KEYS_VERSION_r11 819 -#define _GUARD_KEYS_VERSION_r22 820 -#define _GUARD_KEYS_VERSION_r33 821 -#define _GUARD_NOS_DICT_r02 822 -#define _GUARD_NOS_DICT_r12 823 -#define _GUARD_NOS_DICT_r22 824 -#define _GUARD_NOS_DICT_r33 825 -#define _GUARD_NOS_FLOAT_r02 826 -#define _GUARD_NOS_FLOAT_r12 827 -#define _GUARD_NOS_FLOAT_r22 828 -#define _GUARD_NOS_FLOAT_r33 829 -#define _GUARD_NOS_INT_r02 830 -#define _GUARD_NOS_INT_r12 831 -#define _GUARD_NOS_INT_r22 832 -#define _GUARD_NOS_INT_r33 833 -#define _GUARD_NOS_LIST_r02 834 -#define _GUARD_NOS_LIST_r12 835 -#define _GUARD_NOS_LIST_r22 836 -#define _GUARD_NOS_LIST_r33 837 -#define _GUARD_NOS_NOT_NULL_r02 838 -#define _GUARD_NOS_NOT_NULL_r12 839 -#define _GUARD_NOS_NOT_NULL_r22 840 -#define _GUARD_NOS_NOT_NULL_r33 841 -#define _GUARD_NOS_NULL_r02 842 -#define _GUARD_NOS_NULL_r12 843 -#define _GUARD_NOS_NULL_r22 844 -#define _GUARD_NOS_NULL_r33 845 -#define _GUARD_NOS_OVERFLOWED_r02 846 -#define _GUARD_NOS_OVERFLOWED_r12 847 -#define _GUARD_NOS_OVERFLOWED_r22 848 -#define _GUARD_NOS_OVERFLOWED_r33 849 -#define _GUARD_NOS_TUPLE_r02 850 -#define _GUARD_NOS_TUPLE_r12 851 -#define _GUARD_NOS_TUPLE_r22 852 -#define _GUARD_NOS_TUPLE_r33 853 -#define _GUARD_NOS_UNICODE_r02 854 -#define _GUARD_NOS_UNICODE_r12 855 -#define _GUARD_NOS_UNICODE_r22 856 -#define _GUARD_NOS_UNICODE_r33 857 -#define _GUARD_NOT_EXHAUSTED_LIST_r02 858 -#define _GUARD_NOT_EXHAUSTED_LIST_r12 859 -#define _GUARD_NOT_EXHAUSTED_LIST_r22 860 -#define _GUARD_NOT_EXHAUSTED_LIST_r33 861 -#define _GUARD_NOT_EXHAUSTED_RANGE_r02 862 -#define _GUARD_NOT_EXHAUSTED_RANGE_r12 863 -#define _GUARD_NOT_EXHAUSTED_RANGE_r22 864 -#define _GUARD_NOT_EXHAUSTED_RANGE_r33 865 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 866 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 867 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 868 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 869 -#define _GUARD_THIRD_NULL_r03 870 -#define _GUARD_THIRD_NULL_r13 871 -#define _GUARD_THIRD_NULL_r23 872 -#define _GUARD_THIRD_NULL_r33 873 -#define _GUARD_TOS_ANY_SET_r01 874 -#define _GUARD_TOS_ANY_SET_r11 875 -#define _GUARD_TOS_ANY_SET_r22 876 -#define _GUARD_TOS_ANY_SET_r33 877 -#define _GUARD_TOS_DICT_r01 878 -#define _GUARD_TOS_DICT_r11 879 -#define _GUARD_TOS_DICT_r22 880 -#define _GUARD_TOS_DICT_r33 881 -#define _GUARD_TOS_FLOAT_r01 882 -#define _GUARD_TOS_FLOAT_r11 883 -#define _GUARD_TOS_FLOAT_r22 884 -#define _GUARD_TOS_FLOAT_r33 885 -#define _GUARD_TOS_INT_r01 886 -#define _GUARD_TOS_INT_r11 887 -#define _GUARD_TOS_INT_r22 888 -#define _GUARD_TOS_INT_r33 889 -#define _GUARD_TOS_LIST_r01 890 -#define _GUARD_TOS_LIST_r11 891 -#define _GUARD_TOS_LIST_r22 892 -#define _GUARD_TOS_LIST_r33 893 -#define _GUARD_TOS_OVERFLOWED_r01 894 -#define _GUARD_TOS_OVERFLOWED_r11 895 -#define _GUARD_TOS_OVERFLOWED_r22 896 -#define _GUARD_TOS_OVERFLOWED_r33 897 -#define _GUARD_TOS_SLICE_r01 898 -#define _GUARD_TOS_SLICE_r11 899 -#define _GUARD_TOS_SLICE_r22 900 -#define _GUARD_TOS_SLICE_r33 901 -#define _GUARD_TOS_TUPLE_r01 902 -#define _GUARD_TOS_TUPLE_r11 903 -#define _GUARD_TOS_TUPLE_r22 904 -#define _GUARD_TOS_TUPLE_r33 905 -#define _GUARD_TOS_UNICODE_r01 906 -#define _GUARD_TOS_UNICODE_r11 907 -#define _GUARD_TOS_UNICODE_r22 908 -#define _GUARD_TOS_UNICODE_r33 909 -#define _GUARD_TYPE_VERSION_r01 910 -#define _GUARD_TYPE_VERSION_r11 911 -#define _GUARD_TYPE_VERSION_r22 912 -#define _GUARD_TYPE_VERSION_r33 913 -#define _GUARD_TYPE_VERSION_AND_LOCK_r01 914 -#define _GUARD_TYPE_VERSION_AND_LOCK_r11 915 -#define _GUARD_TYPE_VERSION_AND_LOCK_r22 916 -#define _GUARD_TYPE_VERSION_AND_LOCK_r33 917 -#define _HANDLE_PENDING_AND_DEOPT_r00 918 -#define _HANDLE_PENDING_AND_DEOPT_r10 919 -#define _HANDLE_PENDING_AND_DEOPT_r20 920 -#define _HANDLE_PENDING_AND_DEOPT_r30 921 -#define _IMPORT_FROM_r12 922 -#define _IMPORT_NAME_r21 923 -#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 924 -#define _INIT_CALL_PY_EXACT_ARGS_r01 925 -#define _INIT_CALL_PY_EXACT_ARGS_0_r01 926 -#define _INIT_CALL_PY_EXACT_ARGS_1_r01 927 -#define _INIT_CALL_PY_EXACT_ARGS_2_r01 928 -#define _INIT_CALL_PY_EXACT_ARGS_3_r01 929 -#define _INIT_CALL_PY_EXACT_ARGS_4_r01 930 -#define _INSERT_NULL_r10 931 -#define _INSTRUMENTED_FOR_ITER_r23 932 -#define _INSTRUMENTED_INSTRUCTION_r00 933 -#define _INSTRUMENTED_JUMP_FORWARD_r00 934 -#define _INSTRUMENTED_JUMP_FORWARD_r11 935 -#define _INSTRUMENTED_JUMP_FORWARD_r22 936 -#define _INSTRUMENTED_JUMP_FORWARD_r33 937 -#define _INSTRUMENTED_LINE_r00 938 -#define _INSTRUMENTED_NOT_TAKEN_r00 939 -#define _INSTRUMENTED_NOT_TAKEN_r11 940 -#define _INSTRUMENTED_NOT_TAKEN_r22 941 -#define _INSTRUMENTED_NOT_TAKEN_r33 942 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 943 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 944 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 945 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 946 -#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 947 -#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 948 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 949 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 950 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 951 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 952 -#define _IS_NONE_r11 953 -#define _IS_OP_r03 954 -#define _IS_OP_r13 955 -#define _IS_OP_r23 956 -#define _ITER_CHECK_LIST_r02 957 -#define _ITER_CHECK_LIST_r12 958 -#define _ITER_CHECK_LIST_r22 959 -#define _ITER_CHECK_LIST_r33 960 -#define _ITER_CHECK_RANGE_r02 961 -#define _ITER_CHECK_RANGE_r12 962 -#define _ITER_CHECK_RANGE_r22 963 -#define _ITER_CHECK_RANGE_r33 964 -#define _ITER_CHECK_TUPLE_r02 965 -#define _ITER_CHECK_TUPLE_r12 966 -#define _ITER_CHECK_TUPLE_r22 967 -#define _ITER_CHECK_TUPLE_r33 968 -#define _ITER_JUMP_LIST_r02 969 -#define _ITER_JUMP_LIST_r12 970 -#define _ITER_JUMP_LIST_r22 971 -#define _ITER_JUMP_LIST_r33 972 -#define _ITER_JUMP_RANGE_r02 973 -#define _ITER_JUMP_RANGE_r12 974 -#define _ITER_JUMP_RANGE_r22 975 -#define _ITER_JUMP_RANGE_r33 976 -#define _ITER_JUMP_TUPLE_r02 977 -#define _ITER_JUMP_TUPLE_r12 978 -#define _ITER_JUMP_TUPLE_r22 979 -#define _ITER_JUMP_TUPLE_r33 980 -#define _ITER_NEXT_LIST_r23 981 -#define _ITER_NEXT_LIST_TIER_TWO_r23 982 -#define _ITER_NEXT_RANGE_r03 983 -#define _ITER_NEXT_RANGE_r13 984 -#define _ITER_NEXT_RANGE_r23 985 -#define _ITER_NEXT_TUPLE_r03 986 -#define _ITER_NEXT_TUPLE_r13 987 -#define _ITER_NEXT_TUPLE_r23 988 -#define _JUMP_BACKWARD_NO_INTERRUPT_r00 989 -#define _JUMP_BACKWARD_NO_INTERRUPT_r11 990 -#define _JUMP_BACKWARD_NO_INTERRUPT_r22 991 -#define _JUMP_BACKWARD_NO_INTERRUPT_r33 992 -#define _JUMP_TO_TOP_r00 993 -#define _LIST_APPEND_r10 994 -#define _LIST_EXTEND_r10 995 -#define _LOAD_ATTR_r10 996 -#define _LOAD_ATTR_CLASS_r11 997 -#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_r11 998 -#define _LOAD_ATTR_INSTANCE_VALUE_r02 999 -#define _LOAD_ATTR_INSTANCE_VALUE_r12 1000 -#define _LOAD_ATTR_INSTANCE_VALUE_r23 1001 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 1002 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 1003 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 1004 -#define _LOAD_ATTR_METHOD_NO_DICT_r02 1005 -#define _LOAD_ATTR_METHOD_NO_DICT_r12 1006 -#define _LOAD_ATTR_METHOD_NO_DICT_r23 1007 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 1008 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 1009 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 1010 -#define _LOAD_ATTR_MODULE_r11 1011 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 1012 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 1013 -#define _LOAD_ATTR_PROPERTY_FRAME_r11 1014 -#define _LOAD_ATTR_SLOT_r02 1015 -#define _LOAD_ATTR_SLOT_r12 1016 -#define _LOAD_ATTR_SLOT_r23 1017 -#define _LOAD_ATTR_WITH_HINT_r12 1018 -#define _LOAD_BUILD_CLASS_r01 1019 -#define _LOAD_BYTECODE_r00 1020 -#define _LOAD_COMMON_CONSTANT_r01 1021 -#define _LOAD_COMMON_CONSTANT_r12 1022 -#define _LOAD_COMMON_CONSTANT_r23 1023 -#define _LOAD_CONST_r01 1024 -#define _LOAD_CONST_r12 1025 -#define _LOAD_CONST_r23 1026 -#define _LOAD_CONST_INLINE_r01 1027 -#define _LOAD_CONST_INLINE_r12 1028 -#define _LOAD_CONST_INLINE_r23 1029 -#define _LOAD_CONST_INLINE_BORROW_r01 1030 -#define _LOAD_CONST_INLINE_BORROW_r12 1031 -#define _LOAD_CONST_INLINE_BORROW_r23 1032 -#define _LOAD_CONST_UNDER_INLINE_r02 1033 -#define _LOAD_CONST_UNDER_INLINE_r12 1034 -#define _LOAD_CONST_UNDER_INLINE_r23 1035 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r02 1036 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r12 1037 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r23 1038 -#define _LOAD_DEREF_r01 1039 -#define _LOAD_FAST_r01 1040 -#define _LOAD_FAST_r12 1041 -#define _LOAD_FAST_r23 1042 -#define _LOAD_FAST_0_r01 1043 -#define _LOAD_FAST_0_r12 1044 -#define _LOAD_FAST_0_r23 1045 -#define _LOAD_FAST_1_r01 1046 -#define _LOAD_FAST_1_r12 1047 -#define _LOAD_FAST_1_r23 1048 -#define _LOAD_FAST_2_r01 1049 -#define _LOAD_FAST_2_r12 1050 -#define _LOAD_FAST_2_r23 1051 -#define _LOAD_FAST_3_r01 1052 -#define _LOAD_FAST_3_r12 1053 -#define _LOAD_FAST_3_r23 1054 -#define _LOAD_FAST_4_r01 1055 -#define _LOAD_FAST_4_r12 1056 -#define _LOAD_FAST_4_r23 1057 -#define _LOAD_FAST_5_r01 1058 -#define _LOAD_FAST_5_r12 1059 -#define _LOAD_FAST_5_r23 1060 -#define _LOAD_FAST_6_r01 1061 -#define _LOAD_FAST_6_r12 1062 -#define _LOAD_FAST_6_r23 1063 -#define _LOAD_FAST_7_r01 1064 -#define _LOAD_FAST_7_r12 1065 -#define _LOAD_FAST_7_r23 1066 -#define _LOAD_FAST_AND_CLEAR_r01 1067 -#define _LOAD_FAST_AND_CLEAR_r12 1068 -#define _LOAD_FAST_AND_CLEAR_r23 1069 -#define _LOAD_FAST_BORROW_r01 1070 -#define _LOAD_FAST_BORROW_r12 1071 -#define _LOAD_FAST_BORROW_r23 1072 -#define _LOAD_FAST_BORROW_0_r01 1073 -#define _LOAD_FAST_BORROW_0_r12 1074 -#define _LOAD_FAST_BORROW_0_r23 1075 -#define _LOAD_FAST_BORROW_1_r01 1076 -#define _LOAD_FAST_BORROW_1_r12 1077 -#define _LOAD_FAST_BORROW_1_r23 1078 -#define _LOAD_FAST_BORROW_2_r01 1079 -#define _LOAD_FAST_BORROW_2_r12 1080 -#define _LOAD_FAST_BORROW_2_r23 1081 -#define _LOAD_FAST_BORROW_3_r01 1082 -#define _LOAD_FAST_BORROW_3_r12 1083 -#define _LOAD_FAST_BORROW_3_r23 1084 -#define _LOAD_FAST_BORROW_4_r01 1085 -#define _LOAD_FAST_BORROW_4_r12 1086 -#define _LOAD_FAST_BORROW_4_r23 1087 -#define _LOAD_FAST_BORROW_5_r01 1088 -#define _LOAD_FAST_BORROW_5_r12 1089 -#define _LOAD_FAST_BORROW_5_r23 1090 -#define _LOAD_FAST_BORROW_6_r01 1091 -#define _LOAD_FAST_BORROW_6_r12 1092 -#define _LOAD_FAST_BORROW_6_r23 1093 -#define _LOAD_FAST_BORROW_7_r01 1094 -#define _LOAD_FAST_BORROW_7_r12 1095 -#define _LOAD_FAST_BORROW_7_r23 1096 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1097 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1098 -#define _LOAD_FAST_CHECK_r01 1099 -#define _LOAD_FAST_CHECK_r12 1100 -#define _LOAD_FAST_CHECK_r23 1101 -#define _LOAD_FAST_LOAD_FAST_r02 1102 -#define _LOAD_FAST_LOAD_FAST_r13 1103 -#define _LOAD_FROM_DICT_OR_DEREF_r11 1104 -#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1105 -#define _LOAD_GLOBAL_r00 1106 -#define _LOAD_GLOBAL_BUILTINS_r01 1107 -#define _LOAD_GLOBAL_MODULE_r01 1108 -#define _LOAD_LOCALS_r01 1109 -#define _LOAD_LOCALS_r12 1110 -#define _LOAD_LOCALS_r23 1111 -#define _LOAD_NAME_r01 1112 -#define _LOAD_SMALL_INT_r01 1113 -#define _LOAD_SMALL_INT_r12 1114 -#define _LOAD_SMALL_INT_r23 1115 -#define _LOAD_SMALL_INT_0_r01 1116 -#define _LOAD_SMALL_INT_0_r12 1117 -#define _LOAD_SMALL_INT_0_r23 1118 -#define _LOAD_SMALL_INT_1_r01 1119 -#define _LOAD_SMALL_INT_1_r12 1120 -#define _LOAD_SMALL_INT_1_r23 1121 -#define _LOAD_SMALL_INT_2_r01 1122 -#define _LOAD_SMALL_INT_2_r12 1123 -#define _LOAD_SMALL_INT_2_r23 1124 -#define _LOAD_SMALL_INT_3_r01 1125 -#define _LOAD_SMALL_INT_3_r12 1126 -#define _LOAD_SMALL_INT_3_r23 1127 -#define _LOAD_SPECIAL_r00 1128 -#define _LOAD_SUPER_ATTR_ATTR_r31 1129 -#define _LOAD_SUPER_ATTR_METHOD_r32 1130 -#define _MAKE_CALLARGS_A_TUPLE_r33 1131 -#define _MAKE_CELL_r00 1132 -#define _MAKE_FUNCTION_r11 1133 -#define _MAKE_WARM_r00 1134 -#define _MAKE_WARM_r11 1135 -#define _MAKE_WARM_r22 1136 -#define _MAKE_WARM_r33 1137 -#define _MAP_ADD_r20 1138 -#define _MATCH_CLASS_r31 1139 -#define _MATCH_KEYS_r23 1140 -#define _MATCH_MAPPING_r02 1141 -#define _MATCH_MAPPING_r12 1142 -#define _MATCH_MAPPING_r23 1143 -#define _MATCH_SEQUENCE_r02 1144 -#define _MATCH_SEQUENCE_r12 1145 -#define _MATCH_SEQUENCE_r23 1146 -#define _MAYBE_EXPAND_METHOD_r00 1147 -#define _MAYBE_EXPAND_METHOD_KW_r11 1148 -#define _MONITOR_CALL_r00 1149 -#define _MONITOR_CALL_KW_r11 1150 -#define _MONITOR_JUMP_BACKWARD_r00 1151 -#define _MONITOR_JUMP_BACKWARD_r11 1152 -#define _MONITOR_JUMP_BACKWARD_r22 1153 -#define _MONITOR_JUMP_BACKWARD_r33 1154 -#define _MONITOR_RESUME_r00 1155 -#define _NOP_r00 1156 -#define _NOP_r11 1157 -#define _NOP_r22 1158 -#define _NOP_r33 1159 -#define _POP_CALL_r20 1160 -#define _POP_CALL_LOAD_CONST_INLINE_BORROW_r21 1161 -#define _POP_CALL_ONE_r30 1162 -#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW_r31 1163 -#define _POP_CALL_TWO_r30 1164 -#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW_r31 1165 -#define _POP_EXCEPT_r10 1166 -#define _POP_ITER_r20 1167 -#define _POP_JUMP_IF_FALSE_r00 1168 -#define _POP_JUMP_IF_FALSE_r10 1169 -#define _POP_JUMP_IF_FALSE_r21 1170 -#define _POP_JUMP_IF_FALSE_r32 1171 -#define _POP_JUMP_IF_TRUE_r00 1172 -#define _POP_JUMP_IF_TRUE_r10 1173 -#define _POP_JUMP_IF_TRUE_r21 1174 -#define _POP_JUMP_IF_TRUE_r32 1175 -#define _POP_TOP_r10 1176 -#define _POP_TOP_FLOAT_r00 1177 -#define _POP_TOP_FLOAT_r10 1178 -#define _POP_TOP_FLOAT_r21 1179 -#define _POP_TOP_FLOAT_r32 1180 -#define _POP_TOP_INT_r00 1181 -#define _POP_TOP_INT_r10 1182 -#define _POP_TOP_INT_r21 1183 -#define _POP_TOP_INT_r32 1184 -#define _POP_TOP_LOAD_CONST_INLINE_r11 1185 -#define _POP_TOP_LOAD_CONST_INLINE_BORROW_r11 1186 -#define _POP_TOP_NOP_r00 1187 -#define _POP_TOP_NOP_r10 1188 -#define _POP_TOP_NOP_r21 1189 -#define _POP_TOP_NOP_r32 1190 -#define _POP_TOP_UNICODE_r00 1191 -#define _POP_TOP_UNICODE_r10 1192 -#define _POP_TOP_UNICODE_r21 1193 -#define _POP_TOP_UNICODE_r32 1194 -#define _POP_TWO_r20 1195 -#define _POP_TWO_LOAD_CONST_INLINE_BORROW_r21 1196 -#define _PUSH_EXC_INFO_r02 1197 -#define _PUSH_EXC_INFO_r12 1198 -#define _PUSH_EXC_INFO_r23 1199 -#define _PUSH_FRAME_r10 1200 -#define _PUSH_NULL_r01 1201 -#define _PUSH_NULL_r12 1202 -#define _PUSH_NULL_r23 1203 -#define _PUSH_NULL_CONDITIONAL_r00 1204 -#define _PY_FRAME_GENERAL_r01 1205 -#define _PY_FRAME_KW_r11 1206 -#define _QUICKEN_RESUME_r00 1207 -#define _QUICKEN_RESUME_r11 1208 -#define _QUICKEN_RESUME_r22 1209 -#define _QUICKEN_RESUME_r33 1210 -#define _REPLACE_WITH_TRUE_r11 1211 -#define _RESUME_CHECK_r00 1212 -#define _RESUME_CHECK_r11 1213 -#define _RESUME_CHECK_r22 1214 -#define _RESUME_CHECK_r33 1215 -#define _RETURN_GENERATOR_r01 1216 -#define _RETURN_VALUE_r11 1217 -#define _SAVE_RETURN_OFFSET_r00 1218 -#define _SAVE_RETURN_OFFSET_r11 1219 -#define _SAVE_RETURN_OFFSET_r22 1220 -#define _SAVE_RETURN_OFFSET_r33 1221 -#define _SEND_r22 1222 -#define _SEND_GEN_FRAME_r22 1223 -#define _SETUP_ANNOTATIONS_r00 1224 -#define _SET_ADD_r10 1225 -#define _SET_FUNCTION_ATTRIBUTE_r01 1226 -#define _SET_FUNCTION_ATTRIBUTE_r11 1227 -#define _SET_FUNCTION_ATTRIBUTE_r21 1228 -#define _SET_FUNCTION_ATTRIBUTE_r32 1229 -#define _SET_IP_r00 1230 -#define _SET_IP_r11 1231 -#define _SET_IP_r22 1232 -#define _SET_IP_r33 1233 -#define _SET_UPDATE_r10 1234 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r02 1235 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r12 1236 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r22 1237 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r32 1238 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r03 1239 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r13 1240 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r23 1241 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r33 1242 -#define _SPILL_OR_RELOAD_r01 1243 -#define _SPILL_OR_RELOAD_r02 1244 -#define _SPILL_OR_RELOAD_r03 1245 -#define _SPILL_OR_RELOAD_r10 1246 -#define _SPILL_OR_RELOAD_r12 1247 -#define _SPILL_OR_RELOAD_r13 1248 -#define _SPILL_OR_RELOAD_r20 1249 -#define _SPILL_OR_RELOAD_r21 1250 -#define _SPILL_OR_RELOAD_r23 1251 -#define _SPILL_OR_RELOAD_r30 1252 -#define _SPILL_OR_RELOAD_r31 1253 -#define _SPILL_OR_RELOAD_r32 1254 -#define _START_EXECUTOR_r00 1255 -#define _STORE_ATTR_r20 1256 -#define _STORE_ATTR_INSTANCE_VALUE_r21 1257 -#define _STORE_ATTR_SLOT_r21 1258 -#define _STORE_ATTR_WITH_HINT_r21 1259 -#define _STORE_DEREF_r10 1260 -#define _STORE_FAST_r10 1261 -#define _STORE_FAST_0_r10 1262 -#define _STORE_FAST_1_r10 1263 -#define _STORE_FAST_2_r10 1264 -#define _STORE_FAST_3_r10 1265 -#define _STORE_FAST_4_r10 1266 -#define _STORE_FAST_5_r10 1267 -#define _STORE_FAST_6_r10 1268 -#define _STORE_FAST_7_r10 1269 -#define _STORE_FAST_LOAD_FAST_r11 1270 -#define _STORE_FAST_STORE_FAST_r20 1271 -#define _STORE_GLOBAL_r10 1272 -#define _STORE_NAME_r10 1273 -#define _STORE_SLICE_r30 1274 -#define _STORE_SUBSCR_r30 1275 -#define _STORE_SUBSCR_DICT_r31 1276 -#define _STORE_SUBSCR_LIST_INT_r32 1277 -#define _SWAP_r11 1278 -#define _SWAP_2_r02 1279 -#define _SWAP_2_r12 1280 -#define _SWAP_2_r22 1281 -#define _SWAP_2_r33 1282 -#define _SWAP_3_r03 1283 -#define _SWAP_3_r13 1284 -#define _SWAP_3_r23 1285 -#define _SWAP_3_r33 1286 -#define _TIER2_RESUME_CHECK_r00 1287 -#define _TIER2_RESUME_CHECK_r11 1288 -#define _TIER2_RESUME_CHECK_r22 1289 -#define _TIER2_RESUME_CHECK_r33 1290 -#define _TO_BOOL_r11 1291 -#define _TO_BOOL_BOOL_r01 1292 -#define _TO_BOOL_BOOL_r11 1293 -#define _TO_BOOL_BOOL_r22 1294 -#define _TO_BOOL_BOOL_r33 1295 -#define _TO_BOOL_INT_r11 1296 -#define _TO_BOOL_LIST_r11 1297 -#define _TO_BOOL_NONE_r01 1298 -#define _TO_BOOL_NONE_r11 1299 -#define _TO_BOOL_NONE_r22 1300 -#define _TO_BOOL_NONE_r33 1301 -#define _TO_BOOL_STR_r11 1302 -#define _TRACE_RECORD_r00 1303 -#define _UNARY_INVERT_r11 1304 -#define _UNARY_NEGATIVE_r11 1305 -#define _UNARY_NOT_r01 1306 -#define _UNARY_NOT_r11 1307 -#define _UNARY_NOT_r22 1308 -#define _UNARY_NOT_r33 1309 -#define _UNPACK_EX_r10 1310 -#define _UNPACK_SEQUENCE_r10 1311 -#define _UNPACK_SEQUENCE_LIST_r10 1312 -#define _UNPACK_SEQUENCE_TUPLE_r10 1313 -#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1314 -#define _WITH_EXCEPT_START_r33 1315 -#define _YIELD_VALUE_r11 1316 -#define MAX_UOP_REGS_ID 1316 +#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_r10 1266 +#define _STORE_FAST_0_r10 1267 +#define _STORE_FAST_1_r10 1268 +#define _STORE_FAST_2_r10 1269 +#define _STORE_FAST_3_r10 1270 +#define _STORE_FAST_4_r10 1271 +#define _STORE_FAST_5_r10 1272 +#define _STORE_FAST_6_r10 1273 +#define _STORE_FAST_7_r10 1274 +#define _STORE_FAST_LOAD_FAST_r11 1275 +#define _STORE_FAST_STORE_FAST_r20 1276 +#define _STORE_GLOBAL_r10 1277 +#define _STORE_NAME_r10 1278 +#define _STORE_SLICE_r30 1279 +#define _STORE_SUBSCR_r30 1280 +#define _STORE_SUBSCR_DICT_r31 1281 +#define _STORE_SUBSCR_LIST_INT_r32 1282 +#define _SWAP_r11 1283 +#define _SWAP_2_r02 1284 +#define _SWAP_2_r12 1285 +#define _SWAP_2_r22 1286 +#define _SWAP_2_r33 1287 +#define _SWAP_3_r03 1288 +#define _SWAP_3_r13 1289 +#define _SWAP_3_r23 1290 +#define _SWAP_3_r33 1291 +#define _TIER2_RESUME_CHECK_r00 1292 +#define _TIER2_RESUME_CHECK_r11 1293 +#define _TIER2_RESUME_CHECK_r22 1294 +#define _TIER2_RESUME_CHECK_r33 1295 +#define _TO_BOOL_r11 1296 +#define _TO_BOOL_BOOL_r01 1297 +#define _TO_BOOL_BOOL_r11 1298 +#define _TO_BOOL_BOOL_r22 1299 +#define _TO_BOOL_BOOL_r33 1300 +#define _TO_BOOL_INT_r11 1301 +#define _TO_BOOL_LIST_r11 1302 +#define _TO_BOOL_NONE_r01 1303 +#define _TO_BOOL_NONE_r11 1304 +#define _TO_BOOL_NONE_r22 1305 +#define _TO_BOOL_NONE_r33 1306 +#define _TO_BOOL_STR_r11 1307 +#define _TRACE_RECORD_r00 1308 +#define _UNARY_INVERT_r11 1309 +#define _UNARY_NEGATIVE_r11 1310 +#define _UNARY_NOT_r01 1311 +#define _UNARY_NOT_r11 1312 +#define _UNARY_NOT_r22 1313 +#define _UNARY_NOT_r33 1314 +#define _UNPACK_EX_r10 1315 +#define _UNPACK_SEQUENCE_r10 1316 +#define _UNPACK_SEQUENCE_LIST_r10 1317 +#define _UNPACK_SEQUENCE_TUPLE_r10 1318 +#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1319 +#define _WITH_EXCEPT_START_r33 1320 +#define _YIELD_VALUE_r11 1321 +#define MAX_UOP_REGS_ID 1321 #ifdef __cplusplus } diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index 214f58b22338e1..558184f890bf93 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -94,6 +94,7 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_GUARD_TOS_SLICE] = HAS_EXIT_FLAG, [_TO_BOOL_LIST] = HAS_ESCAPES_FLAG, [_TO_BOOL_NONE] = HAS_EXIT_FLAG, + [_GUARD_NOS_COMPACT_ASCII] = HAS_EXIT_FLAG, [_GUARD_NOS_UNICODE] = HAS_EXIT_FLAG, [_GUARD_TOS_UNICODE] = HAS_EXIT_FLAG, [_TO_BOOL_STR] = HAS_ESCAPES_FLAG, @@ -899,6 +900,15 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { { 3, 3, _TO_BOOL_NONE_r33 }, }, }, + [_GUARD_NOS_COMPACT_ASCII] = { + .best = { 0, 1, 2, 3 }, + .entries = { + { 2, 0, _GUARD_NOS_COMPACT_ASCII_r02 }, + { 2, 1, _GUARD_NOS_COMPACT_ASCII_r12 }, + { 2, 2, _GUARD_NOS_COMPACT_ASCII_r22 }, + { 3, 3, _GUARD_NOS_COMPACT_ASCII_r33 }, + }, + }, [_GUARD_NOS_UNICODE] = { .best = { 0, 1, 2, 3 }, .entries = { @@ -3391,6 +3401,10 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_TO_BOOL_NONE_r11] = _TO_BOOL_NONE, [_TO_BOOL_NONE_r22] = _TO_BOOL_NONE, [_TO_BOOL_NONE_r33] = _TO_BOOL_NONE, + [_GUARD_NOS_COMPACT_ASCII_r02] = _GUARD_NOS_COMPACT_ASCII, + [_GUARD_NOS_COMPACT_ASCII_r12] = _GUARD_NOS_COMPACT_ASCII, + [_GUARD_NOS_COMPACT_ASCII_r22] = _GUARD_NOS_COMPACT_ASCII, + [_GUARD_NOS_COMPACT_ASCII_r33] = _GUARD_NOS_COMPACT_ASCII, [_GUARD_NOS_UNICODE_r02] = _GUARD_NOS_UNICODE, [_GUARD_NOS_UNICODE_r12] = _GUARD_NOS_UNICODE, [_GUARD_NOS_UNICODE_r22] = _GUARD_NOS_UNICODE, @@ -4335,6 +4349,11 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_GUARD_KEYS_VERSION_r11] = "_GUARD_KEYS_VERSION_r11", [_GUARD_KEYS_VERSION_r22] = "_GUARD_KEYS_VERSION_r22", [_GUARD_KEYS_VERSION_r33] = "_GUARD_KEYS_VERSION_r33", + [_GUARD_NOS_COMPACT_ASCII] = "_GUARD_NOS_COMPACT_ASCII", + [_GUARD_NOS_COMPACT_ASCII_r02] = "_GUARD_NOS_COMPACT_ASCII_r02", + [_GUARD_NOS_COMPACT_ASCII_r12] = "_GUARD_NOS_COMPACT_ASCII_r12", + [_GUARD_NOS_COMPACT_ASCII_r22] = "_GUARD_NOS_COMPACT_ASCII_r22", + [_GUARD_NOS_COMPACT_ASCII_r33] = "_GUARD_NOS_COMPACT_ASCII_r33", [_GUARD_NOS_DICT] = "_GUARD_NOS_DICT", [_GUARD_NOS_DICT_r02] = "_GUARD_NOS_DICT_r02", [_GUARD_NOS_DICT_r12] = "_GUARD_NOS_DICT_r12", @@ -5074,6 +5093,8 @@ int _PyUop_num_popped(int opcode, int oparg) return 1; case _TO_BOOL_NONE: return 1; + case _GUARD_NOS_COMPACT_ASCII: + return 0; case _GUARD_NOS_UNICODE: return 0; case _GUARD_TOS_UNICODE: diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 829efafa67d6e1..25339e919377e0 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -529,6 +529,12 @@ dummy_func( res = PyStackRef_False; } + op(_GUARD_NOS_COMPACT_ASCII, (nos, unused -- nos, unused)) { + PyObject *o = PyStackRef_AsPyObjectBorrow(nos); + EXIT_IF(!PyUnicode_CheckExact(o)); + EXIT_IF(!PyUnicode_IS_COMPACT_ASCII(o)); + } + op(_GUARD_NOS_UNICODE, (nos, unused -- nos, unused)) { PyObject *o = PyStackRef_AsPyObjectBorrow(nos); EXIT_IF(!PyUnicode_CheckExact(o)); @@ -934,7 +940,7 @@ dummy_func( } macro(BINARY_OP_SUBSCR_STR_INT) = - _GUARD_TOS_INT + _GUARD_NOS_UNICODE + 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; op(_BINARY_OP_SUBSCR_STR_INT, (str_st, sub_st -- res, s, i)) { PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); @@ -945,8 +951,6 @@ dummy_func( 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 an ASCII string: - DEOPT_IF(!PyUnicode_IS_COMPACT_ASCII(str)); uint8_t c = PyUnicode_1BYTE_DATA(str)[index]; assert(c < 128); STAT_INC(BINARY_OP, hit); diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 0a2b794988c961..38401f40b7a08b 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -2745,6 +2745,121 @@ break; } + case _GUARD_NOS_COMPACT_ASCII_r02: { + CHECK_CURRENT_CACHED_VALUES(0); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef nos; + nos = stack_pointer[-2]; + PyObject *o = PyStackRef_AsPyObjectBorrow(nos); + if (!PyUnicode_CheckExact(o)) { + UOP_STAT_INC(uopcode, miss); + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_JUMP_TARGET(); + } + if (!PyUnicode_IS_COMPACT_ASCII(o)) { + UOP_STAT_INC(uopcode, miss); + SET_CURRENT_CACHED_VALUES(0); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache1 = stack_pointer[-1]; + _tos_cache0 = nos; + SET_CURRENT_CACHED_VALUES(2); + stack_pointer += -2; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_NOS_COMPACT_ASCII_r12: { + CHECK_CURRENT_CACHED_VALUES(1); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef nos; + _PyStackRef _stack_item_0 = _tos_cache0; + nos = stack_pointer[-1]; + PyObject *o = PyStackRef_AsPyObjectBorrow(nos); + if (!PyUnicode_CheckExact(o)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(1); + JUMP_TO_JUMP_TARGET(); + } + if (!PyUnicode_IS_COMPACT_ASCII(o)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(1); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache1 = _stack_item_0; + _tos_cache0 = nos; + SET_CURRENT_CACHED_VALUES(2); + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_NOS_COMPACT_ASCII_r22: { + CHECK_CURRENT_CACHED_VALUES(2); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef nos; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + nos = _stack_item_0; + PyObject *o = PyStackRef_AsPyObjectBorrow(nos); + if (!PyUnicode_CheckExact(o)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache1 = _stack_item_1; + _tos_cache0 = nos; + SET_CURRENT_CACHED_VALUES(2); + JUMP_TO_JUMP_TARGET(); + } + if (!PyUnicode_IS_COMPACT_ASCII(o)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache1 = _stack_item_1; + _tos_cache0 = nos; + SET_CURRENT_CACHED_VALUES(2); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache1 = _stack_item_1; + _tos_cache0 = nos; + SET_CURRENT_CACHED_VALUES(2); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + + case _GUARD_NOS_COMPACT_ASCII_r33: { + CHECK_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + _PyStackRef nos; + _PyStackRef _stack_item_0 = _tos_cache0; + _PyStackRef _stack_item_1 = _tos_cache1; + _PyStackRef _stack_item_2 = _tos_cache2; + nos = _stack_item_1; + PyObject *o = PyStackRef_AsPyObjectBorrow(nos); + if (!PyUnicode_CheckExact(o)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache2 = _stack_item_2; + _tos_cache1 = nos; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(3); + JUMP_TO_JUMP_TARGET(); + } + if (!PyUnicode_IS_COMPACT_ASCII(o)) { + UOP_STAT_INC(uopcode, miss); + _tos_cache2 = _stack_item_2; + _tos_cache1 = nos; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(3); + JUMP_TO_JUMP_TARGET(); + } + _tos_cache2 = _stack_item_2; + _tos_cache1 = nos; + _tos_cache0 = _stack_item_0; + SET_CURRENT_CACHED_VALUES(3); + assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); + break; + } + case _GUARD_NOS_UNICODE_r02: { CHECK_CURRENT_CACHED_VALUES(0); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); @@ -4695,13 +4810,6 @@ SET_CURRENT_CACHED_VALUES(2); JUMP_TO_JUMP_TARGET(); } - if (!PyUnicode_IS_COMPACT_ASCII(str)) { - UOP_STAT_INC(uopcode, miss); - _tos_cache1 = sub_st; - _tos_cache0 = str_st; - SET_CURRENT_CACHED_VALUES(2); - JUMP_TO_JUMP_TARGET(); - } uint8_t c = PyUnicode_1BYTE_DATA(str)[index]; assert(c < 128); STAT_INC(BINARY_OP, hit); diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 716d87fd97ac4a..4f97424c7eab2c 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -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,6 +951,11 @@ 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_STR_INT @@ -972,11 +977,6 @@ assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); JUMP_TO_PREDICTED(BINARY_OP); } - if (!PyUnicode_IS_COMPACT_ASCII(str)) { - 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); diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c index 53c7cb724e1b65..15dd81d9c6e531 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -412,6 +412,10 @@ dummy_func(void) { sym_set_type(nos, &PyUnicode_Type); } + op(_GUARD_NOS_COMPACT_ASCII, (nos, unused -- nos, unused)) { + sym_set_type(nos, &PyUnicode_Type); + } + op(_GUARD_TOS_UNICODE, (value -- value)) { if (sym_matches_type(value, &PyUnicode_Type)) { REPLACE_OP(this_instr, _NOP, 0, 0); diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 49e6ac560306fe..c423a1885243d2 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -379,6 +379,13 @@ break; } + case _GUARD_NOS_COMPACT_ASCII: { + JitOptRef nos; + nos = stack_pointer[-2]; + sym_set_type(nos, &PyUnicode_Type); + break; + } + case _GUARD_NOS_UNICODE: { JitOptRef nos; nos = stack_pointer[-2]; From 09ce59249960a2c382acaafc3d36128db6789fc7 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Fri, 2 Jan 2026 12:09:36 +0000 Subject: [PATCH 03/10] gh-142927: Hide _sync_coordinator frames from profiler output (#143337) --- Lib/profiling/sampling/collector.py | 29 +++- Lib/profiling/sampling/constants.py | 6 + Lib/profiling/sampling/gecko_collector.py | 4 +- .../test_sampling_profiler/test_collectors.py | 128 ++++++++++++++++++ 4 files changed, 164 insertions(+), 3 deletions(-) diff --git a/Lib/profiling/sampling/collector.py b/Lib/profiling/sampling/collector.py index c70e1eefe276cc..7dc095c6c279bd 100644 --- a/Lib/profiling/sampling/collector.py +++ b/Lib/profiling/sampling/collector.py @@ -6,6 +6,7 @@ THREAD_STATUS_GIL_REQUESTED, THREAD_STATUS_UNKNOWN, THREAD_STATUS_HAS_EXCEPTION, + _INTERNAL_FRAME_SUFFIXES, ) try: @@ -42,6 +43,25 @@ def extract_lineno(location): return 0 return location[0] +def _is_internal_frame(frame): + if isinstance(frame, tuple): + filename = frame[0] if frame else "" + else: + filename = getattr(frame, "filename", "") + + if not filename: + return False + + return filename.endswith(_INTERNAL_FRAME_SUFFIXES) + + +def filter_internal_frames(frames): + if not frames: + return frames + + return [f for f in frames if not _is_internal_frame(f)] + + class Collector(ABC): @abstractmethod def collect(self, stack_frames, timestamps_us=None): @@ -63,6 +83,10 @@ def collect_failed_sample(self): def export(self, filename): """Export collected data to a file.""" + @staticmethod + def _filter_internal_frames(frames): + return filter_internal_frames(frames) + def _iter_all_frames(self, stack_frames, skip_idle=False): for interpreter_info in stack_frames: for thread_info in interpreter_info.threads: @@ -76,7 +100,10 @@ def _iter_all_frames(self, stack_frames, skip_idle=False): continue frames = thread_info.frame_info if frames: - yield frames, thread_info.thread_id + # Filter out internal profiler frames from the bottom of the stack + frames = self._filter_internal_frames(frames) + if frames: + yield frames, thread_info.thread_id def _iter_async_frames(self, awaited_info_list): # Phase 1: Index tasks and build parent relationships with pre-computed selection diff --git a/Lib/profiling/sampling/constants.py b/Lib/profiling/sampling/constants.py index 366cbb38365c9f..58a57700fbdd4a 100644 --- a/Lib/profiling/sampling/constants.py +++ b/Lib/profiling/sampling/constants.py @@ -23,6 +23,12 @@ # Format: (lineno, end_lineno, col_offset, end_col_offset) DEFAULT_LOCATION = (0, 0, -1, -1) +# Internal frame path suffixes to filter from profiling output +# These are internal profiler modules that should not appear in user-facing output +_INTERNAL_FRAME_SUFFIXES = ( + "_sync_coordinator.py", +) + # Thread status flags try: from _remote_debugging import ( diff --git a/Lib/profiling/sampling/gecko_collector.py b/Lib/profiling/sampling/gecko_collector.py index c1c9cfcf3b93a9..28ef9b69bf7968 100644 --- a/Lib/profiling/sampling/gecko_collector.py +++ b/Lib/profiling/sampling/gecko_collector.py @@ -6,7 +6,7 @@ import threading import time -from .collector import Collector +from .collector import Collector, filter_internal_frames from .opcode_utils import get_opcode_info, format_opcode try: from _remote_debugging import THREAD_STATUS_HAS_GIL, THREAD_STATUS_ON_CPU, THREAD_STATUS_UNKNOWN, THREAD_STATUS_GIL_REQUESTED, THREAD_STATUS_HAS_EXCEPTION @@ -172,7 +172,7 @@ def collect(self, stack_frames, timestamps_us=None): # Process threads for interpreter_info in stack_frames: for thread_info in interpreter_info.threads: - frames = thread_info.frame_info + frames = filter_internal_frames(thread_info.frame_info) tid = thread_info.thread_id # Initialize thread if needed diff --git a/Lib/test/test_profiling/test_sampling_profiler/test_collectors.py b/Lib/test/test_profiling/test_sampling_profiler/test_collectors.py index 13bdb4e111364c..ae336ccdb941ce 100644 --- a/Lib/test/test_profiling/test_sampling_profiler/test_collectors.py +++ b/Lib/test/test_profiling/test_sampling_profiler/test_collectors.py @@ -1823,3 +1823,131 @@ def test_gecko_collector_frame_format(self): thread = profile["threads"][0] # Should have recorded 3 functions self.assertEqual(thread["funcTable"]["length"], 3) + + +class TestInternalFrameFiltering(unittest.TestCase): + """Tests for filtering internal profiler frames from output.""" + + def test_filter_internal_frames(self): + """Test that _sync_coordinator frames are filtered from anywhere in stack.""" + from profiling.sampling.collector import filter_internal_frames + + # Stack with _sync_coordinator in the middle (realistic scenario) + frames = [ + MockFrameInfo("user_script.py", 10, "user_func"), + MockFrameInfo("/path/to/_sync_coordinator.py", 100, "main"), + MockFrameInfo("", 87, "_run_code"), + ] + + filtered = filter_internal_frames(frames) + self.assertEqual(len(filtered), 2) + self.assertEqual(filtered[0].filename, "user_script.py") + self.assertEqual(filtered[1].filename, "") + + def test_pstats_collector_filters_internal_frames(self): + """Test that PstatsCollector filters out internal frames.""" + collector = PstatsCollector(sample_interval_usec=1000) + + frames = [ + MockInterpreterInfo( + 0, + [ + MockThreadInfo( + 1, + [ + MockFrameInfo("user_script.py", 10, "user_func"), + MockFrameInfo("/path/to/_sync_coordinator.py", 100, "main"), + MockFrameInfo("", 87, "_run_code"), + ], + status=THREAD_STATUS_HAS_GIL, + ) + ], + ) + ] + collector.collect(frames) + + self.assertEqual(len(collector.result), 2) + self.assertIn(("user_script.py", 10, "user_func"), collector.result) + self.assertIn(("", 87, "_run_code"), collector.result) + + def test_gecko_collector_filters_internal_frames(self): + """Test that GeckoCollector filters out internal frames.""" + collector = GeckoCollector(sample_interval_usec=1000) + + frames = [ + MockInterpreterInfo( + 0, + [ + MockThreadInfo( + 1, + [ + MockFrameInfo("app.py", 50, "run"), + MockFrameInfo("/lib/_sync_coordinator.py", 100, "main"), + ], + status=THREAD_STATUS_HAS_GIL, + ) + ], + ) + ] + collector.collect(frames) + + profile = collector._build_profile() + string_array = profile["shared"]["stringArray"] + + # Should not contain _sync_coordinator functions + for s in string_array: + self.assertNotIn("_sync_coordinator", s) + + def test_flamegraph_collector_filters_internal_frames(self): + """Test that FlamegraphCollector filters out internal frames.""" + collector = FlamegraphCollector(sample_interval_usec=1000) + + frames = [ + MockInterpreterInfo( + 0, + [ + MockThreadInfo( + 1, + [ + MockFrameInfo("app.py", 50, "run"), + MockFrameInfo("/lib/_sync_coordinator.py", 100, "main"), + MockFrameInfo("", 87, "_run_code"), + ], + status=THREAD_STATUS_HAS_GIL, + ) + ], + ) + ] + collector.collect(frames) + + data = collector._convert_to_flamegraph_format() + strings = data.get("strings", []) + + for s in strings: + self.assertNotIn("_sync_coordinator", s) + + def test_collapsed_stack_collector_filters_internal_frames(self): + """Test that CollapsedStackCollector filters out internal frames.""" + collector = CollapsedStackCollector(sample_interval_usec=1000) + + frames = [ + MockInterpreterInfo( + 0, + [ + MockThreadInfo( + 1, + [ + MockFrameInfo("app.py", 50, "run"), + MockFrameInfo("/lib/_sync_coordinator.py", 100, "main"), + ], + status=THREAD_STATUS_HAS_GIL, + ) + ], + ) + ] + collector.collect(frames) + + # Check that no stack contains _sync_coordinator + for (call_tree, _), _ in collector.stack_counter.items(): + for filename, _, _ in call_tree: + self.assertNotIn("_sync_coordinator", filename) From 8a2deea1fc725f8147254f87c6042fcf75a1d03b Mon Sep 17 00:00:00 2001 From: Jan-Eric Nitschke <47750513+JanEricNitschke@users.noreply.github.com> Date: Fri, 2 Jan 2026 14:04:37 +0100 Subject: [PATCH 04/10] gh-128067: Fix pyrepl overriding printed output without newlines (#138732) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Łukasz Langa --- Lib/_pyrepl/unix_console.py | 7 ++-- Lib/_pyrepl/windows_console.py | 7 ++-- Lib/test/test_pyrepl/test_pyrepl.py | 38 +++++++++++++++++++ Lib/test/test_pyrepl/test_unix_console.py | 14 +++++++ Lib/test/test_pyrepl/test_windows_console.py | 14 +++++++ Misc/ACKS | 1 + ...-09-14-13-35-44.gh-issue-128067.BGdP_A.rst | 1 + 7 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 Misc/NEWS.d/next/Windows/2025-09-14-13-35-44.gh-issue-128067.BGdP_A.rst diff --git a/Lib/_pyrepl/unix_console.py b/Lib/_pyrepl/unix_console.py index 09247de748ee3b..937b5df6ff7d4c 100644 --- a/Lib/_pyrepl/unix_console.py +++ b/Lib/_pyrepl/unix_console.py @@ -251,8 +251,9 @@ def refresh(self, screen, c_xy): if not self.__gone_tall: while len(self.screen) < min(len(screen), self.height): self.__hide_cursor() - self.__move(0, len(self.screen) - 1) - self.__write("\n") + if self.screen: + self.__move(0, len(self.screen) - 1) + self.__write("\n") self.posxy = 0, len(self.screen) self.screen.append("") else: @@ -808,7 +809,7 @@ def __tputs(self, fmt, prog=delayprog): will never do anyone any good.""" # using .get() means that things will blow up # only if the bps is actually needed (which I'm - # betting is pretty unlkely) + # betting is pretty unlikely) bps = ratedict.get(self.__svtermstate.ospeed) while True: m = prog.search(fmt) diff --git a/Lib/_pyrepl/windows_console.py b/Lib/_pyrepl/windows_console.py index f9f5988af0b9ef..a703a061e8edea 100644 --- a/Lib/_pyrepl/windows_console.py +++ b/Lib/_pyrepl/windows_console.py @@ -183,8 +183,9 @@ def refresh(self, screen: list[str], c_xy: tuple[int, int]) -> None: while len(self.screen) < min(len(screen), self.height): self._hide_cursor() - self._move_relative(0, len(self.screen) - 1) - self.__write("\n") + if self.screen: + self._move_relative(0, len(self.screen) - 1) + self.__write("\n") self.posxy = 0, len(self.screen) self.screen.append("") @@ -501,7 +502,7 @@ def clear(self) -> None: """Wipe the screen""" self.__write(CLEAR) self.posxy = 0, 0 - self.screen = [""] + self.screen = [] def finish(self) -> None: """Move the cursor to the end of the display and otherwise get diff --git a/Lib/test/test_pyrepl/test_pyrepl.py b/Lib/test/test_pyrepl/test_pyrepl.py index 65a252c95e5842..90cadd0b2ad494 100644 --- a/Lib/test/test_pyrepl/test_pyrepl.py +++ b/Lib/test/test_pyrepl/test_pyrepl.py @@ -1846,6 +1846,44 @@ def test_detect_pip_usage_in_repl(self): ) self.assertIn(hint, output) + @force_not_colorized + def test_no_newline(self): + env = os.environ.copy() + env.pop("PYTHON_BASIC_REPL", "") + env["PYTHON_BASIC_REPL"] = "1" + + commands = "print('Something pretty long', end='')\nexit()\n" + expected_output_sequence = "Something pretty long>>> exit()" + + basic_output, basic_exit_code = self.run_repl(commands, env=env) + self.assertEqual(basic_exit_code, 0) + self.assertIn(expected_output_sequence, basic_output) + + output, exit_code = self.run_repl(commands) + self.assertEqual(exit_code, 0) + + # Define escape sequences that don't affect cursor position or visual output + bracketed_paste_mode = r'\x1b\[\?2004[hl]' # Enable/disable bracketed paste + application_cursor_keys = r'\x1b\[\?1[hl]' # Enable/disable application cursor keys + application_keypad_mode = r'\x1b[=>]' # Enable/disable application keypad + insert_character = r'\x1b\[(?:1)?@(?=[ -~])' # Insert exactly 1 char (safe form) + cursor_visibility = r'\x1b\[\?25[hl]' # Show/hide cursor + cursor_blinking = r'\x1b\[\?12[hl]' # Start/stop cursor blinking + device_attributes = r'\x1b\[\?[01]c' # Device Attributes (DA) queries/responses + + safe_escapes = re.compile( + f'{bracketed_paste_mode}|' + f'{application_cursor_keys}|' + f'{application_keypad_mode}|' + f'{insert_character}|' + f'{cursor_visibility}|' + f'{cursor_blinking}|' + f'{device_attributes}' + ) + cleaned_output = safe_escapes.sub('', output) + self.assertIn(expected_output_sequence, cleaned_output) + + class TestPyReplCtrlD(TestCase): """Test Ctrl+D behavior in _pyrepl to match old pre-3.13 REPL behavior. diff --git a/Lib/test/test_pyrepl/test_unix_console.py b/Lib/test/test_pyrepl/test_unix_console.py index f4fb9237ffdfd0..680adbc2d968f0 100644 --- a/Lib/test/test_pyrepl/test_unix_console.py +++ b/Lib/test/test_pyrepl/test_unix_console.py @@ -102,6 +102,20 @@ def unix_console(events, **kwargs): @patch("os.write") @force_not_colorized_test_class class TestConsole(TestCase): + def test_no_newline(self, _os_write): + code = "1" + events = code_to_events(code) + _, con = handle_events_unix_console(events) + self.assertNotIn(call(ANY, b'\n'), _os_write.mock_calls) + con.restore() + + def test_newline(self, _os_write): + code = "\n" + events = code_to_events(code) + _, con = handle_events_unix_console(events) + _os_write.assert_any_call(ANY, b"\n") + con.restore() + def test_simple_addition(self, _os_write): code = "12+34" events = code_to_events(code) diff --git a/Lib/test/test_pyrepl/test_windows_console.py b/Lib/test/test_pyrepl/test_windows_console.py index f9607e02c604ff..065706472e52be 100644 --- a/Lib/test/test_pyrepl/test_windows_console.py +++ b/Lib/test/test_pyrepl/test_windows_console.py @@ -72,6 +72,20 @@ def handle_events_short(self, events, **kwargs): def handle_events_height_3(self, events): return self.handle_events(events, height=3) + def test_no_newline(self): + code = "1" + events = code_to_events(code) + _, con = self.handle_events(events) + self.assertNotIn(call(b'\n'), con.out.write.mock_calls) + con.restore() + + def test_newline(self): + code = "\n" + events = code_to_events(code) + _, con = self.handle_events(events) + con.out.write.assert_any_call(b"\n") + con.restore() + def test_simple_addition(self): code = "12+34" events = code_to_events(code) diff --git a/Misc/ACKS b/Misc/ACKS index bb6b6bde822a4e..671fcf88c75af9 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1352,6 +1352,7 @@ Gustavo Niemeyer Oscar Nierstrasz Lysandros Nikolaou Hrvoje Nikšić +Jan-Eric Nitschke Gregory Nofi Jesse Noller Bill Noon diff --git a/Misc/NEWS.d/next/Windows/2025-09-14-13-35-44.gh-issue-128067.BGdP_A.rst b/Misc/NEWS.d/next/Windows/2025-09-14-13-35-44.gh-issue-128067.BGdP_A.rst new file mode 100644 index 00000000000000..f68cda21db7f03 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2025-09-14-13-35-44.gh-issue-128067.BGdP_A.rst @@ -0,0 +1 @@ +Fix a bug in PyREPL on Windows where output without a trailing newline was overwritten by the next prompt. From 61f2ad9a3a78597bb1983c3392a758ed02709574 Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Fri, 2 Jan 2026 23:05:08 +0900 Subject: [PATCH 05/10] gh-139757: Fix unintended bytecode specialization for non-ascii string (gh-143352) --- Lib/test/test_opcache.py | 9 +++++++++ .../2026-01-02-22-35-12.gh-issue-139757.v5LRew.rst | 2 ++ Python/specialize.c | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2026-01-02-22-35-12.gh-issue-139757.v5LRew.rst diff --git a/Lib/test/test_opcache.py b/Lib/test/test_opcache.py index 4113b79ef5c80b..4df88d0f16885f 100644 --- a/Lib/test/test_opcache.py +++ b/Lib/test/test_opcache.py @@ -1785,6 +1785,15 @@ def binary_subscr_str_int(): self.assert_specialized(binary_subscr_str_int, "BINARY_OP_SUBSCR_STR_INT") self.assert_no_opcode(binary_subscr_str_int, "BINARY_OP") + def binary_subscr_str_int_non_compact(): + for _ in range(_testinternalcapi.SPECIALIZATION_THRESHOLD): + a = "바이트코드_특수화" + for idx, expected in enumerate(a): + self.assertEqual(a[idx], expected) + + binary_subscr_str_int_non_compact() + self.assert_no_opcode(binary_subscr_str_int_non_compact, "BINARY_OP_SUBSCR_STR_INT") + def binary_subscr_getitems(): class C: def __init__(self, val): diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-01-02-22-35-12.gh-issue-139757.v5LRew.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-01-02-22-35-12.gh-issue-139757.v5LRew.rst new file mode 100644 index 00000000000000..ef1a4e4b3af24f --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-01-02-22-35-12.gh-issue-139757.v5LRew.rst @@ -0,0 +1,2 @@ +Fix unintended bytecode specialization for non-ascii string. +Patch by Donghee Na, Ken Jin and Chris Eibl. diff --git a/Python/specialize.c b/Python/specialize.c index e67078afdd9df3..e9302157e7782a 100644 --- a/Python/specialize.c +++ b/Python/specialize.c @@ -2240,7 +2240,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) && PyUnicode_IS_COMPACT_ASCII(lhs)) { specialize(instr, BINARY_OP_SUBSCR_STR_INT); return; } From 08a17ed0614a059c52a7eadba8a3775d09c2317b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Langa?= Date: Fri, 2 Jan 2026 15:42:04 +0100 Subject: [PATCH 06/10] gh-128067: In test_pyrepl, discover escape sequences from terminfo instead of using hard-coded values (#143356) --- Lib/test/test_pyrepl/test_pyrepl.py | 61 ++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/Lib/test/test_pyrepl/test_pyrepl.py b/Lib/test/test_pyrepl/test_pyrepl.py index 90cadd0b2ad494..6cf87522af2bc3 100644 --- a/Lib/test/test_pyrepl/test_pyrepl.py +++ b/Lib/test/test_pyrepl/test_pyrepl.py @@ -1862,24 +1862,49 @@ def test_no_newline(self): output, exit_code = self.run_repl(commands) self.assertEqual(exit_code, 0) - # Define escape sequences that don't affect cursor position or visual output - bracketed_paste_mode = r'\x1b\[\?2004[hl]' # Enable/disable bracketed paste - application_cursor_keys = r'\x1b\[\?1[hl]' # Enable/disable application cursor keys - application_keypad_mode = r'\x1b[=>]' # Enable/disable application keypad - insert_character = r'\x1b\[(?:1)?@(?=[ -~])' # Insert exactly 1 char (safe form) - cursor_visibility = r'\x1b\[\?25[hl]' # Show/hide cursor - cursor_blinking = r'\x1b\[\?12[hl]' # Start/stop cursor blinking - device_attributes = r'\x1b\[\?[01]c' # Device Attributes (DA) queries/responses - - safe_escapes = re.compile( - f'{bracketed_paste_mode}|' - f'{application_cursor_keys}|' - f'{application_keypad_mode}|' - f'{insert_character}|' - f'{cursor_visibility}|' - f'{cursor_blinking}|' - f'{device_attributes}' - ) + # Build patterns for escape sequences that don't affect cursor position + # or visual output. Use terminfo to get platform-specific sequences, + # falling back to hard-coded patterns for capabilities not in terminfo. + from _pyrepl.terminfo import TermInfo + ti = TermInfo(os.environ.get("TERM", "")) + + safe_patterns = [] + + # smkx/rmkx - application cursor keys and keypad mode + smkx = ti.get("smkx") + rmkx = ti.get("rmkx") + if smkx: + safe_patterns.append(re.escape(smkx.decode("ascii"))) + if rmkx: + safe_patterns.append(re.escape(rmkx.decode("ascii"))) + if not smkx and not rmkx: + safe_patterns.append(r'\x1b\[\?1[hl]') # application cursor keys + safe_patterns.append(r'\x1b[=>]') # application keypad mode + + # ich1 - insert character (only safe form that inserts exactly 1 char) + ich1 = ti.get("ich1") + if ich1: + safe_patterns.append(re.escape(ich1.decode("ascii")) + r'(?=[ -~])') + else: + safe_patterns.append(r'\x1b\[(?:1)?@(?=[ -~])') + + # civis/cnorm - cursor visibility (may include cursor blinking control) + civis = ti.get("civis") + cnorm = ti.get("cnorm") + if civis: + safe_patterns.append(re.escape(civis.decode("ascii"))) + if cnorm: + safe_patterns.append(re.escape(cnorm.decode("ascii"))) + if not civis and not cnorm: + safe_patterns.append(r'\x1b\[\?25[hl]') # cursor visibility + safe_patterns.append(r'\x1b\[\?12[hl]') # cursor blinking + + # Modern extensions not in standard terminfo - always use patterns + safe_patterns.append(r'\x1b\[\?2004[hl]') # bracketed paste mode + safe_patterns.append(r'\x1b\[\?12[hl]') # cursor blinking (may be separate) + safe_patterns.append(r'\x1b\[\?[01]c') # device attributes + + safe_escapes = re.compile('|'.join(safe_patterns)) cleaned_output = safe_escapes.sub('', output) self.assertIn(expected_output_sequence, cleaned_output) From 864c5985ea986db873ded40f09d7269bfe39df98 Mon Sep 17 00:00:00 2001 From: Johann Christensen Date: Fri, 2 Jan 2026 15:58:23 +0100 Subject: [PATCH 07/10] gh-143148: Replace pre-commit with prek in CI (#143149) Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> --- .github/workflows/lint.yml | 5 +---- .github/zizmor.yml | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d74ce8fcc256dc..12fad966845dea 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,7 +22,4 @@ jobs: - uses: actions/checkout@v4 with: persist-credentials: false - - uses: actions/setup-python@v5 - with: - python-version: "3.x" - - uses: pre-commit/action@v3.0.1 + - uses: j178/prek-action@v1 diff --git a/.github/zizmor.yml b/.github/zizmor.yml index 9b42b47cc85545..fab3abcb355dfe 100644 --- a/.github/zizmor.yml +++ b/.github/zizmor.yml @@ -1,4 +1,4 @@ -# Configuration for the zizmor static analysis tool, run via pre-commit in CI +# Configuration for the zizmor static analysis tool, run via prek in CI # https://woodruffw.github.io/zizmor/configuration/ rules: dangerous-triggers: From ef6f92a2a63fd83d62d9a431b2c3133a9a069ea0 Mon Sep 17 00:00:00 2001 From: Chris Eibl <138194463+chris-eibl@users.noreply.github.com> Date: Fri, 2 Jan 2026 16:17:45 +0100 Subject: [PATCH 08/10] gh-139262: Prevent swallowing REPL input on Windows (GH-139263) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Łukasz Langa --- Lib/_pyrepl/windows_console.py | 11 +++++++- Lib/test/test_pyrepl/test_windows_console.py | 26 +++++++++++++++++++ ...-09-23-16-41-21.gh-issue-139262.RO0E98.rst | 2 ++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2025-09-23-16-41-21.gh-issue-139262.RO0E98.rst diff --git a/Lib/_pyrepl/windows_console.py b/Lib/_pyrepl/windows_console.py index a703a061e8edea..303af8a354ff00 100644 --- a/Lib/_pyrepl/windows_console.py +++ b/Lib/_pyrepl/windows_console.py @@ -554,7 +554,7 @@ def getpending(self) -> Event: e.data += ch return e - def wait(self, timeout: float | None) -> bool: + def wait_for_event(self, timeout: float | None) -> bool: """Wait for an event.""" if timeout is None: timeout = INFINITE @@ -567,6 +567,15 @@ def wait(self, timeout: float | None) -> bool: return False return True + def wait(self, timeout: float | None) -> bool: + """ + Wait for events on the console. + """ + return ( + not self.event_queue.empty() + or self.wait_for_event(timeout) + ) + def repaint(self) -> None: raise NotImplementedError("No repaint support") diff --git a/Lib/test/test_pyrepl/test_windows_console.py b/Lib/test/test_pyrepl/test_windows_console.py index 065706472e52be..3587b834f3cd07 100644 --- a/Lib/test/test_pyrepl/test_windows_console.py +++ b/Lib/test/test_pyrepl/test_windows_console.py @@ -590,6 +590,32 @@ def test_up_vt(self): Event(evt='key', data='up', raw=bytearray(b'\x1b[A'))) self.assertEqual(self.mock.call_count, 3) + # All tests above assume that there is always keyboard data to read, + # because for simplicity we just use + # self.console.wait = MagicMock(return_value=True) + def test_wait_empty(self): + console = WindowsConsole(encoding='utf-8') + console.wait_for_event = MagicMock(return_value=True) + self.assertTrue(console.event_queue.empty()) + timeout = 2.0 + self.assertTrue(console.wait(timeout)) + self.assertEqual(console.wait_for_event.call_count, 1) + self.assertEqual(console.wait_for_event.mock_calls[0], call(timeout)) + + timeout = 1.1 + console.wait_for_event = MagicMock(return_value=False) + self.assertFalse(console.wait(timeout)) + self.assertEqual(console.wait_for_event.call_count, 1) + self.assertEqual(console.wait_for_event.mock_calls[0], call(timeout)) + + def test_wait_not_empty(self): + console = WindowsConsole(encoding='utf-8') + console.wait_for_event = MagicMock(return_value=True) + console.event_queue.push(b"a") + self.assertFalse(console.event_queue.empty()) + self.assertTrue(console.wait(0.0)) + self.assertEqual(console.wait_for_event.call_count, 0) + if __name__ == "__main__": unittest.main() diff --git a/Misc/NEWS.d/next/Library/2025-09-23-16-41-21.gh-issue-139262.RO0E98.rst b/Misc/NEWS.d/next/Library/2025-09-23-16-41-21.gh-issue-139262.RO0E98.rst new file mode 100644 index 00000000000000..628fa0e0d53c3e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-09-23-16-41-21.gh-issue-139262.RO0E98.rst @@ -0,0 +1,2 @@ +Some keystrokes can be swallowed in the new ``PyREPL`` on Windows, +especially when used together with the ALT key. Fix by Chris Eibl. From 0417dabe3f560470eec63a2485b1741ba9c5e697 Mon Sep 17 00:00:00 2001 From: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com> Date: Fri, 2 Jan 2026 15:24:48 +0000 Subject: [PATCH 09/10] gh-138897: Use `_pyrepl.pager` for `_sitebuiltins._Printer` (GH-138898) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Łukasz Langa --- Lib/_sitebuiltins.py | 24 +++++-------------- ...-09-14-22-26-50.gh-issue-138897.vnUb_L.rst | 2 ++ 2 files changed, 8 insertions(+), 18 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2025-09-14-22-26-50.gh-issue-138897.vnUb_L.rst diff --git a/Lib/_sitebuiltins.py b/Lib/_sitebuiltins.py index c66269a571967f..81b36efc6c285f 100644 --- a/Lib/_sitebuiltins.py +++ b/Lib/_sitebuiltins.py @@ -36,7 +36,7 @@ def __init__(self, name, data, files=(), dirs=()): import os self.__name = name self.__data = data - self.__lines = None + self.__lines = [] self.__filenames = [os.path.join(dir, filename) for dir in dirs for filename in files] @@ -65,24 +65,12 @@ def __repr__(self): return "Type %s() to see the full %s text" % ((self.__name,)*2) def __call__(self): + from _pyrepl.pager import get_pager self.__setup() - prompt = 'Hit Return for more, or q (and Return) to quit: ' - lineno = 0 - while 1: - try: - for i in range(lineno, lineno + self.MAXLINES): - print(self.__lines[i]) - except IndexError: - break - else: - lineno += self.MAXLINES - key = None - while key is None: - key = input(prompt) - if key not in ('', 'q'): - key = None - if key == 'q': - break + + pager = get_pager() + text = "\n".join(self.__lines) + pager(text, title=self.__name) class _Helper(object): diff --git a/Misc/NEWS.d/next/Library/2025-09-14-22-26-50.gh-issue-138897.vnUb_L.rst b/Misc/NEWS.d/next/Library/2025-09-14-22-26-50.gh-issue-138897.vnUb_L.rst new file mode 100644 index 00000000000000..779c886fdd94c1 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-09-14-22-26-50.gh-issue-138897.vnUb_L.rst @@ -0,0 +1,2 @@ +Improved :data:`license`/:data:`copyright`/:data:`credits` display in the +:term:`REPL`: now uses a pager. From 98258326a9f9ea29424f556173dfc8b6129eeb8c Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Sat, 3 Jan 2026 02:18:15 +0900 Subject: [PATCH 10/10] no-issue: Fix optimizer_generator.py to print abstract_uop_name properly (gh-143366) --- Tools/cases_generator/optimizer_generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/cases_generator/optimizer_generator.py b/Tools/cases_generator/optimizer_generator.py index ab0a90e234b124..eb0c9ef36ce7d2 100644 --- a/Tools/cases_generator/optimizer_generator.py +++ b/Tools/cases_generator/optimizer_generator.py @@ -424,7 +424,7 @@ def generate_abstract_interpreter( for abstract_uop_name in abstract.uops: if abstract_uop_name not in base_uop_names: raise ValueError(f"All abstract uops should override base uops, " - "but {abstract_uop_name} is not.") + f"but {abstract_uop_name} is not.") for uop in base.uops.values(): override: Uop | None = None