diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h index a4f1f50e96d6d1..906ea0db0a5fe0 100644 --- a/Include/internal/pycore_opcode_metadata.h +++ b/Include/internal/pycore_opcode_metadata.h @@ -1081,7 +1081,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [BINARY_OP] = { true, INSTR_FMT_IBC0000, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_ADD_FLOAT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG }, [BINARY_OP_ADD_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG }, - [BINARY_OP_ADD_UNICODE] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG }, + [BINARY_OP_ADD_UNICODE] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG }, [BINARY_OP_EXTEND] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_INPLACE_ADD_UNICODE] = { true, INSTR_FMT_IXC0000, HAS_LOCAL_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_MULTIPLY_FLOAT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG }, @@ -1331,7 +1331,7 @@ _PyOpcode_macro_expansion[256] = { [BINARY_OP] = { .nuops = 1, .uops = { { _BINARY_OP, OPARG_SIMPLE, 4 } } }, [BINARY_OP_ADD_FLOAT] = { .nuops = 5, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_ADD_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_ADD_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_ADD_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 } } }, - [BINARY_OP_ADD_UNICODE] = { .nuops = 3, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_ADD_UNICODE, OPARG_SIMPLE, 5 } } }, + [BINARY_OP_ADD_UNICODE] = { .nuops = 5, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_ADD_UNICODE, OPARG_SIMPLE, 5 }, { _POP_TOP_UNICODE, OPARG_SIMPLE, 5 }, { _POP_TOP_UNICODE, OPARG_SIMPLE, 5 } } }, [BINARY_OP_EXTEND] = { .nuops = 2, .uops = { { _GUARD_BINARY_OP_EXTEND, 4, 1 }, { _BINARY_OP_EXTEND, 4, 1 } } }, [BINARY_OP_INPLACE_ADD_UNICODE] = { .nuops = 3, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_INPLACE_ADD_UNICODE, OPARG_SIMPLE, 5 } } }, [BINARY_OP_MULTIPLY_FLOAT] = { .nuops = 5, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_MULTIPLY_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 } } }, diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index 8678ccf5e1b823..f73aad9de1c0bf 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -365,738 +365,737 @@ extern "C" { #define _BINARY_OP_ADD_INT_r03 558 #define _BINARY_OP_ADD_INT_r13 559 #define _BINARY_OP_ADD_INT_r23 560 -#define _BINARY_OP_ADD_UNICODE_r01 561 -#define _BINARY_OP_ADD_UNICODE_r11 562 -#define _BINARY_OP_ADD_UNICODE_r21 563 -#define _BINARY_OP_ADD_UNICODE_r32 564 -#define _BINARY_OP_EXTEND_r21 565 -#define _BINARY_OP_INPLACE_ADD_UNICODE_r20 566 -#define _BINARY_OP_MULTIPLY_FLOAT_r03 567 -#define _BINARY_OP_MULTIPLY_FLOAT_r13 568 -#define _BINARY_OP_MULTIPLY_FLOAT_r23 569 -#define _BINARY_OP_MULTIPLY_INT_r03 570 -#define _BINARY_OP_MULTIPLY_INT_r13 571 -#define _BINARY_OP_MULTIPLY_INT_r23 572 -#define _BINARY_OP_SUBSCR_CHECK_FUNC_r23 573 -#define _BINARY_OP_SUBSCR_DICT_r21 574 -#define _BINARY_OP_SUBSCR_INIT_CALL_r01 575 -#define _BINARY_OP_SUBSCR_INIT_CALL_r11 576 -#define _BINARY_OP_SUBSCR_INIT_CALL_r21 577 -#define _BINARY_OP_SUBSCR_INIT_CALL_r31 578 -#define _BINARY_OP_SUBSCR_LIST_INT_r21 579 -#define _BINARY_OP_SUBSCR_LIST_SLICE_r21 580 -#define _BINARY_OP_SUBSCR_STR_INT_r21 581 -#define _BINARY_OP_SUBSCR_TUPLE_INT_r21 582 -#define _BINARY_OP_SUBTRACT_FLOAT_r03 583 -#define _BINARY_OP_SUBTRACT_FLOAT_r13 584 -#define _BINARY_OP_SUBTRACT_FLOAT_r23 585 -#define _BINARY_OP_SUBTRACT_INT_r03 586 -#define _BINARY_OP_SUBTRACT_INT_r13 587 -#define _BINARY_OP_SUBTRACT_INT_r23 588 -#define _BINARY_SLICE_r31 589 -#define _BUILD_INTERPOLATION_r01 590 -#define _BUILD_LIST_r01 591 -#define _BUILD_MAP_r01 592 -#define _BUILD_SET_r01 593 -#define _BUILD_SLICE_r01 594 -#define _BUILD_STRING_r01 595 -#define _BUILD_TEMPLATE_r21 596 -#define _BUILD_TUPLE_r01 597 -#define _CALL_BUILTIN_CLASS_r01 598 -#define _CALL_BUILTIN_FAST_r01 599 -#define _CALL_BUILTIN_FAST_WITH_KEYWORDS_r01 600 -#define _CALL_BUILTIN_O_r03 601 -#define _CALL_INTRINSIC_1_r11 602 -#define _CALL_INTRINSIC_2_r21 603 -#define _CALL_ISINSTANCE_r31 604 -#define _CALL_KW_NON_PY_r11 605 -#define _CALL_LEN_r33 606 -#define _CALL_LIST_APPEND_r02 607 -#define _CALL_LIST_APPEND_r12 608 -#define _CALL_LIST_APPEND_r22 609 -#define _CALL_LIST_APPEND_r32 610 -#define _CALL_METHOD_DESCRIPTOR_FAST_r01 611 -#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r01 612 -#define _CALL_METHOD_DESCRIPTOR_NOARGS_r01 613 -#define _CALL_METHOD_DESCRIPTOR_O_r01 614 -#define _CALL_NON_PY_GENERAL_r01 615 -#define _CALL_STR_1_r32 616 -#define _CALL_TUPLE_1_r32 617 -#define _CALL_TYPE_1_r31 618 -#define _CHECK_AND_ALLOCATE_OBJECT_r00 619 -#define _CHECK_ATTR_CLASS_r01 620 -#define _CHECK_ATTR_CLASS_r11 621 -#define _CHECK_ATTR_CLASS_r22 622 -#define _CHECK_ATTR_CLASS_r33 623 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r01 624 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r11 625 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r22 626 -#define _CHECK_ATTR_METHOD_LAZY_DICT_r33 627 -#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS_r00 628 -#define _CHECK_EG_MATCH_r22 629 -#define _CHECK_EXC_MATCH_r22 630 -#define _CHECK_FUNCTION_EXACT_ARGS_r00 631 -#define _CHECK_FUNCTION_VERSION_r00 632 -#define _CHECK_FUNCTION_VERSION_INLINE_r00 633 -#define _CHECK_FUNCTION_VERSION_INLINE_r11 634 -#define _CHECK_FUNCTION_VERSION_INLINE_r22 635 -#define _CHECK_FUNCTION_VERSION_INLINE_r33 636 -#define _CHECK_FUNCTION_VERSION_KW_r11 637 -#define _CHECK_IS_NOT_PY_CALLABLE_r00 638 -#define _CHECK_IS_NOT_PY_CALLABLE_KW_r11 639 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r01 640 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r11 641 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r22 642 -#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r33 643 -#define _CHECK_METHOD_VERSION_r00 644 -#define _CHECK_METHOD_VERSION_KW_r11 645 -#define _CHECK_PEP_523_r00 646 -#define _CHECK_PEP_523_r11 647 -#define _CHECK_PEP_523_r22 648 -#define _CHECK_PEP_523_r33 649 -#define _CHECK_PERIODIC_r00 650 -#define _CHECK_PERIODIC_AT_END_r00 651 -#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM_r00 652 -#define _CHECK_RECURSION_REMAINING_r00 653 -#define _CHECK_RECURSION_REMAINING_r11 654 -#define _CHECK_RECURSION_REMAINING_r22 655 -#define _CHECK_RECURSION_REMAINING_r33 656 -#define _CHECK_STACK_SPACE_r00 657 -#define _CHECK_STACK_SPACE_OPERAND_r00 658 -#define _CHECK_STACK_SPACE_OPERAND_r11 659 -#define _CHECK_STACK_SPACE_OPERAND_r22 660 -#define _CHECK_STACK_SPACE_OPERAND_r33 661 -#define _CHECK_VALIDITY_r00 662 -#define _CHECK_VALIDITY_r11 663 -#define _CHECK_VALIDITY_r22 664 -#define _CHECK_VALIDITY_r33 665 -#define _COLD_DYNAMIC_EXIT_r00 666 -#define _COLD_EXIT_r00 667 -#define _COMPARE_OP_r21 668 -#define _COMPARE_OP_FLOAT_r01 669 -#define _COMPARE_OP_FLOAT_r11 670 -#define _COMPARE_OP_FLOAT_r21 671 -#define _COMPARE_OP_FLOAT_r32 672 -#define _COMPARE_OP_INT_r23 673 -#define _COMPARE_OP_STR_r21 674 -#define _CONTAINS_OP_r21 675 -#define _CONTAINS_OP_DICT_r21 676 -#define _CONTAINS_OP_SET_r21 677 -#define _CONVERT_VALUE_r11 678 -#define _COPY_r01 679 -#define _COPY_1_r02 680 -#define _COPY_1_r12 681 -#define _COPY_1_r23 682 -#define _COPY_2_r03 683 -#define _COPY_2_r13 684 -#define _COPY_2_r23 685 -#define _COPY_3_r03 686 -#define _COPY_3_r13 687 -#define _COPY_3_r23 688 -#define _COPY_3_r33 689 -#define _COPY_FREE_VARS_r00 690 -#define _COPY_FREE_VARS_r11 691 -#define _COPY_FREE_VARS_r22 692 -#define _COPY_FREE_VARS_r33 693 -#define _CREATE_INIT_FRAME_r01 694 -#define _DELETE_ATTR_r10 695 -#define _DELETE_DEREF_r00 696 -#define _DELETE_FAST_r00 697 -#define _DELETE_GLOBAL_r00 698 -#define _DELETE_NAME_r00 699 -#define _DELETE_SUBSCR_r20 700 -#define _DEOPT_r00 701 -#define _DEOPT_r10 702 -#define _DEOPT_r20 703 -#define _DEOPT_r30 704 -#define _DICT_MERGE_r10 705 -#define _DICT_UPDATE_r10 706 -#define _DO_CALL_r01 707 -#define _DO_CALL_FUNCTION_EX_r31 708 -#define _DO_CALL_KW_r11 709 -#define _DYNAMIC_EXIT_r00 710 -#define _DYNAMIC_EXIT_r10 711 -#define _DYNAMIC_EXIT_r20 712 -#define _DYNAMIC_EXIT_r30 713 -#define _END_FOR_r10 714 -#define _END_SEND_r21 715 -#define _ERROR_POP_N_r00 716 -#define _EXIT_INIT_CHECK_r10 717 -#define _EXIT_TRACE_r00 718 -#define _EXIT_TRACE_r10 719 -#define _EXIT_TRACE_r20 720 -#define _EXIT_TRACE_r30 721 -#define _EXPAND_METHOD_r00 722 -#define _EXPAND_METHOD_KW_r11 723 -#define _FATAL_ERROR_r00 724 -#define _FATAL_ERROR_r11 725 -#define _FATAL_ERROR_r22 726 -#define _FATAL_ERROR_r33 727 -#define _FORMAT_SIMPLE_r11 728 -#define _FORMAT_WITH_SPEC_r21 729 -#define _FOR_ITER_r23 730 -#define _FOR_ITER_GEN_FRAME_r23 731 -#define _FOR_ITER_TIER_TWO_r23 732 -#define _GET_AITER_r11 733 -#define _GET_ANEXT_r12 734 -#define _GET_AWAITABLE_r11 735 -#define _GET_ITER_r12 736 -#define _GET_LEN_r12 737 -#define _GET_YIELD_FROM_ITER_r11 738 -#define _GUARD_BINARY_OP_EXTEND_r22 739 -#define _GUARD_CALLABLE_ISINSTANCE_r03 740 -#define _GUARD_CALLABLE_ISINSTANCE_r13 741 -#define _GUARD_CALLABLE_ISINSTANCE_r23 742 -#define _GUARD_CALLABLE_ISINSTANCE_r33 743 -#define _GUARD_CALLABLE_LEN_r03 744 -#define _GUARD_CALLABLE_LEN_r13 745 -#define _GUARD_CALLABLE_LEN_r23 746 -#define _GUARD_CALLABLE_LEN_r33 747 -#define _GUARD_CALLABLE_LIST_APPEND_r03 748 -#define _GUARD_CALLABLE_LIST_APPEND_r13 749 -#define _GUARD_CALLABLE_LIST_APPEND_r23 750 -#define _GUARD_CALLABLE_LIST_APPEND_r33 751 -#define _GUARD_CALLABLE_STR_1_r03 752 -#define _GUARD_CALLABLE_STR_1_r13 753 -#define _GUARD_CALLABLE_STR_1_r23 754 -#define _GUARD_CALLABLE_STR_1_r33 755 -#define _GUARD_CALLABLE_TUPLE_1_r03 756 -#define _GUARD_CALLABLE_TUPLE_1_r13 757 -#define _GUARD_CALLABLE_TUPLE_1_r23 758 -#define _GUARD_CALLABLE_TUPLE_1_r33 759 -#define _GUARD_CALLABLE_TYPE_1_r03 760 -#define _GUARD_CALLABLE_TYPE_1_r13 761 -#define _GUARD_CALLABLE_TYPE_1_r23 762 -#define _GUARD_CALLABLE_TYPE_1_r33 763 -#define _GUARD_DORV_NO_DICT_r01 764 -#define _GUARD_DORV_NO_DICT_r11 765 -#define _GUARD_DORV_NO_DICT_r22 766 -#define _GUARD_DORV_NO_DICT_r33 767 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 768 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 769 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 770 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 771 -#define _GUARD_GLOBALS_VERSION_r00 772 -#define _GUARD_GLOBALS_VERSION_r11 773 -#define _GUARD_GLOBALS_VERSION_r22 774 -#define _GUARD_GLOBALS_VERSION_r33 775 -#define _GUARD_IP_RETURN_GENERATOR_r00 776 -#define _GUARD_IP_RETURN_GENERATOR_r11 777 -#define _GUARD_IP_RETURN_GENERATOR_r22 778 -#define _GUARD_IP_RETURN_GENERATOR_r33 779 -#define _GUARD_IP_RETURN_VALUE_r00 780 -#define _GUARD_IP_RETURN_VALUE_r11 781 -#define _GUARD_IP_RETURN_VALUE_r22 782 -#define _GUARD_IP_RETURN_VALUE_r33 783 -#define _GUARD_IP_YIELD_VALUE_r00 784 -#define _GUARD_IP_YIELD_VALUE_r11 785 -#define _GUARD_IP_YIELD_VALUE_r22 786 -#define _GUARD_IP_YIELD_VALUE_r33 787 -#define _GUARD_IP__PUSH_FRAME_r00 788 -#define _GUARD_IP__PUSH_FRAME_r11 789 -#define _GUARD_IP__PUSH_FRAME_r22 790 -#define _GUARD_IP__PUSH_FRAME_r33 791 -#define _GUARD_IS_FALSE_POP_r00 792 -#define _GUARD_IS_FALSE_POP_r10 793 -#define _GUARD_IS_FALSE_POP_r21 794 -#define _GUARD_IS_FALSE_POP_r32 795 -#define _GUARD_IS_NONE_POP_r00 796 -#define _GUARD_IS_NONE_POP_r10 797 -#define _GUARD_IS_NONE_POP_r21 798 -#define _GUARD_IS_NONE_POP_r32 799 -#define _GUARD_IS_NOT_NONE_POP_r10 800 -#define _GUARD_IS_TRUE_POP_r00 801 -#define _GUARD_IS_TRUE_POP_r10 802 -#define _GUARD_IS_TRUE_POP_r21 803 -#define _GUARD_IS_TRUE_POP_r32 804 -#define _GUARD_KEYS_VERSION_r01 805 -#define _GUARD_KEYS_VERSION_r11 806 -#define _GUARD_KEYS_VERSION_r22 807 -#define _GUARD_KEYS_VERSION_r33 808 -#define _GUARD_NOS_DICT_r02 809 -#define _GUARD_NOS_DICT_r12 810 -#define _GUARD_NOS_DICT_r22 811 -#define _GUARD_NOS_DICT_r33 812 -#define _GUARD_NOS_FLOAT_r02 813 -#define _GUARD_NOS_FLOAT_r12 814 -#define _GUARD_NOS_FLOAT_r22 815 -#define _GUARD_NOS_FLOAT_r33 816 -#define _GUARD_NOS_INT_r02 817 -#define _GUARD_NOS_INT_r12 818 -#define _GUARD_NOS_INT_r22 819 -#define _GUARD_NOS_INT_r33 820 -#define _GUARD_NOS_LIST_r02 821 -#define _GUARD_NOS_LIST_r12 822 -#define _GUARD_NOS_LIST_r22 823 -#define _GUARD_NOS_LIST_r33 824 -#define _GUARD_NOS_NOT_NULL_r02 825 -#define _GUARD_NOS_NOT_NULL_r12 826 -#define _GUARD_NOS_NOT_NULL_r22 827 -#define _GUARD_NOS_NOT_NULL_r33 828 -#define _GUARD_NOS_NULL_r02 829 -#define _GUARD_NOS_NULL_r12 830 -#define _GUARD_NOS_NULL_r22 831 -#define _GUARD_NOS_NULL_r33 832 -#define _GUARD_NOS_OVERFLOWED_r02 833 -#define _GUARD_NOS_OVERFLOWED_r12 834 -#define _GUARD_NOS_OVERFLOWED_r22 835 -#define _GUARD_NOS_OVERFLOWED_r33 836 -#define _GUARD_NOS_TUPLE_r02 837 -#define _GUARD_NOS_TUPLE_r12 838 -#define _GUARD_NOS_TUPLE_r22 839 -#define _GUARD_NOS_TUPLE_r33 840 -#define _GUARD_NOS_UNICODE_r02 841 -#define _GUARD_NOS_UNICODE_r12 842 -#define _GUARD_NOS_UNICODE_r22 843 -#define _GUARD_NOS_UNICODE_r33 844 -#define _GUARD_NOT_EXHAUSTED_LIST_r02 845 -#define _GUARD_NOT_EXHAUSTED_LIST_r12 846 -#define _GUARD_NOT_EXHAUSTED_LIST_r22 847 -#define _GUARD_NOT_EXHAUSTED_LIST_r33 848 -#define _GUARD_NOT_EXHAUSTED_RANGE_r02 849 -#define _GUARD_NOT_EXHAUSTED_RANGE_r12 850 -#define _GUARD_NOT_EXHAUSTED_RANGE_r22 851 -#define _GUARD_NOT_EXHAUSTED_RANGE_r33 852 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 853 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 854 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 855 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 856 -#define _GUARD_THIRD_NULL_r03 857 -#define _GUARD_THIRD_NULL_r13 858 -#define _GUARD_THIRD_NULL_r23 859 -#define _GUARD_THIRD_NULL_r33 860 -#define _GUARD_TOS_ANY_SET_r01 861 -#define _GUARD_TOS_ANY_SET_r11 862 -#define _GUARD_TOS_ANY_SET_r22 863 -#define _GUARD_TOS_ANY_SET_r33 864 -#define _GUARD_TOS_DICT_r01 865 -#define _GUARD_TOS_DICT_r11 866 -#define _GUARD_TOS_DICT_r22 867 -#define _GUARD_TOS_DICT_r33 868 -#define _GUARD_TOS_FLOAT_r01 869 -#define _GUARD_TOS_FLOAT_r11 870 -#define _GUARD_TOS_FLOAT_r22 871 -#define _GUARD_TOS_FLOAT_r33 872 -#define _GUARD_TOS_INT_r01 873 -#define _GUARD_TOS_INT_r11 874 -#define _GUARD_TOS_INT_r22 875 -#define _GUARD_TOS_INT_r33 876 -#define _GUARD_TOS_LIST_r01 877 -#define _GUARD_TOS_LIST_r11 878 -#define _GUARD_TOS_LIST_r22 879 -#define _GUARD_TOS_LIST_r33 880 -#define _GUARD_TOS_OVERFLOWED_r01 881 -#define _GUARD_TOS_OVERFLOWED_r11 882 -#define _GUARD_TOS_OVERFLOWED_r22 883 -#define _GUARD_TOS_OVERFLOWED_r33 884 -#define _GUARD_TOS_SLICE_r01 885 -#define _GUARD_TOS_SLICE_r11 886 -#define _GUARD_TOS_SLICE_r22 887 -#define _GUARD_TOS_SLICE_r33 888 -#define _GUARD_TOS_TUPLE_r01 889 -#define _GUARD_TOS_TUPLE_r11 890 -#define _GUARD_TOS_TUPLE_r22 891 -#define _GUARD_TOS_TUPLE_r33 892 -#define _GUARD_TOS_UNICODE_r01 893 -#define _GUARD_TOS_UNICODE_r11 894 -#define _GUARD_TOS_UNICODE_r22 895 -#define _GUARD_TOS_UNICODE_r33 896 -#define _GUARD_TYPE_VERSION_r01 897 -#define _GUARD_TYPE_VERSION_r11 898 -#define _GUARD_TYPE_VERSION_r22 899 -#define _GUARD_TYPE_VERSION_r33 900 -#define _GUARD_TYPE_VERSION_AND_LOCK_r01 901 -#define _GUARD_TYPE_VERSION_AND_LOCK_r11 902 -#define _GUARD_TYPE_VERSION_AND_LOCK_r22 903 -#define _GUARD_TYPE_VERSION_AND_LOCK_r33 904 -#define _HANDLE_PENDING_AND_DEOPT_r00 905 -#define _HANDLE_PENDING_AND_DEOPT_r10 906 -#define _HANDLE_PENDING_AND_DEOPT_r20 907 -#define _HANDLE_PENDING_AND_DEOPT_r30 908 -#define _IMPORT_FROM_r12 909 -#define _IMPORT_NAME_r21 910 -#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 911 -#define _INIT_CALL_PY_EXACT_ARGS_r01 912 -#define _INIT_CALL_PY_EXACT_ARGS_0_r01 913 -#define _INIT_CALL_PY_EXACT_ARGS_1_r01 914 -#define _INIT_CALL_PY_EXACT_ARGS_2_r01 915 -#define _INIT_CALL_PY_EXACT_ARGS_3_r01 916 -#define _INIT_CALL_PY_EXACT_ARGS_4_r01 917 -#define _INSERT_NULL_r10 918 -#define _INSTRUMENTED_FOR_ITER_r23 919 -#define _INSTRUMENTED_INSTRUCTION_r00 920 -#define _INSTRUMENTED_JUMP_FORWARD_r00 921 -#define _INSTRUMENTED_JUMP_FORWARD_r11 922 -#define _INSTRUMENTED_JUMP_FORWARD_r22 923 -#define _INSTRUMENTED_JUMP_FORWARD_r33 924 -#define _INSTRUMENTED_LINE_r00 925 -#define _INSTRUMENTED_NOT_TAKEN_r00 926 -#define _INSTRUMENTED_NOT_TAKEN_r11 927 -#define _INSTRUMENTED_NOT_TAKEN_r22 928 -#define _INSTRUMENTED_NOT_TAKEN_r33 929 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 930 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 931 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 932 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 933 -#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 934 -#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 935 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 936 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 937 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 938 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 939 -#define _IS_NONE_r11 940 -#define _IS_OP_r21 941 -#define _ITER_CHECK_LIST_r02 942 -#define _ITER_CHECK_LIST_r12 943 -#define _ITER_CHECK_LIST_r22 944 -#define _ITER_CHECK_LIST_r33 945 -#define _ITER_CHECK_RANGE_r02 946 -#define _ITER_CHECK_RANGE_r12 947 -#define _ITER_CHECK_RANGE_r22 948 -#define _ITER_CHECK_RANGE_r33 949 -#define _ITER_CHECK_TUPLE_r02 950 -#define _ITER_CHECK_TUPLE_r12 951 -#define _ITER_CHECK_TUPLE_r22 952 -#define _ITER_CHECK_TUPLE_r33 953 -#define _ITER_JUMP_LIST_r02 954 -#define _ITER_JUMP_LIST_r12 955 -#define _ITER_JUMP_LIST_r22 956 -#define _ITER_JUMP_LIST_r33 957 -#define _ITER_JUMP_RANGE_r02 958 -#define _ITER_JUMP_RANGE_r12 959 -#define _ITER_JUMP_RANGE_r22 960 -#define _ITER_JUMP_RANGE_r33 961 -#define _ITER_JUMP_TUPLE_r02 962 -#define _ITER_JUMP_TUPLE_r12 963 -#define _ITER_JUMP_TUPLE_r22 964 -#define _ITER_JUMP_TUPLE_r33 965 -#define _ITER_NEXT_LIST_r23 966 -#define _ITER_NEXT_LIST_TIER_TWO_r23 967 -#define _ITER_NEXT_RANGE_r03 968 -#define _ITER_NEXT_RANGE_r13 969 -#define _ITER_NEXT_RANGE_r23 970 -#define _ITER_NEXT_TUPLE_r03 971 -#define _ITER_NEXT_TUPLE_r13 972 -#define _ITER_NEXT_TUPLE_r23 973 -#define _JUMP_BACKWARD_NO_INTERRUPT_r00 974 -#define _JUMP_BACKWARD_NO_INTERRUPT_r11 975 -#define _JUMP_BACKWARD_NO_INTERRUPT_r22 976 -#define _JUMP_BACKWARD_NO_INTERRUPT_r33 977 -#define _JUMP_TO_TOP_r00 978 -#define _LIST_APPEND_r10 979 -#define _LIST_EXTEND_r10 980 -#define _LOAD_ATTR_r10 981 -#define _LOAD_ATTR_CLASS_r11 982 -#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_r11 983 -#define _LOAD_ATTR_INSTANCE_VALUE_r02 984 -#define _LOAD_ATTR_INSTANCE_VALUE_r12 985 -#define _LOAD_ATTR_INSTANCE_VALUE_r23 986 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 987 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 988 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 989 -#define _LOAD_ATTR_METHOD_NO_DICT_r02 990 -#define _LOAD_ATTR_METHOD_NO_DICT_r12 991 -#define _LOAD_ATTR_METHOD_NO_DICT_r23 992 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 993 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 994 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 995 -#define _LOAD_ATTR_MODULE_r11 996 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 997 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 998 -#define _LOAD_ATTR_PROPERTY_FRAME_r11 999 -#define _LOAD_ATTR_SLOT_r11 1000 -#define _LOAD_ATTR_WITH_HINT_r11 1001 -#define _LOAD_BUILD_CLASS_r01 1002 -#define _LOAD_BYTECODE_r00 1003 -#define _LOAD_COMMON_CONSTANT_r01 1004 -#define _LOAD_COMMON_CONSTANT_r12 1005 -#define _LOAD_COMMON_CONSTANT_r23 1006 -#define _LOAD_CONST_r01 1007 -#define _LOAD_CONST_r12 1008 -#define _LOAD_CONST_r23 1009 -#define _LOAD_CONST_INLINE_r01 1010 -#define _LOAD_CONST_INLINE_r12 1011 -#define _LOAD_CONST_INLINE_r23 1012 -#define _LOAD_CONST_INLINE_BORROW_r01 1013 -#define _LOAD_CONST_INLINE_BORROW_r12 1014 -#define _LOAD_CONST_INLINE_BORROW_r23 1015 -#define _LOAD_CONST_UNDER_INLINE_r02 1016 -#define _LOAD_CONST_UNDER_INLINE_r12 1017 -#define _LOAD_CONST_UNDER_INLINE_r23 1018 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r02 1019 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r12 1020 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r23 1021 -#define _LOAD_DEREF_r01 1022 -#define _LOAD_FAST_r01 1023 -#define _LOAD_FAST_r12 1024 -#define _LOAD_FAST_r23 1025 -#define _LOAD_FAST_0_r01 1026 -#define _LOAD_FAST_0_r12 1027 -#define _LOAD_FAST_0_r23 1028 -#define _LOAD_FAST_1_r01 1029 -#define _LOAD_FAST_1_r12 1030 -#define _LOAD_FAST_1_r23 1031 -#define _LOAD_FAST_2_r01 1032 -#define _LOAD_FAST_2_r12 1033 -#define _LOAD_FAST_2_r23 1034 -#define _LOAD_FAST_3_r01 1035 -#define _LOAD_FAST_3_r12 1036 -#define _LOAD_FAST_3_r23 1037 -#define _LOAD_FAST_4_r01 1038 -#define _LOAD_FAST_4_r12 1039 -#define _LOAD_FAST_4_r23 1040 -#define _LOAD_FAST_5_r01 1041 -#define _LOAD_FAST_5_r12 1042 -#define _LOAD_FAST_5_r23 1043 -#define _LOAD_FAST_6_r01 1044 -#define _LOAD_FAST_6_r12 1045 -#define _LOAD_FAST_6_r23 1046 -#define _LOAD_FAST_7_r01 1047 -#define _LOAD_FAST_7_r12 1048 -#define _LOAD_FAST_7_r23 1049 -#define _LOAD_FAST_AND_CLEAR_r01 1050 -#define _LOAD_FAST_AND_CLEAR_r12 1051 -#define _LOAD_FAST_AND_CLEAR_r23 1052 -#define _LOAD_FAST_BORROW_r01 1053 -#define _LOAD_FAST_BORROW_r12 1054 -#define _LOAD_FAST_BORROW_r23 1055 -#define _LOAD_FAST_BORROW_0_r01 1056 -#define _LOAD_FAST_BORROW_0_r12 1057 -#define _LOAD_FAST_BORROW_0_r23 1058 -#define _LOAD_FAST_BORROW_1_r01 1059 -#define _LOAD_FAST_BORROW_1_r12 1060 -#define _LOAD_FAST_BORROW_1_r23 1061 -#define _LOAD_FAST_BORROW_2_r01 1062 -#define _LOAD_FAST_BORROW_2_r12 1063 -#define _LOAD_FAST_BORROW_2_r23 1064 -#define _LOAD_FAST_BORROW_3_r01 1065 -#define _LOAD_FAST_BORROW_3_r12 1066 -#define _LOAD_FAST_BORROW_3_r23 1067 -#define _LOAD_FAST_BORROW_4_r01 1068 -#define _LOAD_FAST_BORROW_4_r12 1069 -#define _LOAD_FAST_BORROW_4_r23 1070 -#define _LOAD_FAST_BORROW_5_r01 1071 -#define _LOAD_FAST_BORROW_5_r12 1072 -#define _LOAD_FAST_BORROW_5_r23 1073 -#define _LOAD_FAST_BORROW_6_r01 1074 -#define _LOAD_FAST_BORROW_6_r12 1075 -#define _LOAD_FAST_BORROW_6_r23 1076 -#define _LOAD_FAST_BORROW_7_r01 1077 -#define _LOAD_FAST_BORROW_7_r12 1078 -#define _LOAD_FAST_BORROW_7_r23 1079 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1080 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1081 -#define _LOAD_FAST_CHECK_r01 1082 -#define _LOAD_FAST_CHECK_r12 1083 -#define _LOAD_FAST_CHECK_r23 1084 -#define _LOAD_FAST_LOAD_FAST_r02 1085 -#define _LOAD_FAST_LOAD_FAST_r13 1086 -#define _LOAD_FROM_DICT_OR_DEREF_r11 1087 -#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1088 -#define _LOAD_GLOBAL_r00 1089 -#define _LOAD_GLOBAL_BUILTINS_r01 1090 -#define _LOAD_GLOBAL_MODULE_r01 1091 -#define _LOAD_LOCALS_r01 1092 -#define _LOAD_LOCALS_r12 1093 -#define _LOAD_LOCALS_r23 1094 -#define _LOAD_NAME_r01 1095 -#define _LOAD_SMALL_INT_r01 1096 -#define _LOAD_SMALL_INT_r12 1097 -#define _LOAD_SMALL_INT_r23 1098 -#define _LOAD_SMALL_INT_0_r01 1099 -#define _LOAD_SMALL_INT_0_r12 1100 -#define _LOAD_SMALL_INT_0_r23 1101 -#define _LOAD_SMALL_INT_1_r01 1102 -#define _LOAD_SMALL_INT_1_r12 1103 -#define _LOAD_SMALL_INT_1_r23 1104 -#define _LOAD_SMALL_INT_2_r01 1105 -#define _LOAD_SMALL_INT_2_r12 1106 -#define _LOAD_SMALL_INT_2_r23 1107 -#define _LOAD_SMALL_INT_3_r01 1108 -#define _LOAD_SMALL_INT_3_r12 1109 -#define _LOAD_SMALL_INT_3_r23 1110 -#define _LOAD_SPECIAL_r00 1111 -#define _LOAD_SUPER_ATTR_ATTR_r31 1112 -#define _LOAD_SUPER_ATTR_METHOD_r32 1113 -#define _MAKE_CALLARGS_A_TUPLE_r33 1114 -#define _MAKE_CELL_r00 1115 -#define _MAKE_FUNCTION_r11 1116 -#define _MAKE_WARM_r00 1117 -#define _MAKE_WARM_r11 1118 -#define _MAKE_WARM_r22 1119 -#define _MAKE_WARM_r33 1120 -#define _MAP_ADD_r20 1121 -#define _MATCH_CLASS_r31 1122 -#define _MATCH_KEYS_r23 1123 -#define _MATCH_MAPPING_r02 1124 -#define _MATCH_MAPPING_r12 1125 -#define _MATCH_MAPPING_r23 1126 -#define _MATCH_SEQUENCE_r02 1127 -#define _MATCH_SEQUENCE_r12 1128 -#define _MATCH_SEQUENCE_r23 1129 -#define _MAYBE_EXPAND_METHOD_r00 1130 -#define _MAYBE_EXPAND_METHOD_KW_r11 1131 -#define _MONITOR_CALL_r00 1132 -#define _MONITOR_CALL_KW_r11 1133 -#define _MONITOR_JUMP_BACKWARD_r00 1134 -#define _MONITOR_JUMP_BACKWARD_r11 1135 -#define _MONITOR_JUMP_BACKWARD_r22 1136 -#define _MONITOR_JUMP_BACKWARD_r33 1137 -#define _MONITOR_RESUME_r00 1138 -#define _NOP_r00 1139 -#define _NOP_r11 1140 -#define _NOP_r22 1141 -#define _NOP_r33 1142 -#define _POP_CALL_r20 1143 -#define _POP_CALL_LOAD_CONST_INLINE_BORROW_r21 1144 -#define _POP_CALL_ONE_r30 1145 -#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW_r31 1146 -#define _POP_CALL_TWO_r30 1147 -#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW_r31 1148 -#define _POP_EXCEPT_r10 1149 -#define _POP_ITER_r20 1150 -#define _POP_JUMP_IF_FALSE_r00 1151 -#define _POP_JUMP_IF_FALSE_r10 1152 -#define _POP_JUMP_IF_FALSE_r21 1153 -#define _POP_JUMP_IF_FALSE_r32 1154 -#define _POP_JUMP_IF_TRUE_r00 1155 -#define _POP_JUMP_IF_TRUE_r10 1156 -#define _POP_JUMP_IF_TRUE_r21 1157 -#define _POP_JUMP_IF_TRUE_r32 1158 -#define _POP_TOP_r10 1159 -#define _POP_TOP_FLOAT_r00 1160 -#define _POP_TOP_FLOAT_r10 1161 -#define _POP_TOP_FLOAT_r21 1162 -#define _POP_TOP_FLOAT_r32 1163 -#define _POP_TOP_INT_r00 1164 -#define _POP_TOP_INT_r10 1165 -#define _POP_TOP_INT_r21 1166 -#define _POP_TOP_INT_r32 1167 -#define _POP_TOP_LOAD_CONST_INLINE_r11 1168 -#define _POP_TOP_LOAD_CONST_INLINE_BORROW_r11 1169 -#define _POP_TOP_NOP_r00 1170 -#define _POP_TOP_NOP_r10 1171 -#define _POP_TOP_NOP_r21 1172 -#define _POP_TOP_NOP_r32 1173 -#define _POP_TOP_UNICODE_r00 1174 -#define _POP_TOP_UNICODE_r10 1175 -#define _POP_TOP_UNICODE_r21 1176 -#define _POP_TOP_UNICODE_r32 1177 -#define _POP_TWO_r20 1178 -#define _POP_TWO_LOAD_CONST_INLINE_BORROW_r21 1179 -#define _PUSH_EXC_INFO_r02 1180 -#define _PUSH_EXC_INFO_r12 1181 -#define _PUSH_EXC_INFO_r23 1182 -#define _PUSH_FRAME_r10 1183 -#define _PUSH_NULL_r01 1184 -#define _PUSH_NULL_r12 1185 -#define _PUSH_NULL_r23 1186 -#define _PUSH_NULL_CONDITIONAL_r00 1187 -#define _PY_FRAME_GENERAL_r01 1188 -#define _PY_FRAME_KW_r11 1189 -#define _QUICKEN_RESUME_r00 1190 -#define _QUICKEN_RESUME_r11 1191 -#define _QUICKEN_RESUME_r22 1192 -#define _QUICKEN_RESUME_r33 1193 -#define _REPLACE_WITH_TRUE_r11 1194 -#define _RESUME_CHECK_r00 1195 -#define _RESUME_CHECK_r11 1196 -#define _RESUME_CHECK_r22 1197 -#define _RESUME_CHECK_r33 1198 -#define _RETURN_GENERATOR_r01 1199 -#define _RETURN_VALUE_r11 1200 -#define _SAVE_RETURN_OFFSET_r00 1201 -#define _SAVE_RETURN_OFFSET_r11 1202 -#define _SAVE_RETURN_OFFSET_r22 1203 -#define _SAVE_RETURN_OFFSET_r33 1204 -#define _SEND_r22 1205 -#define _SEND_GEN_FRAME_r22 1206 -#define _SETUP_ANNOTATIONS_r00 1207 -#define _SET_ADD_r10 1208 -#define _SET_FUNCTION_ATTRIBUTE_r01 1209 -#define _SET_FUNCTION_ATTRIBUTE_r11 1210 -#define _SET_FUNCTION_ATTRIBUTE_r21 1211 -#define _SET_FUNCTION_ATTRIBUTE_r32 1212 -#define _SET_IP_r00 1213 -#define _SET_IP_r11 1214 -#define _SET_IP_r22 1215 -#define _SET_IP_r33 1216 -#define _SET_UPDATE_r10 1217 -#define _SPILL_OR_RELOAD_r01 1218 -#define _SPILL_OR_RELOAD_r02 1219 -#define _SPILL_OR_RELOAD_r03 1220 -#define _SPILL_OR_RELOAD_r10 1221 -#define _SPILL_OR_RELOAD_r12 1222 -#define _SPILL_OR_RELOAD_r13 1223 -#define _SPILL_OR_RELOAD_r20 1224 -#define _SPILL_OR_RELOAD_r21 1225 -#define _SPILL_OR_RELOAD_r23 1226 -#define _SPILL_OR_RELOAD_r30 1227 -#define _SPILL_OR_RELOAD_r31 1228 -#define _SPILL_OR_RELOAD_r32 1229 -#define _START_EXECUTOR_r00 1230 -#define _STORE_ATTR_r20 1231 -#define _STORE_ATTR_INSTANCE_VALUE_r21 1232 -#define _STORE_ATTR_SLOT_r21 1233 -#define _STORE_ATTR_WITH_HINT_r21 1234 -#define _STORE_DEREF_r10 1235 -#define _STORE_FAST_r10 1236 -#define _STORE_FAST_0_r10 1237 -#define _STORE_FAST_1_r10 1238 -#define _STORE_FAST_2_r10 1239 -#define _STORE_FAST_3_r10 1240 -#define _STORE_FAST_4_r10 1241 -#define _STORE_FAST_5_r10 1242 -#define _STORE_FAST_6_r10 1243 -#define _STORE_FAST_7_r10 1244 -#define _STORE_FAST_LOAD_FAST_r11 1245 -#define _STORE_FAST_STORE_FAST_r20 1246 -#define _STORE_GLOBAL_r10 1247 -#define _STORE_NAME_r10 1248 -#define _STORE_SLICE_r30 1249 -#define _STORE_SUBSCR_r30 1250 -#define _STORE_SUBSCR_DICT_r31 1251 -#define _STORE_SUBSCR_LIST_INT_r32 1252 -#define _SWAP_r11 1253 -#define _SWAP_2_r02 1254 -#define _SWAP_2_r12 1255 -#define _SWAP_2_r22 1256 -#define _SWAP_2_r33 1257 -#define _SWAP_3_r03 1258 -#define _SWAP_3_r13 1259 -#define _SWAP_3_r23 1260 -#define _SWAP_3_r33 1261 -#define _TIER2_RESUME_CHECK_r00 1262 -#define _TIER2_RESUME_CHECK_r11 1263 -#define _TIER2_RESUME_CHECK_r22 1264 -#define _TIER2_RESUME_CHECK_r33 1265 -#define _TO_BOOL_r11 1266 -#define _TO_BOOL_BOOL_r01 1267 -#define _TO_BOOL_BOOL_r11 1268 -#define _TO_BOOL_BOOL_r22 1269 -#define _TO_BOOL_BOOL_r33 1270 -#define _TO_BOOL_INT_r11 1271 -#define _TO_BOOL_LIST_r11 1272 -#define _TO_BOOL_NONE_r01 1273 -#define _TO_BOOL_NONE_r11 1274 -#define _TO_BOOL_NONE_r22 1275 -#define _TO_BOOL_NONE_r33 1276 -#define _TO_BOOL_STR_r11 1277 -#define _TRACE_RECORD_r00 1278 -#define _UNARY_INVERT_r11 1279 -#define _UNARY_NEGATIVE_r11 1280 -#define _UNARY_NOT_r01 1281 -#define _UNARY_NOT_r11 1282 -#define _UNARY_NOT_r22 1283 -#define _UNARY_NOT_r33 1284 -#define _UNPACK_EX_r10 1285 -#define _UNPACK_SEQUENCE_r10 1286 -#define _UNPACK_SEQUENCE_LIST_r10 1287 -#define _UNPACK_SEQUENCE_TUPLE_r10 1288 -#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1289 -#define _WITH_EXCEPT_START_r33 1290 -#define _YIELD_VALUE_r11 1291 -#define MAX_UOP_REGS_ID 1291 +#define _BINARY_OP_ADD_UNICODE_r03 561 +#define _BINARY_OP_ADD_UNICODE_r13 562 +#define _BINARY_OP_ADD_UNICODE_r23 563 +#define _BINARY_OP_EXTEND_r21 564 +#define _BINARY_OP_INPLACE_ADD_UNICODE_r20 565 +#define _BINARY_OP_MULTIPLY_FLOAT_r03 566 +#define _BINARY_OP_MULTIPLY_FLOAT_r13 567 +#define _BINARY_OP_MULTIPLY_FLOAT_r23 568 +#define _BINARY_OP_MULTIPLY_INT_r03 569 +#define _BINARY_OP_MULTIPLY_INT_r13 570 +#define _BINARY_OP_MULTIPLY_INT_r23 571 +#define _BINARY_OP_SUBSCR_CHECK_FUNC_r23 572 +#define _BINARY_OP_SUBSCR_DICT_r21 573 +#define _BINARY_OP_SUBSCR_INIT_CALL_r01 574 +#define _BINARY_OP_SUBSCR_INIT_CALL_r11 575 +#define _BINARY_OP_SUBSCR_INIT_CALL_r21 576 +#define _BINARY_OP_SUBSCR_INIT_CALL_r31 577 +#define _BINARY_OP_SUBSCR_LIST_INT_r21 578 +#define _BINARY_OP_SUBSCR_LIST_SLICE_r21 579 +#define _BINARY_OP_SUBSCR_STR_INT_r21 580 +#define _BINARY_OP_SUBSCR_TUPLE_INT_r21 581 +#define _BINARY_OP_SUBTRACT_FLOAT_r03 582 +#define _BINARY_OP_SUBTRACT_FLOAT_r13 583 +#define _BINARY_OP_SUBTRACT_FLOAT_r23 584 +#define _BINARY_OP_SUBTRACT_INT_r03 585 +#define _BINARY_OP_SUBTRACT_INT_r13 586 +#define _BINARY_OP_SUBTRACT_INT_r23 587 +#define _BINARY_SLICE_r31 588 +#define _BUILD_INTERPOLATION_r01 589 +#define _BUILD_LIST_r01 590 +#define _BUILD_MAP_r01 591 +#define _BUILD_SET_r01 592 +#define _BUILD_SLICE_r01 593 +#define _BUILD_STRING_r01 594 +#define _BUILD_TEMPLATE_r21 595 +#define _BUILD_TUPLE_r01 596 +#define _CALL_BUILTIN_CLASS_r01 597 +#define _CALL_BUILTIN_FAST_r01 598 +#define _CALL_BUILTIN_FAST_WITH_KEYWORDS_r01 599 +#define _CALL_BUILTIN_O_r03 600 +#define _CALL_INTRINSIC_1_r11 601 +#define _CALL_INTRINSIC_2_r21 602 +#define _CALL_ISINSTANCE_r31 603 +#define _CALL_KW_NON_PY_r11 604 +#define _CALL_LEN_r33 605 +#define _CALL_LIST_APPEND_r02 606 +#define _CALL_LIST_APPEND_r12 607 +#define _CALL_LIST_APPEND_r22 608 +#define _CALL_LIST_APPEND_r32 609 +#define _CALL_METHOD_DESCRIPTOR_FAST_r01 610 +#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r01 611 +#define _CALL_METHOD_DESCRIPTOR_NOARGS_r01 612 +#define _CALL_METHOD_DESCRIPTOR_O_r01 613 +#define _CALL_NON_PY_GENERAL_r01 614 +#define _CALL_STR_1_r32 615 +#define _CALL_TUPLE_1_r32 616 +#define _CALL_TYPE_1_r31 617 +#define _CHECK_AND_ALLOCATE_OBJECT_r00 618 +#define _CHECK_ATTR_CLASS_r01 619 +#define _CHECK_ATTR_CLASS_r11 620 +#define _CHECK_ATTR_CLASS_r22 621 +#define _CHECK_ATTR_CLASS_r33 622 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r01 623 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r11 624 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r22 625 +#define _CHECK_ATTR_METHOD_LAZY_DICT_r33 626 +#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS_r00 627 +#define _CHECK_EG_MATCH_r22 628 +#define _CHECK_EXC_MATCH_r22 629 +#define _CHECK_FUNCTION_EXACT_ARGS_r00 630 +#define _CHECK_FUNCTION_VERSION_r00 631 +#define _CHECK_FUNCTION_VERSION_INLINE_r00 632 +#define _CHECK_FUNCTION_VERSION_INLINE_r11 633 +#define _CHECK_FUNCTION_VERSION_INLINE_r22 634 +#define _CHECK_FUNCTION_VERSION_INLINE_r33 635 +#define _CHECK_FUNCTION_VERSION_KW_r11 636 +#define _CHECK_IS_NOT_PY_CALLABLE_r00 637 +#define _CHECK_IS_NOT_PY_CALLABLE_KW_r11 638 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r01 639 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r11 640 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r22 641 +#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r33 642 +#define _CHECK_METHOD_VERSION_r00 643 +#define _CHECK_METHOD_VERSION_KW_r11 644 +#define _CHECK_PEP_523_r00 645 +#define _CHECK_PEP_523_r11 646 +#define _CHECK_PEP_523_r22 647 +#define _CHECK_PEP_523_r33 648 +#define _CHECK_PERIODIC_r00 649 +#define _CHECK_PERIODIC_AT_END_r00 650 +#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM_r00 651 +#define _CHECK_RECURSION_REMAINING_r00 652 +#define _CHECK_RECURSION_REMAINING_r11 653 +#define _CHECK_RECURSION_REMAINING_r22 654 +#define _CHECK_RECURSION_REMAINING_r33 655 +#define _CHECK_STACK_SPACE_r00 656 +#define _CHECK_STACK_SPACE_OPERAND_r00 657 +#define _CHECK_STACK_SPACE_OPERAND_r11 658 +#define _CHECK_STACK_SPACE_OPERAND_r22 659 +#define _CHECK_STACK_SPACE_OPERAND_r33 660 +#define _CHECK_VALIDITY_r00 661 +#define _CHECK_VALIDITY_r11 662 +#define _CHECK_VALIDITY_r22 663 +#define _CHECK_VALIDITY_r33 664 +#define _COLD_DYNAMIC_EXIT_r00 665 +#define _COLD_EXIT_r00 666 +#define _COMPARE_OP_r21 667 +#define _COMPARE_OP_FLOAT_r01 668 +#define _COMPARE_OP_FLOAT_r11 669 +#define _COMPARE_OP_FLOAT_r21 670 +#define _COMPARE_OP_FLOAT_r32 671 +#define _COMPARE_OP_INT_r23 672 +#define _COMPARE_OP_STR_r21 673 +#define _CONTAINS_OP_r21 674 +#define _CONTAINS_OP_DICT_r21 675 +#define _CONTAINS_OP_SET_r21 676 +#define _CONVERT_VALUE_r11 677 +#define _COPY_r01 678 +#define _COPY_1_r02 679 +#define _COPY_1_r12 680 +#define _COPY_1_r23 681 +#define _COPY_2_r03 682 +#define _COPY_2_r13 683 +#define _COPY_2_r23 684 +#define _COPY_3_r03 685 +#define _COPY_3_r13 686 +#define _COPY_3_r23 687 +#define _COPY_3_r33 688 +#define _COPY_FREE_VARS_r00 689 +#define _COPY_FREE_VARS_r11 690 +#define _COPY_FREE_VARS_r22 691 +#define _COPY_FREE_VARS_r33 692 +#define _CREATE_INIT_FRAME_r01 693 +#define _DELETE_ATTR_r10 694 +#define _DELETE_DEREF_r00 695 +#define _DELETE_FAST_r00 696 +#define _DELETE_GLOBAL_r00 697 +#define _DELETE_NAME_r00 698 +#define _DELETE_SUBSCR_r20 699 +#define _DEOPT_r00 700 +#define _DEOPT_r10 701 +#define _DEOPT_r20 702 +#define _DEOPT_r30 703 +#define _DICT_MERGE_r10 704 +#define _DICT_UPDATE_r10 705 +#define _DO_CALL_r01 706 +#define _DO_CALL_FUNCTION_EX_r31 707 +#define _DO_CALL_KW_r11 708 +#define _DYNAMIC_EXIT_r00 709 +#define _DYNAMIC_EXIT_r10 710 +#define _DYNAMIC_EXIT_r20 711 +#define _DYNAMIC_EXIT_r30 712 +#define _END_FOR_r10 713 +#define _END_SEND_r21 714 +#define _ERROR_POP_N_r00 715 +#define _EXIT_INIT_CHECK_r10 716 +#define _EXIT_TRACE_r00 717 +#define _EXIT_TRACE_r10 718 +#define _EXIT_TRACE_r20 719 +#define _EXIT_TRACE_r30 720 +#define _EXPAND_METHOD_r00 721 +#define _EXPAND_METHOD_KW_r11 722 +#define _FATAL_ERROR_r00 723 +#define _FATAL_ERROR_r11 724 +#define _FATAL_ERROR_r22 725 +#define _FATAL_ERROR_r33 726 +#define _FORMAT_SIMPLE_r11 727 +#define _FORMAT_WITH_SPEC_r21 728 +#define _FOR_ITER_r23 729 +#define _FOR_ITER_GEN_FRAME_r23 730 +#define _FOR_ITER_TIER_TWO_r23 731 +#define _GET_AITER_r11 732 +#define _GET_ANEXT_r12 733 +#define _GET_AWAITABLE_r11 734 +#define _GET_ITER_r12 735 +#define _GET_LEN_r12 736 +#define _GET_YIELD_FROM_ITER_r11 737 +#define _GUARD_BINARY_OP_EXTEND_r22 738 +#define _GUARD_CALLABLE_ISINSTANCE_r03 739 +#define _GUARD_CALLABLE_ISINSTANCE_r13 740 +#define _GUARD_CALLABLE_ISINSTANCE_r23 741 +#define _GUARD_CALLABLE_ISINSTANCE_r33 742 +#define _GUARD_CALLABLE_LEN_r03 743 +#define _GUARD_CALLABLE_LEN_r13 744 +#define _GUARD_CALLABLE_LEN_r23 745 +#define _GUARD_CALLABLE_LEN_r33 746 +#define _GUARD_CALLABLE_LIST_APPEND_r03 747 +#define _GUARD_CALLABLE_LIST_APPEND_r13 748 +#define _GUARD_CALLABLE_LIST_APPEND_r23 749 +#define _GUARD_CALLABLE_LIST_APPEND_r33 750 +#define _GUARD_CALLABLE_STR_1_r03 751 +#define _GUARD_CALLABLE_STR_1_r13 752 +#define _GUARD_CALLABLE_STR_1_r23 753 +#define _GUARD_CALLABLE_STR_1_r33 754 +#define _GUARD_CALLABLE_TUPLE_1_r03 755 +#define _GUARD_CALLABLE_TUPLE_1_r13 756 +#define _GUARD_CALLABLE_TUPLE_1_r23 757 +#define _GUARD_CALLABLE_TUPLE_1_r33 758 +#define _GUARD_CALLABLE_TYPE_1_r03 759 +#define _GUARD_CALLABLE_TYPE_1_r13 760 +#define _GUARD_CALLABLE_TYPE_1_r23 761 +#define _GUARD_CALLABLE_TYPE_1_r33 762 +#define _GUARD_DORV_NO_DICT_r01 763 +#define _GUARD_DORV_NO_DICT_r11 764 +#define _GUARD_DORV_NO_DICT_r22 765 +#define _GUARD_DORV_NO_DICT_r33 766 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 767 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 768 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 769 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 770 +#define _GUARD_GLOBALS_VERSION_r00 771 +#define _GUARD_GLOBALS_VERSION_r11 772 +#define _GUARD_GLOBALS_VERSION_r22 773 +#define _GUARD_GLOBALS_VERSION_r33 774 +#define _GUARD_IP_RETURN_GENERATOR_r00 775 +#define _GUARD_IP_RETURN_GENERATOR_r11 776 +#define _GUARD_IP_RETURN_GENERATOR_r22 777 +#define _GUARD_IP_RETURN_GENERATOR_r33 778 +#define _GUARD_IP_RETURN_VALUE_r00 779 +#define _GUARD_IP_RETURN_VALUE_r11 780 +#define _GUARD_IP_RETURN_VALUE_r22 781 +#define _GUARD_IP_RETURN_VALUE_r33 782 +#define _GUARD_IP_YIELD_VALUE_r00 783 +#define _GUARD_IP_YIELD_VALUE_r11 784 +#define _GUARD_IP_YIELD_VALUE_r22 785 +#define _GUARD_IP_YIELD_VALUE_r33 786 +#define _GUARD_IP__PUSH_FRAME_r00 787 +#define _GUARD_IP__PUSH_FRAME_r11 788 +#define _GUARD_IP__PUSH_FRAME_r22 789 +#define _GUARD_IP__PUSH_FRAME_r33 790 +#define _GUARD_IS_FALSE_POP_r00 791 +#define _GUARD_IS_FALSE_POP_r10 792 +#define _GUARD_IS_FALSE_POP_r21 793 +#define _GUARD_IS_FALSE_POP_r32 794 +#define _GUARD_IS_NONE_POP_r00 795 +#define _GUARD_IS_NONE_POP_r10 796 +#define _GUARD_IS_NONE_POP_r21 797 +#define _GUARD_IS_NONE_POP_r32 798 +#define _GUARD_IS_NOT_NONE_POP_r10 799 +#define _GUARD_IS_TRUE_POP_r00 800 +#define _GUARD_IS_TRUE_POP_r10 801 +#define _GUARD_IS_TRUE_POP_r21 802 +#define _GUARD_IS_TRUE_POP_r32 803 +#define _GUARD_KEYS_VERSION_r01 804 +#define _GUARD_KEYS_VERSION_r11 805 +#define _GUARD_KEYS_VERSION_r22 806 +#define _GUARD_KEYS_VERSION_r33 807 +#define _GUARD_NOS_DICT_r02 808 +#define _GUARD_NOS_DICT_r12 809 +#define _GUARD_NOS_DICT_r22 810 +#define _GUARD_NOS_DICT_r33 811 +#define _GUARD_NOS_FLOAT_r02 812 +#define _GUARD_NOS_FLOAT_r12 813 +#define _GUARD_NOS_FLOAT_r22 814 +#define _GUARD_NOS_FLOAT_r33 815 +#define _GUARD_NOS_INT_r02 816 +#define _GUARD_NOS_INT_r12 817 +#define _GUARD_NOS_INT_r22 818 +#define _GUARD_NOS_INT_r33 819 +#define _GUARD_NOS_LIST_r02 820 +#define _GUARD_NOS_LIST_r12 821 +#define _GUARD_NOS_LIST_r22 822 +#define _GUARD_NOS_LIST_r33 823 +#define _GUARD_NOS_NOT_NULL_r02 824 +#define _GUARD_NOS_NOT_NULL_r12 825 +#define _GUARD_NOS_NOT_NULL_r22 826 +#define _GUARD_NOS_NOT_NULL_r33 827 +#define _GUARD_NOS_NULL_r02 828 +#define _GUARD_NOS_NULL_r12 829 +#define _GUARD_NOS_NULL_r22 830 +#define _GUARD_NOS_NULL_r33 831 +#define _GUARD_NOS_OVERFLOWED_r02 832 +#define _GUARD_NOS_OVERFLOWED_r12 833 +#define _GUARD_NOS_OVERFLOWED_r22 834 +#define _GUARD_NOS_OVERFLOWED_r33 835 +#define _GUARD_NOS_TUPLE_r02 836 +#define _GUARD_NOS_TUPLE_r12 837 +#define _GUARD_NOS_TUPLE_r22 838 +#define _GUARD_NOS_TUPLE_r33 839 +#define _GUARD_NOS_UNICODE_r02 840 +#define _GUARD_NOS_UNICODE_r12 841 +#define _GUARD_NOS_UNICODE_r22 842 +#define _GUARD_NOS_UNICODE_r33 843 +#define _GUARD_NOT_EXHAUSTED_LIST_r02 844 +#define _GUARD_NOT_EXHAUSTED_LIST_r12 845 +#define _GUARD_NOT_EXHAUSTED_LIST_r22 846 +#define _GUARD_NOT_EXHAUSTED_LIST_r33 847 +#define _GUARD_NOT_EXHAUSTED_RANGE_r02 848 +#define _GUARD_NOT_EXHAUSTED_RANGE_r12 849 +#define _GUARD_NOT_EXHAUSTED_RANGE_r22 850 +#define _GUARD_NOT_EXHAUSTED_RANGE_r33 851 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 852 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 853 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 854 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 855 +#define _GUARD_THIRD_NULL_r03 856 +#define _GUARD_THIRD_NULL_r13 857 +#define _GUARD_THIRD_NULL_r23 858 +#define _GUARD_THIRD_NULL_r33 859 +#define _GUARD_TOS_ANY_SET_r01 860 +#define _GUARD_TOS_ANY_SET_r11 861 +#define _GUARD_TOS_ANY_SET_r22 862 +#define _GUARD_TOS_ANY_SET_r33 863 +#define _GUARD_TOS_DICT_r01 864 +#define _GUARD_TOS_DICT_r11 865 +#define _GUARD_TOS_DICT_r22 866 +#define _GUARD_TOS_DICT_r33 867 +#define _GUARD_TOS_FLOAT_r01 868 +#define _GUARD_TOS_FLOAT_r11 869 +#define _GUARD_TOS_FLOAT_r22 870 +#define _GUARD_TOS_FLOAT_r33 871 +#define _GUARD_TOS_INT_r01 872 +#define _GUARD_TOS_INT_r11 873 +#define _GUARD_TOS_INT_r22 874 +#define _GUARD_TOS_INT_r33 875 +#define _GUARD_TOS_LIST_r01 876 +#define _GUARD_TOS_LIST_r11 877 +#define _GUARD_TOS_LIST_r22 878 +#define _GUARD_TOS_LIST_r33 879 +#define _GUARD_TOS_OVERFLOWED_r01 880 +#define _GUARD_TOS_OVERFLOWED_r11 881 +#define _GUARD_TOS_OVERFLOWED_r22 882 +#define _GUARD_TOS_OVERFLOWED_r33 883 +#define _GUARD_TOS_SLICE_r01 884 +#define _GUARD_TOS_SLICE_r11 885 +#define _GUARD_TOS_SLICE_r22 886 +#define _GUARD_TOS_SLICE_r33 887 +#define _GUARD_TOS_TUPLE_r01 888 +#define _GUARD_TOS_TUPLE_r11 889 +#define _GUARD_TOS_TUPLE_r22 890 +#define _GUARD_TOS_TUPLE_r33 891 +#define _GUARD_TOS_UNICODE_r01 892 +#define _GUARD_TOS_UNICODE_r11 893 +#define _GUARD_TOS_UNICODE_r22 894 +#define _GUARD_TOS_UNICODE_r33 895 +#define _GUARD_TYPE_VERSION_r01 896 +#define _GUARD_TYPE_VERSION_r11 897 +#define _GUARD_TYPE_VERSION_r22 898 +#define _GUARD_TYPE_VERSION_r33 899 +#define _GUARD_TYPE_VERSION_AND_LOCK_r01 900 +#define _GUARD_TYPE_VERSION_AND_LOCK_r11 901 +#define _GUARD_TYPE_VERSION_AND_LOCK_r22 902 +#define _GUARD_TYPE_VERSION_AND_LOCK_r33 903 +#define _HANDLE_PENDING_AND_DEOPT_r00 904 +#define _HANDLE_PENDING_AND_DEOPT_r10 905 +#define _HANDLE_PENDING_AND_DEOPT_r20 906 +#define _HANDLE_PENDING_AND_DEOPT_r30 907 +#define _IMPORT_FROM_r12 908 +#define _IMPORT_NAME_r21 909 +#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 910 +#define _INIT_CALL_PY_EXACT_ARGS_r01 911 +#define _INIT_CALL_PY_EXACT_ARGS_0_r01 912 +#define _INIT_CALL_PY_EXACT_ARGS_1_r01 913 +#define _INIT_CALL_PY_EXACT_ARGS_2_r01 914 +#define _INIT_CALL_PY_EXACT_ARGS_3_r01 915 +#define _INIT_CALL_PY_EXACT_ARGS_4_r01 916 +#define _INSERT_NULL_r10 917 +#define _INSTRUMENTED_FOR_ITER_r23 918 +#define _INSTRUMENTED_INSTRUCTION_r00 919 +#define _INSTRUMENTED_JUMP_FORWARD_r00 920 +#define _INSTRUMENTED_JUMP_FORWARD_r11 921 +#define _INSTRUMENTED_JUMP_FORWARD_r22 922 +#define _INSTRUMENTED_JUMP_FORWARD_r33 923 +#define _INSTRUMENTED_LINE_r00 924 +#define _INSTRUMENTED_NOT_TAKEN_r00 925 +#define _INSTRUMENTED_NOT_TAKEN_r11 926 +#define _INSTRUMENTED_NOT_TAKEN_r22 927 +#define _INSTRUMENTED_NOT_TAKEN_r33 928 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 929 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 930 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 931 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 932 +#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 933 +#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 934 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 935 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 936 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 937 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 938 +#define _IS_NONE_r11 939 +#define _IS_OP_r21 940 +#define _ITER_CHECK_LIST_r02 941 +#define _ITER_CHECK_LIST_r12 942 +#define _ITER_CHECK_LIST_r22 943 +#define _ITER_CHECK_LIST_r33 944 +#define _ITER_CHECK_RANGE_r02 945 +#define _ITER_CHECK_RANGE_r12 946 +#define _ITER_CHECK_RANGE_r22 947 +#define _ITER_CHECK_RANGE_r33 948 +#define _ITER_CHECK_TUPLE_r02 949 +#define _ITER_CHECK_TUPLE_r12 950 +#define _ITER_CHECK_TUPLE_r22 951 +#define _ITER_CHECK_TUPLE_r33 952 +#define _ITER_JUMP_LIST_r02 953 +#define _ITER_JUMP_LIST_r12 954 +#define _ITER_JUMP_LIST_r22 955 +#define _ITER_JUMP_LIST_r33 956 +#define _ITER_JUMP_RANGE_r02 957 +#define _ITER_JUMP_RANGE_r12 958 +#define _ITER_JUMP_RANGE_r22 959 +#define _ITER_JUMP_RANGE_r33 960 +#define _ITER_JUMP_TUPLE_r02 961 +#define _ITER_JUMP_TUPLE_r12 962 +#define _ITER_JUMP_TUPLE_r22 963 +#define _ITER_JUMP_TUPLE_r33 964 +#define _ITER_NEXT_LIST_r23 965 +#define _ITER_NEXT_LIST_TIER_TWO_r23 966 +#define _ITER_NEXT_RANGE_r03 967 +#define _ITER_NEXT_RANGE_r13 968 +#define _ITER_NEXT_RANGE_r23 969 +#define _ITER_NEXT_TUPLE_r03 970 +#define _ITER_NEXT_TUPLE_r13 971 +#define _ITER_NEXT_TUPLE_r23 972 +#define _JUMP_BACKWARD_NO_INTERRUPT_r00 973 +#define _JUMP_BACKWARD_NO_INTERRUPT_r11 974 +#define _JUMP_BACKWARD_NO_INTERRUPT_r22 975 +#define _JUMP_BACKWARD_NO_INTERRUPT_r33 976 +#define _JUMP_TO_TOP_r00 977 +#define _LIST_APPEND_r10 978 +#define _LIST_EXTEND_r10 979 +#define _LOAD_ATTR_r10 980 +#define _LOAD_ATTR_CLASS_r11 981 +#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_r11 982 +#define _LOAD_ATTR_INSTANCE_VALUE_r02 983 +#define _LOAD_ATTR_INSTANCE_VALUE_r12 984 +#define _LOAD_ATTR_INSTANCE_VALUE_r23 985 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 986 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 987 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 988 +#define _LOAD_ATTR_METHOD_NO_DICT_r02 989 +#define _LOAD_ATTR_METHOD_NO_DICT_r12 990 +#define _LOAD_ATTR_METHOD_NO_DICT_r23 991 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 992 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 993 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 994 +#define _LOAD_ATTR_MODULE_r11 995 +#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 996 +#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 997 +#define _LOAD_ATTR_PROPERTY_FRAME_r11 998 +#define _LOAD_ATTR_SLOT_r11 999 +#define _LOAD_ATTR_WITH_HINT_r11 1000 +#define _LOAD_BUILD_CLASS_r01 1001 +#define _LOAD_BYTECODE_r00 1002 +#define _LOAD_COMMON_CONSTANT_r01 1003 +#define _LOAD_COMMON_CONSTANT_r12 1004 +#define _LOAD_COMMON_CONSTANT_r23 1005 +#define _LOAD_CONST_r01 1006 +#define _LOAD_CONST_r12 1007 +#define _LOAD_CONST_r23 1008 +#define _LOAD_CONST_INLINE_r01 1009 +#define _LOAD_CONST_INLINE_r12 1010 +#define _LOAD_CONST_INLINE_r23 1011 +#define _LOAD_CONST_INLINE_BORROW_r01 1012 +#define _LOAD_CONST_INLINE_BORROW_r12 1013 +#define _LOAD_CONST_INLINE_BORROW_r23 1014 +#define _LOAD_CONST_UNDER_INLINE_r02 1015 +#define _LOAD_CONST_UNDER_INLINE_r12 1016 +#define _LOAD_CONST_UNDER_INLINE_r23 1017 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r02 1018 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r12 1019 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r23 1020 +#define _LOAD_DEREF_r01 1021 +#define _LOAD_FAST_r01 1022 +#define _LOAD_FAST_r12 1023 +#define _LOAD_FAST_r23 1024 +#define _LOAD_FAST_0_r01 1025 +#define _LOAD_FAST_0_r12 1026 +#define _LOAD_FAST_0_r23 1027 +#define _LOAD_FAST_1_r01 1028 +#define _LOAD_FAST_1_r12 1029 +#define _LOAD_FAST_1_r23 1030 +#define _LOAD_FAST_2_r01 1031 +#define _LOAD_FAST_2_r12 1032 +#define _LOAD_FAST_2_r23 1033 +#define _LOAD_FAST_3_r01 1034 +#define _LOAD_FAST_3_r12 1035 +#define _LOAD_FAST_3_r23 1036 +#define _LOAD_FAST_4_r01 1037 +#define _LOAD_FAST_4_r12 1038 +#define _LOAD_FAST_4_r23 1039 +#define _LOAD_FAST_5_r01 1040 +#define _LOAD_FAST_5_r12 1041 +#define _LOAD_FAST_5_r23 1042 +#define _LOAD_FAST_6_r01 1043 +#define _LOAD_FAST_6_r12 1044 +#define _LOAD_FAST_6_r23 1045 +#define _LOAD_FAST_7_r01 1046 +#define _LOAD_FAST_7_r12 1047 +#define _LOAD_FAST_7_r23 1048 +#define _LOAD_FAST_AND_CLEAR_r01 1049 +#define _LOAD_FAST_AND_CLEAR_r12 1050 +#define _LOAD_FAST_AND_CLEAR_r23 1051 +#define _LOAD_FAST_BORROW_r01 1052 +#define _LOAD_FAST_BORROW_r12 1053 +#define _LOAD_FAST_BORROW_r23 1054 +#define _LOAD_FAST_BORROW_0_r01 1055 +#define _LOAD_FAST_BORROW_0_r12 1056 +#define _LOAD_FAST_BORROW_0_r23 1057 +#define _LOAD_FAST_BORROW_1_r01 1058 +#define _LOAD_FAST_BORROW_1_r12 1059 +#define _LOAD_FAST_BORROW_1_r23 1060 +#define _LOAD_FAST_BORROW_2_r01 1061 +#define _LOAD_FAST_BORROW_2_r12 1062 +#define _LOAD_FAST_BORROW_2_r23 1063 +#define _LOAD_FAST_BORROW_3_r01 1064 +#define _LOAD_FAST_BORROW_3_r12 1065 +#define _LOAD_FAST_BORROW_3_r23 1066 +#define _LOAD_FAST_BORROW_4_r01 1067 +#define _LOAD_FAST_BORROW_4_r12 1068 +#define _LOAD_FAST_BORROW_4_r23 1069 +#define _LOAD_FAST_BORROW_5_r01 1070 +#define _LOAD_FAST_BORROW_5_r12 1071 +#define _LOAD_FAST_BORROW_5_r23 1072 +#define _LOAD_FAST_BORROW_6_r01 1073 +#define _LOAD_FAST_BORROW_6_r12 1074 +#define _LOAD_FAST_BORROW_6_r23 1075 +#define _LOAD_FAST_BORROW_7_r01 1076 +#define _LOAD_FAST_BORROW_7_r12 1077 +#define _LOAD_FAST_BORROW_7_r23 1078 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1079 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1080 +#define _LOAD_FAST_CHECK_r01 1081 +#define _LOAD_FAST_CHECK_r12 1082 +#define _LOAD_FAST_CHECK_r23 1083 +#define _LOAD_FAST_LOAD_FAST_r02 1084 +#define _LOAD_FAST_LOAD_FAST_r13 1085 +#define _LOAD_FROM_DICT_OR_DEREF_r11 1086 +#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1087 +#define _LOAD_GLOBAL_r00 1088 +#define _LOAD_GLOBAL_BUILTINS_r01 1089 +#define _LOAD_GLOBAL_MODULE_r01 1090 +#define _LOAD_LOCALS_r01 1091 +#define _LOAD_LOCALS_r12 1092 +#define _LOAD_LOCALS_r23 1093 +#define _LOAD_NAME_r01 1094 +#define _LOAD_SMALL_INT_r01 1095 +#define _LOAD_SMALL_INT_r12 1096 +#define _LOAD_SMALL_INT_r23 1097 +#define _LOAD_SMALL_INT_0_r01 1098 +#define _LOAD_SMALL_INT_0_r12 1099 +#define _LOAD_SMALL_INT_0_r23 1100 +#define _LOAD_SMALL_INT_1_r01 1101 +#define _LOAD_SMALL_INT_1_r12 1102 +#define _LOAD_SMALL_INT_1_r23 1103 +#define _LOAD_SMALL_INT_2_r01 1104 +#define _LOAD_SMALL_INT_2_r12 1105 +#define _LOAD_SMALL_INT_2_r23 1106 +#define _LOAD_SMALL_INT_3_r01 1107 +#define _LOAD_SMALL_INT_3_r12 1108 +#define _LOAD_SMALL_INT_3_r23 1109 +#define _LOAD_SPECIAL_r00 1110 +#define _LOAD_SUPER_ATTR_ATTR_r31 1111 +#define _LOAD_SUPER_ATTR_METHOD_r32 1112 +#define _MAKE_CALLARGS_A_TUPLE_r33 1113 +#define _MAKE_CELL_r00 1114 +#define _MAKE_FUNCTION_r11 1115 +#define _MAKE_WARM_r00 1116 +#define _MAKE_WARM_r11 1117 +#define _MAKE_WARM_r22 1118 +#define _MAKE_WARM_r33 1119 +#define _MAP_ADD_r20 1120 +#define _MATCH_CLASS_r31 1121 +#define _MATCH_KEYS_r23 1122 +#define _MATCH_MAPPING_r02 1123 +#define _MATCH_MAPPING_r12 1124 +#define _MATCH_MAPPING_r23 1125 +#define _MATCH_SEQUENCE_r02 1126 +#define _MATCH_SEQUENCE_r12 1127 +#define _MATCH_SEQUENCE_r23 1128 +#define _MAYBE_EXPAND_METHOD_r00 1129 +#define _MAYBE_EXPAND_METHOD_KW_r11 1130 +#define _MONITOR_CALL_r00 1131 +#define _MONITOR_CALL_KW_r11 1132 +#define _MONITOR_JUMP_BACKWARD_r00 1133 +#define _MONITOR_JUMP_BACKWARD_r11 1134 +#define _MONITOR_JUMP_BACKWARD_r22 1135 +#define _MONITOR_JUMP_BACKWARD_r33 1136 +#define _MONITOR_RESUME_r00 1137 +#define _NOP_r00 1138 +#define _NOP_r11 1139 +#define _NOP_r22 1140 +#define _NOP_r33 1141 +#define _POP_CALL_r20 1142 +#define _POP_CALL_LOAD_CONST_INLINE_BORROW_r21 1143 +#define _POP_CALL_ONE_r30 1144 +#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW_r31 1145 +#define _POP_CALL_TWO_r30 1146 +#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW_r31 1147 +#define _POP_EXCEPT_r10 1148 +#define _POP_ITER_r20 1149 +#define _POP_JUMP_IF_FALSE_r00 1150 +#define _POP_JUMP_IF_FALSE_r10 1151 +#define _POP_JUMP_IF_FALSE_r21 1152 +#define _POP_JUMP_IF_FALSE_r32 1153 +#define _POP_JUMP_IF_TRUE_r00 1154 +#define _POP_JUMP_IF_TRUE_r10 1155 +#define _POP_JUMP_IF_TRUE_r21 1156 +#define _POP_JUMP_IF_TRUE_r32 1157 +#define _POP_TOP_r10 1158 +#define _POP_TOP_FLOAT_r00 1159 +#define _POP_TOP_FLOAT_r10 1160 +#define _POP_TOP_FLOAT_r21 1161 +#define _POP_TOP_FLOAT_r32 1162 +#define _POP_TOP_INT_r00 1163 +#define _POP_TOP_INT_r10 1164 +#define _POP_TOP_INT_r21 1165 +#define _POP_TOP_INT_r32 1166 +#define _POP_TOP_LOAD_CONST_INLINE_r11 1167 +#define _POP_TOP_LOAD_CONST_INLINE_BORROW_r11 1168 +#define _POP_TOP_NOP_r00 1169 +#define _POP_TOP_NOP_r10 1170 +#define _POP_TOP_NOP_r21 1171 +#define _POP_TOP_NOP_r32 1172 +#define _POP_TOP_UNICODE_r00 1173 +#define _POP_TOP_UNICODE_r10 1174 +#define _POP_TOP_UNICODE_r21 1175 +#define _POP_TOP_UNICODE_r32 1176 +#define _POP_TWO_r20 1177 +#define _POP_TWO_LOAD_CONST_INLINE_BORROW_r21 1178 +#define _PUSH_EXC_INFO_r02 1179 +#define _PUSH_EXC_INFO_r12 1180 +#define _PUSH_EXC_INFO_r23 1181 +#define _PUSH_FRAME_r10 1182 +#define _PUSH_NULL_r01 1183 +#define _PUSH_NULL_r12 1184 +#define _PUSH_NULL_r23 1185 +#define _PUSH_NULL_CONDITIONAL_r00 1186 +#define _PY_FRAME_GENERAL_r01 1187 +#define _PY_FRAME_KW_r11 1188 +#define _QUICKEN_RESUME_r00 1189 +#define _QUICKEN_RESUME_r11 1190 +#define _QUICKEN_RESUME_r22 1191 +#define _QUICKEN_RESUME_r33 1192 +#define _REPLACE_WITH_TRUE_r11 1193 +#define _RESUME_CHECK_r00 1194 +#define _RESUME_CHECK_r11 1195 +#define _RESUME_CHECK_r22 1196 +#define _RESUME_CHECK_r33 1197 +#define _RETURN_GENERATOR_r01 1198 +#define _RETURN_VALUE_r11 1199 +#define _SAVE_RETURN_OFFSET_r00 1200 +#define _SAVE_RETURN_OFFSET_r11 1201 +#define _SAVE_RETURN_OFFSET_r22 1202 +#define _SAVE_RETURN_OFFSET_r33 1203 +#define _SEND_r22 1204 +#define _SEND_GEN_FRAME_r22 1205 +#define _SETUP_ANNOTATIONS_r00 1206 +#define _SET_ADD_r10 1207 +#define _SET_FUNCTION_ATTRIBUTE_r01 1208 +#define _SET_FUNCTION_ATTRIBUTE_r11 1209 +#define _SET_FUNCTION_ATTRIBUTE_r21 1210 +#define _SET_FUNCTION_ATTRIBUTE_r32 1211 +#define _SET_IP_r00 1212 +#define _SET_IP_r11 1213 +#define _SET_IP_r22 1214 +#define _SET_IP_r33 1215 +#define _SET_UPDATE_r10 1216 +#define _SPILL_OR_RELOAD_r01 1217 +#define _SPILL_OR_RELOAD_r02 1218 +#define _SPILL_OR_RELOAD_r03 1219 +#define _SPILL_OR_RELOAD_r10 1220 +#define _SPILL_OR_RELOAD_r12 1221 +#define _SPILL_OR_RELOAD_r13 1222 +#define _SPILL_OR_RELOAD_r20 1223 +#define _SPILL_OR_RELOAD_r21 1224 +#define _SPILL_OR_RELOAD_r23 1225 +#define _SPILL_OR_RELOAD_r30 1226 +#define _SPILL_OR_RELOAD_r31 1227 +#define _SPILL_OR_RELOAD_r32 1228 +#define _START_EXECUTOR_r00 1229 +#define _STORE_ATTR_r20 1230 +#define _STORE_ATTR_INSTANCE_VALUE_r21 1231 +#define _STORE_ATTR_SLOT_r21 1232 +#define _STORE_ATTR_WITH_HINT_r21 1233 +#define _STORE_DEREF_r10 1234 +#define _STORE_FAST_r10 1235 +#define _STORE_FAST_0_r10 1236 +#define _STORE_FAST_1_r10 1237 +#define _STORE_FAST_2_r10 1238 +#define _STORE_FAST_3_r10 1239 +#define _STORE_FAST_4_r10 1240 +#define _STORE_FAST_5_r10 1241 +#define _STORE_FAST_6_r10 1242 +#define _STORE_FAST_7_r10 1243 +#define _STORE_FAST_LOAD_FAST_r11 1244 +#define _STORE_FAST_STORE_FAST_r20 1245 +#define _STORE_GLOBAL_r10 1246 +#define _STORE_NAME_r10 1247 +#define _STORE_SLICE_r30 1248 +#define _STORE_SUBSCR_r30 1249 +#define _STORE_SUBSCR_DICT_r31 1250 +#define _STORE_SUBSCR_LIST_INT_r32 1251 +#define _SWAP_r11 1252 +#define _SWAP_2_r02 1253 +#define _SWAP_2_r12 1254 +#define _SWAP_2_r22 1255 +#define _SWAP_2_r33 1256 +#define _SWAP_3_r03 1257 +#define _SWAP_3_r13 1258 +#define _SWAP_3_r23 1259 +#define _SWAP_3_r33 1260 +#define _TIER2_RESUME_CHECK_r00 1261 +#define _TIER2_RESUME_CHECK_r11 1262 +#define _TIER2_RESUME_CHECK_r22 1263 +#define _TIER2_RESUME_CHECK_r33 1264 +#define _TO_BOOL_r11 1265 +#define _TO_BOOL_BOOL_r01 1266 +#define _TO_BOOL_BOOL_r11 1267 +#define _TO_BOOL_BOOL_r22 1268 +#define _TO_BOOL_BOOL_r33 1269 +#define _TO_BOOL_INT_r11 1270 +#define _TO_BOOL_LIST_r11 1271 +#define _TO_BOOL_NONE_r01 1272 +#define _TO_BOOL_NONE_r11 1273 +#define _TO_BOOL_NONE_r22 1274 +#define _TO_BOOL_NONE_r33 1275 +#define _TO_BOOL_STR_r11 1276 +#define _TRACE_RECORD_r00 1277 +#define _UNARY_INVERT_r11 1278 +#define _UNARY_NEGATIVE_r11 1279 +#define _UNARY_NOT_r01 1280 +#define _UNARY_NOT_r11 1281 +#define _UNARY_NOT_r22 1282 +#define _UNARY_NOT_r33 1283 +#define _UNPACK_EX_r10 1284 +#define _UNPACK_SEQUENCE_r10 1285 +#define _UNPACK_SEQUENCE_LIST_r10 1286 +#define _UNPACK_SEQUENCE_TUPLE_r10 1287 +#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1288 +#define _WITH_EXCEPT_START_r33 1289 +#define _YIELD_VALUE_r11 1290 +#define MAX_UOP_REGS_ID 1290 #ifdef __cplusplus } diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index c6d3670b193123..0cc38919565bc1 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -111,7 +111,7 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_BINARY_OP_MULTIPLY_FLOAT] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_PURE_FLAG, [_BINARY_OP_ADD_FLOAT] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_PURE_FLAG, [_BINARY_OP_SUBTRACT_FLOAT] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_PURE_FLAG, - [_BINARY_OP_ADD_UNICODE] = HAS_ERROR_FLAG | HAS_PURE_FLAG, + [_BINARY_OP_ADD_UNICODE] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_PURE_FLAG, [_BINARY_OP_INPLACE_ADD_UNICODE] = HAS_LOCAL_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_GUARD_BINARY_OP_EXTEND] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, [_BINARY_OP_EXTEND] = HAS_ESCAPES_FLAG, @@ -1050,12 +1050,12 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { }, }, [_BINARY_OP_ADD_UNICODE] = { - .best = { 0, 1, 2, 3 }, + .best = { 0, 1, 2, 2 }, .entries = { - { 1, 0, _BINARY_OP_ADD_UNICODE_r01 }, - { 1, 1, _BINARY_OP_ADD_UNICODE_r11 }, - { 1, 2, _BINARY_OP_ADD_UNICODE_r21 }, - { 2, 3, _BINARY_OP_ADD_UNICODE_r32 }, + { 3, 0, _BINARY_OP_ADD_UNICODE_r03 }, + { 3, 1, _BINARY_OP_ADD_UNICODE_r13 }, + { 3, 2, _BINARY_OP_ADD_UNICODE_r23 }, + { -1, -1, -1 }, }, }, [_BINARY_OP_INPLACE_ADD_UNICODE] = { @@ -3414,10 +3414,9 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_BINARY_OP_SUBTRACT_FLOAT_r03] = _BINARY_OP_SUBTRACT_FLOAT, [_BINARY_OP_SUBTRACT_FLOAT_r13] = _BINARY_OP_SUBTRACT_FLOAT, [_BINARY_OP_SUBTRACT_FLOAT_r23] = _BINARY_OP_SUBTRACT_FLOAT, - [_BINARY_OP_ADD_UNICODE_r01] = _BINARY_OP_ADD_UNICODE, - [_BINARY_OP_ADD_UNICODE_r11] = _BINARY_OP_ADD_UNICODE, - [_BINARY_OP_ADD_UNICODE_r21] = _BINARY_OP_ADD_UNICODE, - [_BINARY_OP_ADD_UNICODE_r32] = _BINARY_OP_ADD_UNICODE, + [_BINARY_OP_ADD_UNICODE_r03] = _BINARY_OP_ADD_UNICODE, + [_BINARY_OP_ADD_UNICODE_r13] = _BINARY_OP_ADD_UNICODE, + [_BINARY_OP_ADD_UNICODE_r23] = _BINARY_OP_ADD_UNICODE, [_BINARY_OP_INPLACE_ADD_UNICODE_r20] = _BINARY_OP_INPLACE_ADD_UNICODE, [_GUARD_BINARY_OP_EXTEND_r22] = _GUARD_BINARY_OP_EXTEND, [_BINARY_OP_EXTEND_r21] = _BINARY_OP_EXTEND, @@ -3906,10 +3905,9 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_BINARY_OP_ADD_INT_r13] = "_BINARY_OP_ADD_INT_r13", [_BINARY_OP_ADD_INT_r23] = "_BINARY_OP_ADD_INT_r23", [_BINARY_OP_ADD_UNICODE] = "_BINARY_OP_ADD_UNICODE", - [_BINARY_OP_ADD_UNICODE_r01] = "_BINARY_OP_ADD_UNICODE_r01", - [_BINARY_OP_ADD_UNICODE_r11] = "_BINARY_OP_ADD_UNICODE_r11", - [_BINARY_OP_ADD_UNICODE_r21] = "_BINARY_OP_ADD_UNICODE_r21", - [_BINARY_OP_ADD_UNICODE_r32] = "_BINARY_OP_ADD_UNICODE_r32", + [_BINARY_OP_ADD_UNICODE_r03] = "_BINARY_OP_ADD_UNICODE_r03", + [_BINARY_OP_ADD_UNICODE_r13] = "_BINARY_OP_ADD_UNICODE_r13", + [_BINARY_OP_ADD_UNICODE_r23] = "_BINARY_OP_ADD_UNICODE_r23", [_BINARY_OP_EXTEND] = "_BINARY_OP_EXTEND", [_BINARY_OP_EXTEND_r21] = "_BINARY_OP_EXTEND_r21", [_BINARY_OP_INPLACE_ADD_UNICODE] = "_BINARY_OP_INPLACE_ADD_UNICODE", diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index bed8d1d52e93b2..6f1b115b31257f 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -2552,6 +2552,22 @@ def testfunc(n): self.assertIn("_POP_TOP_NOP", uops) self.assertNotIn("_POP_TOP", uops) + def test_unicode_add_op_refcount_elimination(self): + def testfunc(n): + c = "a" + res = "" + for _ in range(n): + res = c + c + return res + + res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD) + self.assertEqual(res, "aa") + self.assertIsNotNone(ex) + uops = get_opnames(ex) + self.assertIn("_BINARY_OP_ADD_UNICODE", uops) + self.assertIn("_POP_TOP_NOP", uops) + self.assertNotIn("_POP_TOP", uops) + def test_remove_guard_for_slice_list(self): def f(n): for i in range(n): diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 25e730f7e6e8ec..07944f624ede95 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -742,7 +742,7 @@ dummy_func( macro(BINARY_OP_SUBTRACT_FLOAT) = _GUARD_TOS_FLOAT + _GUARD_NOS_FLOAT + unused/5 + _BINARY_OP_SUBTRACT_FLOAT + _POP_TOP_FLOAT + _POP_TOP_FLOAT; - pure op(_BINARY_OP_ADD_UNICODE, (left, right -- res)) { + pure op(_BINARY_OP_ADD_UNICODE, (left, right -- res, l, r)) { PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); assert(PyUnicode_CheckExact(left_o)); @@ -750,15 +750,17 @@ dummy_func( STAT_INC(BINARY_OP, hit); PyObject *res_o = PyUnicode_Concat(left_o, right_o); - PyStackRef_CLOSE_SPECIALIZED(right, _PyUnicode_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(left, _PyUnicode_ExactDealloc); - INPUTS_DEAD(); - ERROR_IF(res_o == NULL); res = PyStackRef_FromPyObjectSteal(res_o); + if (PyStackRef_IsNull(res)) { + ERROR_NO_POP(); + } + l = left; + r = right; + INPUTS_DEAD(); } macro(BINARY_OP_ADD_UNICODE) = - _GUARD_TOS_UNICODE + _GUARD_NOS_UNICODE + unused/5 + _BINARY_OP_ADD_UNICODE; + _GUARD_TOS_UNICODE + _GUARD_NOS_UNICODE + unused/5 + _BINARY_OP_ADD_UNICODE + _POP_TOP_UNICODE + _POP_TOP_UNICODE; // This is a subtle one. It's a super-instruction for // BINARY_OP_ADD_UNICODE followed by STORE_FAST diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 55c4495f2dc59d..9f3a207929ff9f 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -4184,12 +4184,14 @@ break; } - case _BINARY_OP_ADD_UNICODE_r01: { + case _BINARY_OP_ADD_UNICODE_r03: { CHECK_CURRENT_CACHED_VALUES(0); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); _PyStackRef right; _PyStackRef left; _PyStackRef res; + _PyStackRef l; + _PyStackRef r; right = stack_pointer[-1]; left = stack_pointer[-2]; PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); @@ -4198,29 +4200,31 @@ assert(PyUnicode_CheckExact(right_o)); STAT_INC(BINARY_OP, hit); PyObject *res_o = PyUnicode_Concat(left_o, right_o); - PyStackRef_CLOSE_SPECIALIZED(right, _PyUnicode_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(left, _PyUnicode_ExactDealloc); - if (res_o == NULL) { - stack_pointer += -2; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + res = PyStackRef_FromPyObjectSteal(res_o); + if (PyStackRef_IsNull(res)) { SET_CURRENT_CACHED_VALUES(0); JUMP_TO_ERROR(); } - res = PyStackRef_FromPyObjectSteal(res_o); + l = left; + r = right; + _tos_cache2 = r; + _tos_cache1 = l; _tos_cache0 = res; - SET_CURRENT_CACHED_VALUES(1); + SET_CURRENT_CACHED_VALUES(3); stack_pointer += -2; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); break; } - case _BINARY_OP_ADD_UNICODE_r11: { + case _BINARY_OP_ADD_UNICODE_r13: { CHECK_CURRENT_CACHED_VALUES(1); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); _PyStackRef right; _PyStackRef left; _PyStackRef res; + _PyStackRef l; + _PyStackRef r; _PyStackRef _stack_item_0 = _tos_cache0; right = _stack_item_0; left = stack_pointer[-1]; @@ -4230,29 +4234,34 @@ assert(PyUnicode_CheckExact(right_o)); STAT_INC(BINARY_OP, hit); PyObject *res_o = PyUnicode_Concat(left_o, right_o); - PyStackRef_CLOSE_SPECIALIZED(right, _PyUnicode_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(left, _PyUnicode_ExactDealloc); - if (res_o == NULL) { - stack_pointer += -1; + res = PyStackRef_FromPyObjectSteal(res_o); + if (PyStackRef_IsNull(res)) { + stack_pointer[0] = right; + stack_pointer += 1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); SET_CURRENT_CACHED_VALUES(0); JUMP_TO_ERROR(); } - res = PyStackRef_FromPyObjectSteal(res_o); + l = left; + r = right; + _tos_cache2 = r; + _tos_cache1 = l; _tos_cache0 = res; - SET_CURRENT_CACHED_VALUES(1); + SET_CURRENT_CACHED_VALUES(3); stack_pointer += -1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); break; } - case _BINARY_OP_ADD_UNICODE_r21: { + case _BINARY_OP_ADD_UNICODE_r23: { CHECK_CURRENT_CACHED_VALUES(2); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); _PyStackRef right; _PyStackRef left; _PyStackRef res; + _PyStackRef l; + _PyStackRef r; _PyStackRef _stack_item_0 = _tos_cache0; _PyStackRef _stack_item_1 = _tos_cache1; right = _stack_item_1; @@ -4263,49 +4272,21 @@ assert(PyUnicode_CheckExact(right_o)); STAT_INC(BINARY_OP, hit); PyObject *res_o = PyUnicode_Concat(left_o, right_o); - PyStackRef_CLOSE_SPECIALIZED(right, _PyUnicode_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(left, _PyUnicode_ExactDealloc); - if (res_o == NULL) { - SET_CURRENT_CACHED_VALUES(0); - JUMP_TO_ERROR(); - } res = PyStackRef_FromPyObjectSteal(res_o); - _tos_cache0 = res; - SET_CURRENT_CACHED_VALUES(1); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - break; - } - - case _BINARY_OP_ADD_UNICODE_r32: { - CHECK_CURRENT_CACHED_VALUES(3); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - _PyStackRef right; - _PyStackRef left; - _PyStackRef res; - _PyStackRef _stack_item_0 = _tos_cache0; - _PyStackRef _stack_item_1 = _tos_cache1; - _PyStackRef _stack_item_2 = _tos_cache2; - right = _stack_item_2; - left = _stack_item_1; - PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); - PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); - assert(PyUnicode_CheckExact(left_o)); - assert(PyUnicode_CheckExact(right_o)); - STAT_INC(BINARY_OP, hit); - PyObject *res_o = PyUnicode_Concat(left_o, right_o); - PyStackRef_CLOSE_SPECIALIZED(right, _PyUnicode_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(left, _PyUnicode_ExactDealloc); - if (res_o == NULL) { - stack_pointer[0] = _stack_item_0; - stack_pointer += 1; + if (PyStackRef_IsNull(res)) { + stack_pointer[0] = left; + stack_pointer[1] = right; + stack_pointer += 2; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); SET_CURRENT_CACHED_VALUES(0); JUMP_TO_ERROR(); } - res = PyStackRef_FromPyObjectSteal(res_o); - _tos_cache1 = res; - _tos_cache0 = _stack_item_0; - SET_CURRENT_CACHED_VALUES(2); + l = left; + r = right; + _tos_cache2 = r; + _tos_cache1 = l; + _tos_cache0 = res; + SET_CURRENT_CACHED_VALUES(3); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); break; } diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 3c18960a39d7d7..8d3119e9169d19 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -245,6 +245,8 @@ _PyStackRef left; _PyStackRef right; _PyStackRef res; + _PyStackRef l; + _PyStackRef r; // _GUARD_TOS_UNICODE { value = stack_pointer[-1]; @@ -276,12 +278,24 @@ assert(PyUnicode_CheckExact(right_o)); STAT_INC(BINARY_OP, hit); PyObject *res_o = PyUnicode_Concat(left_o, right_o); - PyStackRef_CLOSE_SPECIALIZED(right, _PyUnicode_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(left, _PyUnicode_ExactDealloc); - if (res_o == NULL) { - JUMP_TO_LABEL(pop_2_error); - } res = PyStackRef_FromPyObjectSteal(res_o); + if (PyStackRef_IsNull(res)) { + JUMP_TO_LABEL(error); + } + l = left; + r = right; + } + // _POP_TOP_UNICODE + { + value = r; + assert(PyUnicode_CheckExact(PyStackRef_AsPyObjectBorrow(value))); + PyStackRef_CLOSE_SPECIALIZED(value, _PyUnicode_ExactDealloc); + } + // _POP_TOP_UNICODE + { + value = l; + assert(PyUnicode_CheckExact(PyStackRef_AsPyObjectBorrow(value))); + PyStackRef_CLOSE_SPECIALIZED(value, _PyUnicode_ExactDealloc); } stack_pointer[-2] = res; stack_pointer += -1; diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c index 31ec88e1c84912..e3921054f7cb43 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -298,12 +298,14 @@ dummy_func(void) { r = right; } - op(_BINARY_OP_ADD_UNICODE, (left, right -- res)) { + op(_BINARY_OP_ADD_UNICODE, (left, right -- res, l, r)) { REPLACE_OPCODE_IF_EVALUATES_PURE(left, right); res = sym_new_type(ctx, &PyUnicode_Type); + l = left; + r = right; } - op(_BINARY_OP_INPLACE_ADD_UNICODE, (left, right -- )) { + op(_BINARY_OP_INPLACE_ADD_UNICODE, (left, right --)) { JitOptRef res; if (sym_is_const(ctx, left) && sym_is_const(ctx, right)) { assert(PyUnicode_CheckExact(sym_get_const(ctx, left))); @@ -563,6 +565,12 @@ dummy_func(void) { } } + op(_POP_TOP_UNICODE, (value --)) { + if (PyJitRef_IsBorrowed(value)) { + REPLACE_OP(this_instr, _POP_TOP_NOP, 0, 0); + } + } + op(_COPY, (bottom, unused[oparg-1] -- bottom, unused[oparg-1], top)) { assert(oparg > 0); top = bottom; diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 6fde87a17fbaa3..32d60c76a4f3ce 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -165,6 +165,11 @@ } case _POP_TOP_UNICODE: { + JitOptRef value; + value = stack_pointer[-1]; + if (PyJitRef_IsBorrowed(value)) { + REPLACE_OP(this_instr, _POP_TOP_NOP, 0, 0); + } CHECK_STACK_BOUNDS(-1); stack_pointer += -1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); @@ -637,6 +642,8 @@ JitOptRef right; JitOptRef left; JitOptRef res; + JitOptRef l; + JitOptRef r; right = stack_pointer[-1]; left = stack_pointer[-2]; if ( @@ -648,6 +655,8 @@ _PyStackRef left = sym_get_const_as_stackref(ctx, left_sym); _PyStackRef right = sym_get_const_as_stackref(ctx, right_sym); _PyStackRef res_stackref; + _PyStackRef l_stackref; + _PyStackRef r_stackref; /* Start of uop copied from bytecodes for constant evaluation */ PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); @@ -655,31 +664,32 @@ assert(PyUnicode_CheckExact(right_o)); STAT_INC(BINARY_OP, hit); PyObject *res_o = PyUnicode_Concat(left_o, right_o); - PyStackRef_CLOSE_SPECIALIZED(right, _PyUnicode_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(left, _PyUnicode_ExactDealloc); - if (res_o == NULL) { - goto error; - } res_stackref = PyStackRef_FromPyObjectSteal(res_o); + if (PyStackRef_IsNull(res)) { + JUMP_TO_LABEL(error); + } + l_stackref = left; + r_stackref = right; /* End of uop copied from bytecodes for constant evaluation */ res = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(res_stackref)); - if (sym_is_const(ctx, res)) { - PyObject *result = sym_get_const(ctx, res); - if (_Py_IsImmortal(result)) { - // Replace with _POP_TWO_LOAD_CONST_INLINE_BORROW since we have two inputs and an immortal result - REPLACE_OP(this_instr, _POP_TWO_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)result); - } - } - CHECK_STACK_BOUNDS(-1); + l = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(l_stackref)); + r = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(r_stackref)); + CHECK_STACK_BOUNDS(1); stack_pointer[-2] = res; - stack_pointer += -1; + stack_pointer[-1] = l; + stack_pointer[0] = r; + stack_pointer += 1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); break; } res = sym_new_type(ctx, &PyUnicode_Type); - CHECK_STACK_BOUNDS(-1); + l = left; + r = right; + CHECK_STACK_BOUNDS(1); stack_pointer[-2] = res; - stack_pointer += -1; + stack_pointer[-1] = l; + stack_pointer[0] = r; + stack_pointer += 1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); break; }