From 1f97a49bd355f55febaacf164e1752e5cd71ec53 Mon Sep 17 00:00:00 2001 From: Brij <97006829+bkap123@users.noreply.github.com> Date: Sun, 15 Mar 2026 21:57:25 -0400 Subject: [PATCH 1/3] gh-145854: Replace `DELETE_NAME` with `PUSH_NULL; STORE_NAME` Changes - Removed `DELETE_NAME` - When `STORE_NAME` receives a `NULL` value, it corresponds with deletion --- Doc/library/dis.rst | 8 +- Include/internal/pycore_opcode_metadata.h | 13 +- Include/internal/pycore_uop_ids.h | 1466 ++++++++++----------- Include/internal/pycore_uop_metadata.h | 30 - Include/opcode_ids.h | 111 +- Lib/_opcode_metadata.py | 111 +- Lib/test/test_code.py | 3 +- Modules/_testinternalcapi/test_cases.c.h | 71 +- Modules/_testinternalcapi/test_targets.h | 9 +- Programs/test_frozenmain.h | 18 +- Python/bytecodes.c | 43 +- Python/codegen.c | 5 +- Python/executor_cases.c.h | 94 +- Python/generated_cases.c.h | 71 +- Python/opcode_targets.h | 9 +- Python/optimizer_cases.c.h | 11 +- 16 files changed, 946 insertions(+), 1127 deletions(-) diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst index 1f7014e9cd426f..6f43a20caa31d7 100644 --- a/Doc/library/dis.rst +++ b/Doc/library/dis.rst @@ -1031,12 +1031,6 @@ iterations of the loop. The compiler tries to use :opcode:`STORE_FAST` or :opcode:`STORE_GLOBAL` if possible. -.. opcode:: DELETE_NAME (namei) - - Implements ``del name``, where *namei* is the index into :attr:`~codeobject.co_names` - attribute of the :ref:`code object `. - - .. opcode:: UNPACK_SEQUENCE (count) Unpacks ``STACK[-1]`` into *count* individual values, which are put onto the stack @@ -1094,7 +1088,7 @@ iterations of the loop. .. opcode:: DELETE_GLOBAL (namei) - Works as :opcode:`DELETE_NAME`, but deletes a global name. + Deletes a global name. .. opcode:: LOAD_CONST (consti) diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h index c64d4e8ba85b3d..c8b2f3d8f37ce4 100644 --- a/Include/internal/pycore_opcode_metadata.h +++ b/Include/internal/pycore_opcode_metadata.h @@ -186,8 +186,6 @@ int _PyOpcode_num_popped(int opcode, int oparg) { return 0; case DELETE_GLOBAL: return 0; - case DELETE_NAME: - return 0; case DELETE_SUBSCR: return 2; case DICT_MERGE: @@ -677,8 +675,6 @@ int _PyOpcode_num_pushed(int opcode, int oparg) { return 0; case DELETE_GLOBAL: return 0; - case DELETE_NAME: - return 0; case DELETE_SUBSCR: return 0; case DICT_MERGE: @@ -1166,7 +1162,6 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [DELETE_DEREF] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_FREE_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [DELETE_FAST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_LOCAL_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [DELETE_GLOBAL] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, - [DELETE_NAME] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [DELETE_SUBSCR] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [DICT_MERGE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [DICT_UPDATE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, @@ -1297,7 +1292,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[267] = { [STORE_FAST_LOAD_FAST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_LOCAL_FLAG | HAS_ESCAPES_FLAG }, [STORE_FAST_STORE_FAST] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_LOCAL_FLAG | HAS_ESCAPES_FLAG }, [STORE_GLOBAL] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, - [STORE_NAME] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, + [STORE_NAME] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [STORE_SLICE] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [STORE_SUBSCR] = { true, INSTR_FMT_IXC, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [STORE_SUBSCR_DICT] = { true, INSTR_FMT_IXC, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, @@ -1414,7 +1409,6 @@ _PyOpcode_macro_expansion[256] = { [DELETE_DEREF] = { .nuops = 1, .uops = { { _DELETE_DEREF, OPARG_SIMPLE, 0 } } }, [DELETE_FAST] = { .nuops = 1, .uops = { { _DELETE_FAST, OPARG_SIMPLE, 0 } } }, [DELETE_GLOBAL] = { .nuops = 1, .uops = { { _DELETE_GLOBAL, OPARG_SIMPLE, 0 } } }, - [DELETE_NAME] = { .nuops = 1, .uops = { { _DELETE_NAME, OPARG_SIMPLE, 0 } } }, [DELETE_SUBSCR] = { .nuops = 1, .uops = { { _DELETE_SUBSCR, OPARG_SIMPLE, 0 } } }, [DICT_MERGE] = { .nuops = 1, .uops = { { _DICT_MERGE, OPARG_SIMPLE, 0 } } }, [DICT_UPDATE] = { .nuops = 1, .uops = { { _DICT_UPDATE, OPARG_SIMPLE, 0 } } }, @@ -1510,7 +1504,6 @@ _PyOpcode_macro_expansion[256] = { [STORE_FAST_LOAD_FAST] = { .nuops = 3, .uops = { { _SWAP_FAST, OPARG_TOP, 0 }, { _POP_TOP, OPARG_TOP, 0 }, { _LOAD_FAST, OPARG_BOTTOM, 0 } } }, [STORE_FAST_STORE_FAST] = { .nuops = 4, .uops = { { _SWAP_FAST, OPARG_TOP, 0 }, { _POP_TOP, OPARG_TOP, 0 }, { _SWAP_FAST, OPARG_BOTTOM, 0 }, { _POP_TOP, OPARG_BOTTOM, 0 } } }, [STORE_GLOBAL] = { .nuops = 1, .uops = { { _STORE_GLOBAL, OPARG_SIMPLE, 0 } } }, - [STORE_NAME] = { .nuops = 1, .uops = { { _STORE_NAME, OPARG_SIMPLE, 0 } } }, [STORE_SLICE] = { .nuops = 1, .uops = { { _STORE_SLICE, OPARG_SIMPLE, 0 } } }, [STORE_SUBSCR] = { .nuops = 1, .uops = { { _STORE_SUBSCR, OPARG_SIMPLE, 0 } } }, [STORE_SUBSCR_DICT] = { .nuops = 3, .uops = { { _GUARD_NOS_DICT, OPARG_SIMPLE, 0 }, { _STORE_SUBSCR_DICT, OPARG_SIMPLE, 1 }, { _POP_TOP, OPARG_SIMPLE, 1 } } }, @@ -1614,7 +1607,6 @@ const char *_PyOpcode_OpName[267] = { [DELETE_DEREF] = "DELETE_DEREF", [DELETE_FAST] = "DELETE_FAST", [DELETE_GLOBAL] = "DELETE_GLOBAL", - [DELETE_NAME] = "DELETE_NAME", [DELETE_SUBSCR] = "DELETE_SUBSCR", [DICT_MERGE] = "DICT_MERGE", [DICT_UPDATE] = "DICT_UPDATE", @@ -1811,6 +1803,7 @@ const uint8_t _PyOpcode_Caches[256] = { PyAPI_DATA(const uint8_t) _PyOpcode_Deopt[256]; #ifdef NEED_OPCODE_METADATA const uint8_t _PyOpcode_Deopt[256] = { + [120] = 120, [121] = 121, [122] = 122, [123] = 123, @@ -1912,7 +1905,6 @@ const uint8_t _PyOpcode_Deopt[256] = { [DELETE_DEREF] = DELETE_DEREF, [DELETE_FAST] = DELETE_FAST, [DELETE_GLOBAL] = DELETE_GLOBAL, - [DELETE_NAME] = DELETE_NAME, [DELETE_SUBSCR] = DELETE_SUBSCR, [DICT_MERGE] = DICT_MERGE, [DICT_UPDATE] = DICT_UPDATE, @@ -2072,6 +2064,7 @@ const uint8_t _PyOpcode_Deopt[256] = { #endif // NEED_OPCODE_METADATA #define EXTRA_CASES \ + case 120: \ case 121: \ case 122: \ case 123: \ diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index 0fdeb56122ecc7..c0cebb6a9b38f7 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -102,7 +102,6 @@ extern "C" { #define _DELETE_DEREF DELETE_DEREF #define _DELETE_FAST DELETE_FAST #define _DELETE_GLOBAL DELETE_GLOBAL -#define _DELETE_NAME DELETE_NAME #define _DELETE_SUBSCR DELETE_SUBSCR #define _DEOPT 375 #define _DICT_MERGE DICT_MERGE @@ -554,739 +553,738 @@ extern "C" { #define _DELETE_DEREF_r00 754 #define _DELETE_FAST_r00 755 #define _DELETE_GLOBAL_r00 756 -#define _DELETE_NAME_r00 757 -#define _DELETE_SUBSCR_r20 758 -#define _DEOPT_r00 759 -#define _DEOPT_r10 760 -#define _DEOPT_r20 761 -#define _DEOPT_r30 762 -#define _DICT_MERGE_r10 763 -#define _DICT_UPDATE_r10 764 -#define _DO_CALL_r01 765 -#define _DO_CALL_FUNCTION_EX_r31 766 -#define _DO_CALL_KW_r11 767 -#define _DYNAMIC_EXIT_r00 768 -#define _DYNAMIC_EXIT_r10 769 -#define _DYNAMIC_EXIT_r20 770 -#define _DYNAMIC_EXIT_r30 771 -#define _END_FOR_r10 772 -#define _END_SEND_r21 773 -#define _ERROR_POP_N_r00 774 -#define _EXIT_INIT_CHECK_r10 775 -#define _EXIT_TRACE_r00 776 -#define _EXIT_TRACE_r10 777 -#define _EXIT_TRACE_r20 778 -#define _EXIT_TRACE_r30 779 -#define _EXPAND_METHOD_r00 780 -#define _EXPAND_METHOD_KW_r11 781 -#define _FATAL_ERROR_r00 782 -#define _FATAL_ERROR_r11 783 -#define _FATAL_ERROR_r22 784 -#define _FATAL_ERROR_r33 785 -#define _FORMAT_SIMPLE_r11 786 -#define _FORMAT_WITH_SPEC_r21 787 -#define _FOR_ITER_r23 788 -#define _FOR_ITER_GEN_FRAME_r03 789 -#define _FOR_ITER_GEN_FRAME_r13 790 -#define _FOR_ITER_GEN_FRAME_r23 791 -#define _FOR_ITER_TIER_TWO_r23 792 -#define _GET_AITER_r11 793 -#define _GET_ANEXT_r12 794 -#define _GET_AWAITABLE_r11 795 -#define _GET_ITER_r12 796 -#define _GET_LEN_r12 797 -#define _GET_YIELD_FROM_ITER_r11 798 -#define _GUARD_BINARY_OP_EXTEND_r22 799 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r02 800 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r12 801 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r22 802 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r33 803 -#define _GUARD_BIT_IS_SET_POP_r00 804 -#define _GUARD_BIT_IS_SET_POP_r10 805 -#define _GUARD_BIT_IS_SET_POP_r21 806 -#define _GUARD_BIT_IS_SET_POP_r32 807 -#define _GUARD_BIT_IS_SET_POP_4_r00 808 -#define _GUARD_BIT_IS_SET_POP_4_r10 809 -#define _GUARD_BIT_IS_SET_POP_4_r21 810 -#define _GUARD_BIT_IS_SET_POP_4_r32 811 -#define _GUARD_BIT_IS_SET_POP_5_r00 812 -#define _GUARD_BIT_IS_SET_POP_5_r10 813 -#define _GUARD_BIT_IS_SET_POP_5_r21 814 -#define _GUARD_BIT_IS_SET_POP_5_r32 815 -#define _GUARD_BIT_IS_SET_POP_6_r00 816 -#define _GUARD_BIT_IS_SET_POP_6_r10 817 -#define _GUARD_BIT_IS_SET_POP_6_r21 818 -#define _GUARD_BIT_IS_SET_POP_6_r32 819 -#define _GUARD_BIT_IS_SET_POP_7_r00 820 -#define _GUARD_BIT_IS_SET_POP_7_r10 821 -#define _GUARD_BIT_IS_SET_POP_7_r21 822 -#define _GUARD_BIT_IS_SET_POP_7_r32 823 -#define _GUARD_BIT_IS_UNSET_POP_r00 824 -#define _GUARD_BIT_IS_UNSET_POP_r10 825 -#define _GUARD_BIT_IS_UNSET_POP_r21 826 -#define _GUARD_BIT_IS_UNSET_POP_r32 827 -#define _GUARD_BIT_IS_UNSET_POP_4_r00 828 -#define _GUARD_BIT_IS_UNSET_POP_4_r10 829 -#define _GUARD_BIT_IS_UNSET_POP_4_r21 830 -#define _GUARD_BIT_IS_UNSET_POP_4_r32 831 -#define _GUARD_BIT_IS_UNSET_POP_5_r00 832 -#define _GUARD_BIT_IS_UNSET_POP_5_r10 833 -#define _GUARD_BIT_IS_UNSET_POP_5_r21 834 -#define _GUARD_BIT_IS_UNSET_POP_5_r32 835 -#define _GUARD_BIT_IS_UNSET_POP_6_r00 836 -#define _GUARD_BIT_IS_UNSET_POP_6_r10 837 -#define _GUARD_BIT_IS_UNSET_POP_6_r21 838 -#define _GUARD_BIT_IS_UNSET_POP_6_r32 839 -#define _GUARD_BIT_IS_UNSET_POP_7_r00 840 -#define _GUARD_BIT_IS_UNSET_POP_7_r10 841 -#define _GUARD_BIT_IS_UNSET_POP_7_r21 842 -#define _GUARD_BIT_IS_UNSET_POP_7_r32 843 -#define _GUARD_CALLABLE_ISINSTANCE_r03 844 -#define _GUARD_CALLABLE_ISINSTANCE_r13 845 -#define _GUARD_CALLABLE_ISINSTANCE_r23 846 -#define _GUARD_CALLABLE_ISINSTANCE_r33 847 -#define _GUARD_CALLABLE_LEN_r03 848 -#define _GUARD_CALLABLE_LEN_r13 849 -#define _GUARD_CALLABLE_LEN_r23 850 -#define _GUARD_CALLABLE_LEN_r33 851 -#define _GUARD_CALLABLE_LIST_APPEND_r03 852 -#define _GUARD_CALLABLE_LIST_APPEND_r13 853 -#define _GUARD_CALLABLE_LIST_APPEND_r23 854 -#define _GUARD_CALLABLE_LIST_APPEND_r33 855 -#define _GUARD_CALLABLE_STR_1_r03 856 -#define _GUARD_CALLABLE_STR_1_r13 857 -#define _GUARD_CALLABLE_STR_1_r23 858 -#define _GUARD_CALLABLE_STR_1_r33 859 -#define _GUARD_CALLABLE_TUPLE_1_r03 860 -#define _GUARD_CALLABLE_TUPLE_1_r13 861 -#define _GUARD_CALLABLE_TUPLE_1_r23 862 -#define _GUARD_CALLABLE_TUPLE_1_r33 863 -#define _GUARD_CALLABLE_TYPE_1_r03 864 -#define _GUARD_CALLABLE_TYPE_1_r13 865 -#define _GUARD_CALLABLE_TYPE_1_r23 866 -#define _GUARD_CALLABLE_TYPE_1_r33 867 -#define _GUARD_CODE_VERSION_r00 868 -#define _GUARD_CODE_VERSION_r11 869 -#define _GUARD_CODE_VERSION_r22 870 -#define _GUARD_CODE_VERSION_r33 871 -#define _GUARD_DORV_NO_DICT_r01 872 -#define _GUARD_DORV_NO_DICT_r11 873 -#define _GUARD_DORV_NO_DICT_r22 874 -#define _GUARD_DORV_NO_DICT_r33 875 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 876 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 877 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 878 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 879 -#define _GUARD_GLOBALS_VERSION_r00 880 -#define _GUARD_GLOBALS_VERSION_r11 881 -#define _GUARD_GLOBALS_VERSION_r22 882 -#define _GUARD_GLOBALS_VERSION_r33 883 -#define _GUARD_IP_RETURN_GENERATOR_r00 884 -#define _GUARD_IP_RETURN_GENERATOR_r11 885 -#define _GUARD_IP_RETURN_GENERATOR_r22 886 -#define _GUARD_IP_RETURN_GENERATOR_r33 887 -#define _GUARD_IP_RETURN_VALUE_r00 888 -#define _GUARD_IP_RETURN_VALUE_r11 889 -#define _GUARD_IP_RETURN_VALUE_r22 890 -#define _GUARD_IP_RETURN_VALUE_r33 891 -#define _GUARD_IP_YIELD_VALUE_r00 892 -#define _GUARD_IP_YIELD_VALUE_r11 893 -#define _GUARD_IP_YIELD_VALUE_r22 894 -#define _GUARD_IP_YIELD_VALUE_r33 895 -#define _GUARD_IP__PUSH_FRAME_r00 896 -#define _GUARD_IP__PUSH_FRAME_r11 897 -#define _GUARD_IP__PUSH_FRAME_r22 898 -#define _GUARD_IP__PUSH_FRAME_r33 899 -#define _GUARD_IS_FALSE_POP_r00 900 -#define _GUARD_IS_FALSE_POP_r10 901 -#define _GUARD_IS_FALSE_POP_r21 902 -#define _GUARD_IS_FALSE_POP_r32 903 -#define _GUARD_IS_NONE_POP_r00 904 -#define _GUARD_IS_NONE_POP_r10 905 -#define _GUARD_IS_NONE_POP_r21 906 -#define _GUARD_IS_NONE_POP_r32 907 -#define _GUARD_IS_NOT_NONE_POP_r10 908 -#define _GUARD_IS_TRUE_POP_r00 909 -#define _GUARD_IS_TRUE_POP_r10 910 -#define _GUARD_IS_TRUE_POP_r21 911 -#define _GUARD_IS_TRUE_POP_r32 912 -#define _GUARD_KEYS_VERSION_r01 913 -#define _GUARD_KEYS_VERSION_r11 914 -#define _GUARD_KEYS_VERSION_r22 915 -#define _GUARD_KEYS_VERSION_r33 916 -#define _GUARD_NOS_ANY_DICT_r02 917 -#define _GUARD_NOS_ANY_DICT_r12 918 -#define _GUARD_NOS_ANY_DICT_r22 919 -#define _GUARD_NOS_ANY_DICT_r33 920 -#define _GUARD_NOS_COMPACT_ASCII_r02 921 -#define _GUARD_NOS_COMPACT_ASCII_r12 922 -#define _GUARD_NOS_COMPACT_ASCII_r22 923 -#define _GUARD_NOS_COMPACT_ASCII_r33 924 -#define _GUARD_NOS_DICT_r02 925 -#define _GUARD_NOS_DICT_r12 926 -#define _GUARD_NOS_DICT_r22 927 -#define _GUARD_NOS_DICT_r33 928 -#define _GUARD_NOS_FLOAT_r02 929 -#define _GUARD_NOS_FLOAT_r12 930 -#define _GUARD_NOS_FLOAT_r22 931 -#define _GUARD_NOS_FLOAT_r33 932 -#define _GUARD_NOS_INT_r02 933 -#define _GUARD_NOS_INT_r12 934 -#define _GUARD_NOS_INT_r22 935 -#define _GUARD_NOS_INT_r33 936 -#define _GUARD_NOS_LIST_r02 937 -#define _GUARD_NOS_LIST_r12 938 -#define _GUARD_NOS_LIST_r22 939 -#define _GUARD_NOS_LIST_r33 940 -#define _GUARD_NOS_NOT_NULL_r02 941 -#define _GUARD_NOS_NOT_NULL_r12 942 -#define _GUARD_NOS_NOT_NULL_r22 943 -#define _GUARD_NOS_NOT_NULL_r33 944 -#define _GUARD_NOS_NULL_r02 945 -#define _GUARD_NOS_NULL_r12 946 -#define _GUARD_NOS_NULL_r22 947 -#define _GUARD_NOS_NULL_r33 948 -#define _GUARD_NOS_OVERFLOWED_r02 949 -#define _GUARD_NOS_OVERFLOWED_r12 950 -#define _GUARD_NOS_OVERFLOWED_r22 951 -#define _GUARD_NOS_OVERFLOWED_r33 952 -#define _GUARD_NOS_TUPLE_r02 953 -#define _GUARD_NOS_TUPLE_r12 954 -#define _GUARD_NOS_TUPLE_r22 955 -#define _GUARD_NOS_TUPLE_r33 956 -#define _GUARD_NOS_UNICODE_r02 957 -#define _GUARD_NOS_UNICODE_r12 958 -#define _GUARD_NOS_UNICODE_r22 959 -#define _GUARD_NOS_UNICODE_r33 960 -#define _GUARD_NOT_EXHAUSTED_LIST_r02 961 -#define _GUARD_NOT_EXHAUSTED_LIST_r12 962 -#define _GUARD_NOT_EXHAUSTED_LIST_r22 963 -#define _GUARD_NOT_EXHAUSTED_LIST_r33 964 -#define _GUARD_NOT_EXHAUSTED_RANGE_r02 965 -#define _GUARD_NOT_EXHAUSTED_RANGE_r12 966 -#define _GUARD_NOT_EXHAUSTED_RANGE_r22 967 -#define _GUARD_NOT_EXHAUSTED_RANGE_r33 968 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 969 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 970 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 971 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 972 -#define _GUARD_THIRD_NULL_r03 973 -#define _GUARD_THIRD_NULL_r13 974 -#define _GUARD_THIRD_NULL_r23 975 -#define _GUARD_THIRD_NULL_r33 976 -#define _GUARD_TOS_ANY_DICT_r01 977 -#define _GUARD_TOS_ANY_DICT_r11 978 -#define _GUARD_TOS_ANY_DICT_r22 979 -#define _GUARD_TOS_ANY_DICT_r33 980 -#define _GUARD_TOS_ANY_SET_r01 981 -#define _GUARD_TOS_ANY_SET_r11 982 -#define _GUARD_TOS_ANY_SET_r22 983 -#define _GUARD_TOS_ANY_SET_r33 984 -#define _GUARD_TOS_DICT_r01 985 -#define _GUARD_TOS_DICT_r11 986 -#define _GUARD_TOS_DICT_r22 987 -#define _GUARD_TOS_DICT_r33 988 -#define _GUARD_TOS_FLOAT_r01 989 -#define _GUARD_TOS_FLOAT_r11 990 -#define _GUARD_TOS_FLOAT_r22 991 -#define _GUARD_TOS_FLOAT_r33 992 -#define _GUARD_TOS_FROZENDICT_r01 993 -#define _GUARD_TOS_FROZENDICT_r11 994 -#define _GUARD_TOS_FROZENDICT_r22 995 -#define _GUARD_TOS_FROZENDICT_r33 996 -#define _GUARD_TOS_FROZENSET_r01 997 -#define _GUARD_TOS_FROZENSET_r11 998 -#define _GUARD_TOS_FROZENSET_r22 999 -#define _GUARD_TOS_FROZENSET_r33 1000 -#define _GUARD_TOS_INT_r01 1001 -#define _GUARD_TOS_INT_r11 1002 -#define _GUARD_TOS_INT_r22 1003 -#define _GUARD_TOS_INT_r33 1004 -#define _GUARD_TOS_LIST_r01 1005 -#define _GUARD_TOS_LIST_r11 1006 -#define _GUARD_TOS_LIST_r22 1007 -#define _GUARD_TOS_LIST_r33 1008 -#define _GUARD_TOS_OVERFLOWED_r01 1009 -#define _GUARD_TOS_OVERFLOWED_r11 1010 -#define _GUARD_TOS_OVERFLOWED_r22 1011 -#define _GUARD_TOS_OVERFLOWED_r33 1012 -#define _GUARD_TOS_SET_r01 1013 -#define _GUARD_TOS_SET_r11 1014 -#define _GUARD_TOS_SET_r22 1015 -#define _GUARD_TOS_SET_r33 1016 -#define _GUARD_TOS_SLICE_r01 1017 -#define _GUARD_TOS_SLICE_r11 1018 -#define _GUARD_TOS_SLICE_r22 1019 -#define _GUARD_TOS_SLICE_r33 1020 -#define _GUARD_TOS_TUPLE_r01 1021 -#define _GUARD_TOS_TUPLE_r11 1022 -#define _GUARD_TOS_TUPLE_r22 1023 -#define _GUARD_TOS_TUPLE_r33 1024 -#define _GUARD_TOS_UNICODE_r01 1025 -#define _GUARD_TOS_UNICODE_r11 1026 -#define _GUARD_TOS_UNICODE_r22 1027 -#define _GUARD_TOS_UNICODE_r33 1028 -#define _GUARD_TYPE_VERSION_r01 1029 -#define _GUARD_TYPE_VERSION_r11 1030 -#define _GUARD_TYPE_VERSION_r22 1031 -#define _GUARD_TYPE_VERSION_r33 1032 -#define _GUARD_TYPE_VERSION_LOCKED_r01 1033 -#define _GUARD_TYPE_VERSION_LOCKED_r11 1034 -#define _GUARD_TYPE_VERSION_LOCKED_r22 1035 -#define _GUARD_TYPE_VERSION_LOCKED_r33 1036 -#define _HANDLE_PENDING_AND_DEOPT_r00 1037 -#define _HANDLE_PENDING_AND_DEOPT_r10 1038 -#define _HANDLE_PENDING_AND_DEOPT_r20 1039 -#define _HANDLE_PENDING_AND_DEOPT_r30 1040 -#define _IMPORT_FROM_r12 1041 -#define _IMPORT_NAME_r21 1042 -#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 1043 -#define _INIT_CALL_PY_EXACT_ARGS_r01 1044 -#define _INIT_CALL_PY_EXACT_ARGS_0_r01 1045 -#define _INIT_CALL_PY_EXACT_ARGS_1_r01 1046 -#define _INIT_CALL_PY_EXACT_ARGS_2_r01 1047 -#define _INIT_CALL_PY_EXACT_ARGS_3_r01 1048 -#define _INIT_CALL_PY_EXACT_ARGS_4_r01 1049 -#define _INSERT_1_LOAD_CONST_INLINE_r02 1050 -#define _INSERT_1_LOAD_CONST_INLINE_r12 1051 -#define _INSERT_1_LOAD_CONST_INLINE_r23 1052 -#define _INSERT_1_LOAD_CONST_INLINE_BORROW_r02 1053 -#define _INSERT_1_LOAD_CONST_INLINE_BORROW_r12 1054 -#define _INSERT_1_LOAD_CONST_INLINE_BORROW_r23 1055 -#define _INSERT_2_LOAD_CONST_INLINE_BORROW_r03 1056 -#define _INSERT_2_LOAD_CONST_INLINE_BORROW_r13 1057 -#define _INSERT_2_LOAD_CONST_INLINE_BORROW_r23 1058 -#define _INSERT_NULL_r10 1059 -#define _INSTRUMENTED_FOR_ITER_r23 1060 -#define _INSTRUMENTED_INSTRUCTION_r00 1061 -#define _INSTRUMENTED_JUMP_FORWARD_r00 1062 -#define _INSTRUMENTED_JUMP_FORWARD_r11 1063 -#define _INSTRUMENTED_JUMP_FORWARD_r22 1064 -#define _INSTRUMENTED_JUMP_FORWARD_r33 1065 -#define _INSTRUMENTED_LINE_r00 1066 -#define _INSTRUMENTED_NOT_TAKEN_r00 1067 -#define _INSTRUMENTED_NOT_TAKEN_r11 1068 -#define _INSTRUMENTED_NOT_TAKEN_r22 1069 -#define _INSTRUMENTED_NOT_TAKEN_r33 1070 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 1071 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 1072 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 1073 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 1074 -#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 1075 -#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 1076 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 1077 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 1078 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 1079 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 1080 -#define _IS_NONE_r11 1081 -#define _IS_OP_r03 1082 -#define _IS_OP_r13 1083 -#define _IS_OP_r23 1084 -#define _ITER_CHECK_LIST_r02 1085 -#define _ITER_CHECK_LIST_r12 1086 -#define _ITER_CHECK_LIST_r22 1087 -#define _ITER_CHECK_LIST_r33 1088 -#define _ITER_CHECK_RANGE_r02 1089 -#define _ITER_CHECK_RANGE_r12 1090 -#define _ITER_CHECK_RANGE_r22 1091 -#define _ITER_CHECK_RANGE_r33 1092 -#define _ITER_CHECK_TUPLE_r02 1093 -#define _ITER_CHECK_TUPLE_r12 1094 -#define _ITER_CHECK_TUPLE_r22 1095 -#define _ITER_CHECK_TUPLE_r33 1096 -#define _ITER_JUMP_LIST_r02 1097 -#define _ITER_JUMP_LIST_r12 1098 -#define _ITER_JUMP_LIST_r22 1099 -#define _ITER_JUMP_LIST_r33 1100 -#define _ITER_JUMP_RANGE_r02 1101 -#define _ITER_JUMP_RANGE_r12 1102 -#define _ITER_JUMP_RANGE_r22 1103 -#define _ITER_JUMP_RANGE_r33 1104 -#define _ITER_JUMP_TUPLE_r02 1105 -#define _ITER_JUMP_TUPLE_r12 1106 -#define _ITER_JUMP_TUPLE_r22 1107 -#define _ITER_JUMP_TUPLE_r33 1108 -#define _ITER_NEXT_LIST_r23 1109 -#define _ITER_NEXT_LIST_TIER_TWO_r23 1110 -#define _ITER_NEXT_RANGE_r03 1111 -#define _ITER_NEXT_RANGE_r13 1112 -#define _ITER_NEXT_RANGE_r23 1113 -#define _ITER_NEXT_TUPLE_r03 1114 -#define _ITER_NEXT_TUPLE_r13 1115 -#define _ITER_NEXT_TUPLE_r23 1116 -#define _JUMP_BACKWARD_NO_INTERRUPT_r00 1117 -#define _JUMP_BACKWARD_NO_INTERRUPT_r11 1118 -#define _JUMP_BACKWARD_NO_INTERRUPT_r22 1119 -#define _JUMP_BACKWARD_NO_INTERRUPT_r33 1120 -#define _JUMP_TO_TOP_r00 1121 -#define _LIST_APPEND_r10 1122 -#define _LIST_EXTEND_r10 1123 -#define _LOAD_ATTR_r10 1124 -#define _LOAD_ATTR_CLASS_r11 1125 -#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_r11 1126 -#define _LOAD_ATTR_INSTANCE_VALUE_r02 1127 -#define _LOAD_ATTR_INSTANCE_VALUE_r12 1128 -#define _LOAD_ATTR_INSTANCE_VALUE_r23 1129 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 1130 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 1131 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 1132 -#define _LOAD_ATTR_METHOD_NO_DICT_r02 1133 -#define _LOAD_ATTR_METHOD_NO_DICT_r12 1134 -#define _LOAD_ATTR_METHOD_NO_DICT_r23 1135 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 1136 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 1137 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 1138 -#define _LOAD_ATTR_MODULE_r12 1139 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 1140 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 1141 -#define _LOAD_ATTR_PROPERTY_FRAME_r11 1142 -#define _LOAD_ATTR_SLOT_r02 1143 -#define _LOAD_ATTR_SLOT_r12 1144 -#define _LOAD_ATTR_SLOT_r23 1145 -#define _LOAD_ATTR_WITH_HINT_r12 1146 -#define _LOAD_BUILD_CLASS_r01 1147 -#define _LOAD_BYTECODE_r00 1148 -#define _LOAD_COMMON_CONSTANT_r01 1149 -#define _LOAD_COMMON_CONSTANT_r12 1150 -#define _LOAD_COMMON_CONSTANT_r23 1151 -#define _LOAD_CONST_r01 1152 -#define _LOAD_CONST_r12 1153 -#define _LOAD_CONST_r23 1154 -#define _LOAD_CONST_INLINE_r01 1155 -#define _LOAD_CONST_INLINE_r12 1156 -#define _LOAD_CONST_INLINE_r23 1157 -#define _LOAD_CONST_INLINE_BORROW_r01 1158 -#define _LOAD_CONST_INLINE_BORROW_r12 1159 -#define _LOAD_CONST_INLINE_BORROW_r23 1160 -#define _LOAD_CONST_UNDER_INLINE_r02 1161 -#define _LOAD_CONST_UNDER_INLINE_r12 1162 -#define _LOAD_CONST_UNDER_INLINE_r23 1163 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r02 1164 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r12 1165 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r23 1166 -#define _LOAD_DEREF_r01 1167 -#define _LOAD_FAST_r01 1168 -#define _LOAD_FAST_r12 1169 -#define _LOAD_FAST_r23 1170 -#define _LOAD_FAST_0_r01 1171 -#define _LOAD_FAST_0_r12 1172 -#define _LOAD_FAST_0_r23 1173 -#define _LOAD_FAST_1_r01 1174 -#define _LOAD_FAST_1_r12 1175 -#define _LOAD_FAST_1_r23 1176 -#define _LOAD_FAST_2_r01 1177 -#define _LOAD_FAST_2_r12 1178 -#define _LOAD_FAST_2_r23 1179 -#define _LOAD_FAST_3_r01 1180 -#define _LOAD_FAST_3_r12 1181 -#define _LOAD_FAST_3_r23 1182 -#define _LOAD_FAST_4_r01 1183 -#define _LOAD_FAST_4_r12 1184 -#define _LOAD_FAST_4_r23 1185 -#define _LOAD_FAST_5_r01 1186 -#define _LOAD_FAST_5_r12 1187 -#define _LOAD_FAST_5_r23 1188 -#define _LOAD_FAST_6_r01 1189 -#define _LOAD_FAST_6_r12 1190 -#define _LOAD_FAST_6_r23 1191 -#define _LOAD_FAST_7_r01 1192 -#define _LOAD_FAST_7_r12 1193 -#define _LOAD_FAST_7_r23 1194 -#define _LOAD_FAST_AND_CLEAR_r01 1195 -#define _LOAD_FAST_AND_CLEAR_r12 1196 -#define _LOAD_FAST_AND_CLEAR_r23 1197 -#define _LOAD_FAST_BORROW_r01 1198 -#define _LOAD_FAST_BORROW_r12 1199 -#define _LOAD_FAST_BORROW_r23 1200 -#define _LOAD_FAST_BORROW_0_r01 1201 -#define _LOAD_FAST_BORROW_0_r12 1202 -#define _LOAD_FAST_BORROW_0_r23 1203 -#define _LOAD_FAST_BORROW_1_r01 1204 -#define _LOAD_FAST_BORROW_1_r12 1205 -#define _LOAD_FAST_BORROW_1_r23 1206 -#define _LOAD_FAST_BORROW_2_r01 1207 -#define _LOAD_FAST_BORROW_2_r12 1208 -#define _LOAD_FAST_BORROW_2_r23 1209 -#define _LOAD_FAST_BORROW_3_r01 1210 -#define _LOAD_FAST_BORROW_3_r12 1211 -#define _LOAD_FAST_BORROW_3_r23 1212 -#define _LOAD_FAST_BORROW_4_r01 1213 -#define _LOAD_FAST_BORROW_4_r12 1214 -#define _LOAD_FAST_BORROW_4_r23 1215 -#define _LOAD_FAST_BORROW_5_r01 1216 -#define _LOAD_FAST_BORROW_5_r12 1217 -#define _LOAD_FAST_BORROW_5_r23 1218 -#define _LOAD_FAST_BORROW_6_r01 1219 -#define _LOAD_FAST_BORROW_6_r12 1220 -#define _LOAD_FAST_BORROW_6_r23 1221 -#define _LOAD_FAST_BORROW_7_r01 1222 -#define _LOAD_FAST_BORROW_7_r12 1223 -#define _LOAD_FAST_BORROW_7_r23 1224 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1225 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1226 -#define _LOAD_FAST_CHECK_r01 1227 -#define _LOAD_FAST_CHECK_r12 1228 -#define _LOAD_FAST_CHECK_r23 1229 -#define _LOAD_FAST_LOAD_FAST_r02 1230 -#define _LOAD_FAST_LOAD_FAST_r13 1231 -#define _LOAD_FROM_DICT_OR_DEREF_r11 1232 -#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1233 -#define _LOAD_GLOBAL_r00 1234 -#define _LOAD_GLOBAL_BUILTINS_r01 1235 -#define _LOAD_GLOBAL_MODULE_r01 1236 -#define _LOAD_LOCALS_r01 1237 -#define _LOAD_LOCALS_r12 1238 -#define _LOAD_LOCALS_r23 1239 -#define _LOAD_NAME_r01 1240 -#define _LOAD_SMALL_INT_r01 1241 -#define _LOAD_SMALL_INT_r12 1242 -#define _LOAD_SMALL_INT_r23 1243 -#define _LOAD_SMALL_INT_0_r01 1244 -#define _LOAD_SMALL_INT_0_r12 1245 -#define _LOAD_SMALL_INT_0_r23 1246 -#define _LOAD_SMALL_INT_1_r01 1247 -#define _LOAD_SMALL_INT_1_r12 1248 -#define _LOAD_SMALL_INT_1_r23 1249 -#define _LOAD_SMALL_INT_2_r01 1250 -#define _LOAD_SMALL_INT_2_r12 1251 -#define _LOAD_SMALL_INT_2_r23 1252 -#define _LOAD_SMALL_INT_3_r01 1253 -#define _LOAD_SMALL_INT_3_r12 1254 -#define _LOAD_SMALL_INT_3_r23 1255 -#define _LOAD_SPECIAL_r00 1256 -#define _LOAD_SUPER_ATTR_ATTR_r31 1257 -#define _LOAD_SUPER_ATTR_METHOD_r32 1258 -#define _LOCK_OBJECT_r01 1259 -#define _LOCK_OBJECT_r11 1260 -#define _LOCK_OBJECT_r22 1261 -#define _LOCK_OBJECT_r33 1262 -#define _MAKE_CALLARGS_A_TUPLE_r33 1263 -#define _MAKE_CELL_r00 1264 -#define _MAKE_FUNCTION_r11 1265 -#define _MAKE_HEAP_SAFE_r01 1266 -#define _MAKE_HEAP_SAFE_r11 1267 -#define _MAKE_HEAP_SAFE_r22 1268 -#define _MAKE_HEAP_SAFE_r33 1269 -#define _MAKE_WARM_r00 1270 -#define _MAKE_WARM_r11 1271 -#define _MAKE_WARM_r22 1272 -#define _MAKE_WARM_r33 1273 -#define _MAP_ADD_r20 1274 -#define _MATCH_CLASS_r33 1275 -#define _MATCH_KEYS_r23 1276 -#define _MATCH_MAPPING_r02 1277 -#define _MATCH_MAPPING_r12 1278 -#define _MATCH_MAPPING_r23 1279 -#define _MATCH_SEQUENCE_r02 1280 -#define _MATCH_SEQUENCE_r12 1281 -#define _MATCH_SEQUENCE_r23 1282 -#define _MAYBE_EXPAND_METHOD_r00 1283 -#define _MAYBE_EXPAND_METHOD_KW_r11 1284 -#define _MONITOR_CALL_r00 1285 -#define _MONITOR_CALL_KW_r11 1286 -#define _MONITOR_JUMP_BACKWARD_r00 1287 -#define _MONITOR_JUMP_BACKWARD_r11 1288 -#define _MONITOR_JUMP_BACKWARD_r22 1289 -#define _MONITOR_JUMP_BACKWARD_r33 1290 -#define _MONITOR_RESUME_r00 1291 -#define _NOP_r00 1292 -#define _NOP_r11 1293 -#define _NOP_r22 1294 -#define _NOP_r33 1295 -#define _POP_CALL_r20 1296 -#define _POP_CALL_LOAD_CONST_INLINE_BORROW_r21 1297 -#define _POP_CALL_ONE_r30 1298 -#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW_r31 1299 -#define _POP_CALL_TWO_r30 1300 -#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW_r31 1301 -#define _POP_EXCEPT_r10 1302 -#define _POP_ITER_r20 1303 -#define _POP_JUMP_IF_FALSE_r00 1304 -#define _POP_JUMP_IF_FALSE_r10 1305 -#define _POP_JUMP_IF_FALSE_r21 1306 -#define _POP_JUMP_IF_FALSE_r32 1307 -#define _POP_JUMP_IF_TRUE_r00 1308 -#define _POP_JUMP_IF_TRUE_r10 1309 -#define _POP_JUMP_IF_TRUE_r21 1310 -#define _POP_JUMP_IF_TRUE_r32 1311 -#define _POP_TOP_r10 1312 -#define _POP_TOP_FLOAT_r00 1313 -#define _POP_TOP_FLOAT_r10 1314 -#define _POP_TOP_FLOAT_r21 1315 -#define _POP_TOP_FLOAT_r32 1316 -#define _POP_TOP_INT_r00 1317 -#define _POP_TOP_INT_r10 1318 -#define _POP_TOP_INT_r21 1319 -#define _POP_TOP_INT_r32 1320 -#define _POP_TOP_LOAD_CONST_INLINE_r11 1321 -#define _POP_TOP_LOAD_CONST_INLINE_BORROW_r11 1322 -#define _POP_TOP_NOP_r00 1323 -#define _POP_TOP_NOP_r10 1324 -#define _POP_TOP_NOP_r21 1325 -#define _POP_TOP_NOP_r32 1326 -#define _POP_TOP_UNICODE_r00 1327 -#define _POP_TOP_UNICODE_r10 1328 -#define _POP_TOP_UNICODE_r21 1329 -#define _POP_TOP_UNICODE_r32 1330 -#define _POP_TWO_r20 1331 -#define _POP_TWO_LOAD_CONST_INLINE_BORROW_r21 1332 -#define _PUSH_EXC_INFO_r02 1333 -#define _PUSH_EXC_INFO_r12 1334 -#define _PUSH_EXC_INFO_r23 1335 -#define _PUSH_FRAME_r10 1336 -#define _PUSH_NULL_r01 1337 -#define _PUSH_NULL_r12 1338 -#define _PUSH_NULL_r23 1339 -#define _PUSH_NULL_CONDITIONAL_r00 1340 -#define _PY_FRAME_EX_r31 1341 -#define _PY_FRAME_GENERAL_r01 1342 -#define _PY_FRAME_KW_r11 1343 -#define _QUICKEN_RESUME_r00 1344 -#define _QUICKEN_RESUME_r11 1345 -#define _QUICKEN_RESUME_r22 1346 -#define _QUICKEN_RESUME_r33 1347 -#define _REPLACE_WITH_TRUE_r02 1348 -#define _REPLACE_WITH_TRUE_r12 1349 -#define _REPLACE_WITH_TRUE_r23 1350 -#define _RESUME_CHECK_r00 1351 -#define _RESUME_CHECK_r11 1352 -#define _RESUME_CHECK_r22 1353 -#define _RESUME_CHECK_r33 1354 -#define _RETURN_GENERATOR_r01 1355 -#define _RETURN_VALUE_r11 1356 -#define _SAVE_RETURN_OFFSET_r00 1357 -#define _SAVE_RETURN_OFFSET_r11 1358 -#define _SAVE_RETURN_OFFSET_r22 1359 -#define _SAVE_RETURN_OFFSET_r33 1360 -#define _SEND_r22 1361 -#define _SEND_GEN_FRAME_r22 1362 -#define _SETUP_ANNOTATIONS_r00 1363 -#define _SET_ADD_r10 1364 -#define _SET_FUNCTION_ATTRIBUTE_r01 1365 -#define _SET_FUNCTION_ATTRIBUTE_r11 1366 -#define _SET_FUNCTION_ATTRIBUTE_r21 1367 -#define _SET_FUNCTION_ATTRIBUTE_r32 1368 -#define _SET_IP_r00 1369 -#define _SET_IP_r11 1370 -#define _SET_IP_r22 1371 -#define _SET_IP_r33 1372 -#define _SET_UPDATE_r10 1373 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r02 1374 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r12 1375 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r22 1376 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r32 1377 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r03 1378 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r13 1379 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r23 1380 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r33 1381 -#define _SPILL_OR_RELOAD_r01 1382 -#define _SPILL_OR_RELOAD_r02 1383 -#define _SPILL_OR_RELOAD_r03 1384 -#define _SPILL_OR_RELOAD_r10 1385 -#define _SPILL_OR_RELOAD_r12 1386 -#define _SPILL_OR_RELOAD_r13 1387 -#define _SPILL_OR_RELOAD_r20 1388 -#define _SPILL_OR_RELOAD_r21 1389 -#define _SPILL_OR_RELOAD_r23 1390 -#define _SPILL_OR_RELOAD_r30 1391 -#define _SPILL_OR_RELOAD_r31 1392 -#define _SPILL_OR_RELOAD_r32 1393 -#define _START_EXECUTOR_r00 1394 -#define _STORE_ATTR_r20 1395 -#define _STORE_ATTR_INSTANCE_VALUE_r21 1396 -#define _STORE_ATTR_SLOT_r21 1397 -#define _STORE_ATTR_WITH_HINT_r21 1398 -#define _STORE_DEREF_r10 1399 -#define _STORE_FAST_LOAD_FAST_r11 1400 -#define _STORE_FAST_STORE_FAST_r20 1401 -#define _STORE_GLOBAL_r10 1402 -#define _STORE_NAME_r10 1403 -#define _STORE_SLICE_r30 1404 -#define _STORE_SUBSCR_r30 1405 -#define _STORE_SUBSCR_DICT_r31 1406 -#define _STORE_SUBSCR_LIST_INT_r32 1407 -#define _SWAP_r11 1408 -#define _SWAP_2_r02 1409 -#define _SWAP_2_r12 1410 -#define _SWAP_2_r22 1411 -#define _SWAP_2_r33 1412 -#define _SWAP_3_r03 1413 -#define _SWAP_3_r13 1414 -#define _SWAP_3_r23 1415 -#define _SWAP_3_r33 1416 -#define _SWAP_FAST_r01 1417 -#define _SWAP_FAST_r11 1418 -#define _SWAP_FAST_r22 1419 -#define _SWAP_FAST_r33 1420 -#define _SWAP_FAST_0_r01 1421 -#define _SWAP_FAST_0_r11 1422 -#define _SWAP_FAST_0_r22 1423 -#define _SWAP_FAST_0_r33 1424 -#define _SWAP_FAST_1_r01 1425 -#define _SWAP_FAST_1_r11 1426 -#define _SWAP_FAST_1_r22 1427 -#define _SWAP_FAST_1_r33 1428 -#define _SWAP_FAST_2_r01 1429 -#define _SWAP_FAST_2_r11 1430 -#define _SWAP_FAST_2_r22 1431 -#define _SWAP_FAST_2_r33 1432 -#define _SWAP_FAST_3_r01 1433 -#define _SWAP_FAST_3_r11 1434 -#define _SWAP_FAST_3_r22 1435 -#define _SWAP_FAST_3_r33 1436 -#define _SWAP_FAST_4_r01 1437 -#define _SWAP_FAST_4_r11 1438 -#define _SWAP_FAST_4_r22 1439 -#define _SWAP_FAST_4_r33 1440 -#define _SWAP_FAST_5_r01 1441 -#define _SWAP_FAST_5_r11 1442 -#define _SWAP_FAST_5_r22 1443 -#define _SWAP_FAST_5_r33 1444 -#define _SWAP_FAST_6_r01 1445 -#define _SWAP_FAST_6_r11 1446 -#define _SWAP_FAST_6_r22 1447 -#define _SWAP_FAST_6_r33 1448 -#define _SWAP_FAST_7_r01 1449 -#define _SWAP_FAST_7_r11 1450 -#define _SWAP_FAST_7_r22 1451 -#define _SWAP_FAST_7_r33 1452 -#define _TIER2_RESUME_CHECK_r00 1453 -#define _TIER2_RESUME_CHECK_r11 1454 -#define _TIER2_RESUME_CHECK_r22 1455 -#define _TIER2_RESUME_CHECK_r33 1456 -#define _TO_BOOL_r11 1457 -#define _TO_BOOL_BOOL_r01 1458 -#define _TO_BOOL_BOOL_r11 1459 -#define _TO_BOOL_BOOL_r22 1460 -#define _TO_BOOL_BOOL_r33 1461 -#define _TO_BOOL_INT_r02 1462 -#define _TO_BOOL_INT_r12 1463 -#define _TO_BOOL_INT_r23 1464 -#define _TO_BOOL_LIST_r02 1465 -#define _TO_BOOL_LIST_r12 1466 -#define _TO_BOOL_LIST_r23 1467 -#define _TO_BOOL_NONE_r01 1468 -#define _TO_BOOL_NONE_r11 1469 -#define _TO_BOOL_NONE_r22 1470 -#define _TO_BOOL_NONE_r33 1471 -#define _TO_BOOL_STR_r02 1472 -#define _TO_BOOL_STR_r12 1473 -#define _TO_BOOL_STR_r23 1474 -#define _TRACE_RECORD_r00 1475 -#define _UNARY_INVERT_r12 1476 -#define _UNARY_NEGATIVE_r12 1477 -#define _UNARY_NOT_r01 1478 -#define _UNARY_NOT_r11 1479 -#define _UNARY_NOT_r22 1480 -#define _UNARY_NOT_r33 1481 -#define _UNPACK_EX_r10 1482 -#define _UNPACK_SEQUENCE_r10 1483 -#define _UNPACK_SEQUENCE_LIST_r10 1484 -#define _UNPACK_SEQUENCE_TUPLE_r10 1485 -#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1486 -#define _WITH_EXCEPT_START_r33 1487 -#define _YIELD_VALUE_r11 1488 -#define MAX_UOP_REGS_ID 1488 +#define _DELETE_SUBSCR_r20 757 +#define _DEOPT_r00 758 +#define _DEOPT_r10 759 +#define _DEOPT_r20 760 +#define _DEOPT_r30 761 +#define _DICT_MERGE_r10 762 +#define _DICT_UPDATE_r10 763 +#define _DO_CALL_r01 764 +#define _DO_CALL_FUNCTION_EX_r31 765 +#define _DO_CALL_KW_r11 766 +#define _DYNAMIC_EXIT_r00 767 +#define _DYNAMIC_EXIT_r10 768 +#define _DYNAMIC_EXIT_r20 769 +#define _DYNAMIC_EXIT_r30 770 +#define _END_FOR_r10 771 +#define _END_SEND_r21 772 +#define _ERROR_POP_N_r00 773 +#define _EXIT_INIT_CHECK_r10 774 +#define _EXIT_TRACE_r00 775 +#define _EXIT_TRACE_r10 776 +#define _EXIT_TRACE_r20 777 +#define _EXIT_TRACE_r30 778 +#define _EXPAND_METHOD_r00 779 +#define _EXPAND_METHOD_KW_r11 780 +#define _FATAL_ERROR_r00 781 +#define _FATAL_ERROR_r11 782 +#define _FATAL_ERROR_r22 783 +#define _FATAL_ERROR_r33 784 +#define _FORMAT_SIMPLE_r11 785 +#define _FORMAT_WITH_SPEC_r21 786 +#define _FOR_ITER_r23 787 +#define _FOR_ITER_GEN_FRAME_r03 788 +#define _FOR_ITER_GEN_FRAME_r13 789 +#define _FOR_ITER_GEN_FRAME_r23 790 +#define _FOR_ITER_TIER_TWO_r23 791 +#define _GET_AITER_r11 792 +#define _GET_ANEXT_r12 793 +#define _GET_AWAITABLE_r11 794 +#define _GET_ITER_r12 795 +#define _GET_LEN_r12 796 +#define _GET_YIELD_FROM_ITER_r11 797 +#define _GUARD_BINARY_OP_EXTEND_r22 798 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r02 799 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r12 800 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r22 801 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r33 802 +#define _GUARD_BIT_IS_SET_POP_r00 803 +#define _GUARD_BIT_IS_SET_POP_r10 804 +#define _GUARD_BIT_IS_SET_POP_r21 805 +#define _GUARD_BIT_IS_SET_POP_r32 806 +#define _GUARD_BIT_IS_SET_POP_4_r00 807 +#define _GUARD_BIT_IS_SET_POP_4_r10 808 +#define _GUARD_BIT_IS_SET_POP_4_r21 809 +#define _GUARD_BIT_IS_SET_POP_4_r32 810 +#define _GUARD_BIT_IS_SET_POP_5_r00 811 +#define _GUARD_BIT_IS_SET_POP_5_r10 812 +#define _GUARD_BIT_IS_SET_POP_5_r21 813 +#define _GUARD_BIT_IS_SET_POP_5_r32 814 +#define _GUARD_BIT_IS_SET_POP_6_r00 815 +#define _GUARD_BIT_IS_SET_POP_6_r10 816 +#define _GUARD_BIT_IS_SET_POP_6_r21 817 +#define _GUARD_BIT_IS_SET_POP_6_r32 818 +#define _GUARD_BIT_IS_SET_POP_7_r00 819 +#define _GUARD_BIT_IS_SET_POP_7_r10 820 +#define _GUARD_BIT_IS_SET_POP_7_r21 821 +#define _GUARD_BIT_IS_SET_POP_7_r32 822 +#define _GUARD_BIT_IS_UNSET_POP_r00 823 +#define _GUARD_BIT_IS_UNSET_POP_r10 824 +#define _GUARD_BIT_IS_UNSET_POP_r21 825 +#define _GUARD_BIT_IS_UNSET_POP_r32 826 +#define _GUARD_BIT_IS_UNSET_POP_4_r00 827 +#define _GUARD_BIT_IS_UNSET_POP_4_r10 828 +#define _GUARD_BIT_IS_UNSET_POP_4_r21 829 +#define _GUARD_BIT_IS_UNSET_POP_4_r32 830 +#define _GUARD_BIT_IS_UNSET_POP_5_r00 831 +#define _GUARD_BIT_IS_UNSET_POP_5_r10 832 +#define _GUARD_BIT_IS_UNSET_POP_5_r21 833 +#define _GUARD_BIT_IS_UNSET_POP_5_r32 834 +#define _GUARD_BIT_IS_UNSET_POP_6_r00 835 +#define _GUARD_BIT_IS_UNSET_POP_6_r10 836 +#define _GUARD_BIT_IS_UNSET_POP_6_r21 837 +#define _GUARD_BIT_IS_UNSET_POP_6_r32 838 +#define _GUARD_BIT_IS_UNSET_POP_7_r00 839 +#define _GUARD_BIT_IS_UNSET_POP_7_r10 840 +#define _GUARD_BIT_IS_UNSET_POP_7_r21 841 +#define _GUARD_BIT_IS_UNSET_POP_7_r32 842 +#define _GUARD_CALLABLE_ISINSTANCE_r03 843 +#define _GUARD_CALLABLE_ISINSTANCE_r13 844 +#define _GUARD_CALLABLE_ISINSTANCE_r23 845 +#define _GUARD_CALLABLE_ISINSTANCE_r33 846 +#define _GUARD_CALLABLE_LEN_r03 847 +#define _GUARD_CALLABLE_LEN_r13 848 +#define _GUARD_CALLABLE_LEN_r23 849 +#define _GUARD_CALLABLE_LEN_r33 850 +#define _GUARD_CALLABLE_LIST_APPEND_r03 851 +#define _GUARD_CALLABLE_LIST_APPEND_r13 852 +#define _GUARD_CALLABLE_LIST_APPEND_r23 853 +#define _GUARD_CALLABLE_LIST_APPEND_r33 854 +#define _GUARD_CALLABLE_STR_1_r03 855 +#define _GUARD_CALLABLE_STR_1_r13 856 +#define _GUARD_CALLABLE_STR_1_r23 857 +#define _GUARD_CALLABLE_STR_1_r33 858 +#define _GUARD_CALLABLE_TUPLE_1_r03 859 +#define _GUARD_CALLABLE_TUPLE_1_r13 860 +#define _GUARD_CALLABLE_TUPLE_1_r23 861 +#define _GUARD_CALLABLE_TUPLE_1_r33 862 +#define _GUARD_CALLABLE_TYPE_1_r03 863 +#define _GUARD_CALLABLE_TYPE_1_r13 864 +#define _GUARD_CALLABLE_TYPE_1_r23 865 +#define _GUARD_CALLABLE_TYPE_1_r33 866 +#define _GUARD_CODE_VERSION_r00 867 +#define _GUARD_CODE_VERSION_r11 868 +#define _GUARD_CODE_VERSION_r22 869 +#define _GUARD_CODE_VERSION_r33 870 +#define _GUARD_DORV_NO_DICT_r01 871 +#define _GUARD_DORV_NO_DICT_r11 872 +#define _GUARD_DORV_NO_DICT_r22 873 +#define _GUARD_DORV_NO_DICT_r33 874 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 875 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 876 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 877 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 878 +#define _GUARD_GLOBALS_VERSION_r00 879 +#define _GUARD_GLOBALS_VERSION_r11 880 +#define _GUARD_GLOBALS_VERSION_r22 881 +#define _GUARD_GLOBALS_VERSION_r33 882 +#define _GUARD_IP_RETURN_GENERATOR_r00 883 +#define _GUARD_IP_RETURN_GENERATOR_r11 884 +#define _GUARD_IP_RETURN_GENERATOR_r22 885 +#define _GUARD_IP_RETURN_GENERATOR_r33 886 +#define _GUARD_IP_RETURN_VALUE_r00 887 +#define _GUARD_IP_RETURN_VALUE_r11 888 +#define _GUARD_IP_RETURN_VALUE_r22 889 +#define _GUARD_IP_RETURN_VALUE_r33 890 +#define _GUARD_IP_YIELD_VALUE_r00 891 +#define _GUARD_IP_YIELD_VALUE_r11 892 +#define _GUARD_IP_YIELD_VALUE_r22 893 +#define _GUARD_IP_YIELD_VALUE_r33 894 +#define _GUARD_IP__PUSH_FRAME_r00 895 +#define _GUARD_IP__PUSH_FRAME_r11 896 +#define _GUARD_IP__PUSH_FRAME_r22 897 +#define _GUARD_IP__PUSH_FRAME_r33 898 +#define _GUARD_IS_FALSE_POP_r00 899 +#define _GUARD_IS_FALSE_POP_r10 900 +#define _GUARD_IS_FALSE_POP_r21 901 +#define _GUARD_IS_FALSE_POP_r32 902 +#define _GUARD_IS_NONE_POP_r00 903 +#define _GUARD_IS_NONE_POP_r10 904 +#define _GUARD_IS_NONE_POP_r21 905 +#define _GUARD_IS_NONE_POP_r32 906 +#define _GUARD_IS_NOT_NONE_POP_r10 907 +#define _GUARD_IS_TRUE_POP_r00 908 +#define _GUARD_IS_TRUE_POP_r10 909 +#define _GUARD_IS_TRUE_POP_r21 910 +#define _GUARD_IS_TRUE_POP_r32 911 +#define _GUARD_KEYS_VERSION_r01 912 +#define _GUARD_KEYS_VERSION_r11 913 +#define _GUARD_KEYS_VERSION_r22 914 +#define _GUARD_KEYS_VERSION_r33 915 +#define _GUARD_NOS_ANY_DICT_r02 916 +#define _GUARD_NOS_ANY_DICT_r12 917 +#define _GUARD_NOS_ANY_DICT_r22 918 +#define _GUARD_NOS_ANY_DICT_r33 919 +#define _GUARD_NOS_COMPACT_ASCII_r02 920 +#define _GUARD_NOS_COMPACT_ASCII_r12 921 +#define _GUARD_NOS_COMPACT_ASCII_r22 922 +#define _GUARD_NOS_COMPACT_ASCII_r33 923 +#define _GUARD_NOS_DICT_r02 924 +#define _GUARD_NOS_DICT_r12 925 +#define _GUARD_NOS_DICT_r22 926 +#define _GUARD_NOS_DICT_r33 927 +#define _GUARD_NOS_FLOAT_r02 928 +#define _GUARD_NOS_FLOAT_r12 929 +#define _GUARD_NOS_FLOAT_r22 930 +#define _GUARD_NOS_FLOAT_r33 931 +#define _GUARD_NOS_INT_r02 932 +#define _GUARD_NOS_INT_r12 933 +#define _GUARD_NOS_INT_r22 934 +#define _GUARD_NOS_INT_r33 935 +#define _GUARD_NOS_LIST_r02 936 +#define _GUARD_NOS_LIST_r12 937 +#define _GUARD_NOS_LIST_r22 938 +#define _GUARD_NOS_LIST_r33 939 +#define _GUARD_NOS_NOT_NULL_r02 940 +#define _GUARD_NOS_NOT_NULL_r12 941 +#define _GUARD_NOS_NOT_NULL_r22 942 +#define _GUARD_NOS_NOT_NULL_r33 943 +#define _GUARD_NOS_NULL_r02 944 +#define _GUARD_NOS_NULL_r12 945 +#define _GUARD_NOS_NULL_r22 946 +#define _GUARD_NOS_NULL_r33 947 +#define _GUARD_NOS_OVERFLOWED_r02 948 +#define _GUARD_NOS_OVERFLOWED_r12 949 +#define _GUARD_NOS_OVERFLOWED_r22 950 +#define _GUARD_NOS_OVERFLOWED_r33 951 +#define _GUARD_NOS_TUPLE_r02 952 +#define _GUARD_NOS_TUPLE_r12 953 +#define _GUARD_NOS_TUPLE_r22 954 +#define _GUARD_NOS_TUPLE_r33 955 +#define _GUARD_NOS_UNICODE_r02 956 +#define _GUARD_NOS_UNICODE_r12 957 +#define _GUARD_NOS_UNICODE_r22 958 +#define _GUARD_NOS_UNICODE_r33 959 +#define _GUARD_NOT_EXHAUSTED_LIST_r02 960 +#define _GUARD_NOT_EXHAUSTED_LIST_r12 961 +#define _GUARD_NOT_EXHAUSTED_LIST_r22 962 +#define _GUARD_NOT_EXHAUSTED_LIST_r33 963 +#define _GUARD_NOT_EXHAUSTED_RANGE_r02 964 +#define _GUARD_NOT_EXHAUSTED_RANGE_r12 965 +#define _GUARD_NOT_EXHAUSTED_RANGE_r22 966 +#define _GUARD_NOT_EXHAUSTED_RANGE_r33 967 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 968 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 969 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 970 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 971 +#define _GUARD_THIRD_NULL_r03 972 +#define _GUARD_THIRD_NULL_r13 973 +#define _GUARD_THIRD_NULL_r23 974 +#define _GUARD_THIRD_NULL_r33 975 +#define _GUARD_TOS_ANY_DICT_r01 976 +#define _GUARD_TOS_ANY_DICT_r11 977 +#define _GUARD_TOS_ANY_DICT_r22 978 +#define _GUARD_TOS_ANY_DICT_r33 979 +#define _GUARD_TOS_ANY_SET_r01 980 +#define _GUARD_TOS_ANY_SET_r11 981 +#define _GUARD_TOS_ANY_SET_r22 982 +#define _GUARD_TOS_ANY_SET_r33 983 +#define _GUARD_TOS_DICT_r01 984 +#define _GUARD_TOS_DICT_r11 985 +#define _GUARD_TOS_DICT_r22 986 +#define _GUARD_TOS_DICT_r33 987 +#define _GUARD_TOS_FLOAT_r01 988 +#define _GUARD_TOS_FLOAT_r11 989 +#define _GUARD_TOS_FLOAT_r22 990 +#define _GUARD_TOS_FLOAT_r33 991 +#define _GUARD_TOS_FROZENDICT_r01 992 +#define _GUARD_TOS_FROZENDICT_r11 993 +#define _GUARD_TOS_FROZENDICT_r22 994 +#define _GUARD_TOS_FROZENDICT_r33 995 +#define _GUARD_TOS_FROZENSET_r01 996 +#define _GUARD_TOS_FROZENSET_r11 997 +#define _GUARD_TOS_FROZENSET_r22 998 +#define _GUARD_TOS_FROZENSET_r33 999 +#define _GUARD_TOS_INT_r01 1000 +#define _GUARD_TOS_INT_r11 1001 +#define _GUARD_TOS_INT_r22 1002 +#define _GUARD_TOS_INT_r33 1003 +#define _GUARD_TOS_LIST_r01 1004 +#define _GUARD_TOS_LIST_r11 1005 +#define _GUARD_TOS_LIST_r22 1006 +#define _GUARD_TOS_LIST_r33 1007 +#define _GUARD_TOS_OVERFLOWED_r01 1008 +#define _GUARD_TOS_OVERFLOWED_r11 1009 +#define _GUARD_TOS_OVERFLOWED_r22 1010 +#define _GUARD_TOS_OVERFLOWED_r33 1011 +#define _GUARD_TOS_SET_r01 1012 +#define _GUARD_TOS_SET_r11 1013 +#define _GUARD_TOS_SET_r22 1014 +#define _GUARD_TOS_SET_r33 1015 +#define _GUARD_TOS_SLICE_r01 1016 +#define _GUARD_TOS_SLICE_r11 1017 +#define _GUARD_TOS_SLICE_r22 1018 +#define _GUARD_TOS_SLICE_r33 1019 +#define _GUARD_TOS_TUPLE_r01 1020 +#define _GUARD_TOS_TUPLE_r11 1021 +#define _GUARD_TOS_TUPLE_r22 1022 +#define _GUARD_TOS_TUPLE_r33 1023 +#define _GUARD_TOS_UNICODE_r01 1024 +#define _GUARD_TOS_UNICODE_r11 1025 +#define _GUARD_TOS_UNICODE_r22 1026 +#define _GUARD_TOS_UNICODE_r33 1027 +#define _GUARD_TYPE_VERSION_r01 1028 +#define _GUARD_TYPE_VERSION_r11 1029 +#define _GUARD_TYPE_VERSION_r22 1030 +#define _GUARD_TYPE_VERSION_r33 1031 +#define _GUARD_TYPE_VERSION_LOCKED_r01 1032 +#define _GUARD_TYPE_VERSION_LOCKED_r11 1033 +#define _GUARD_TYPE_VERSION_LOCKED_r22 1034 +#define _GUARD_TYPE_VERSION_LOCKED_r33 1035 +#define _HANDLE_PENDING_AND_DEOPT_r00 1036 +#define _HANDLE_PENDING_AND_DEOPT_r10 1037 +#define _HANDLE_PENDING_AND_DEOPT_r20 1038 +#define _HANDLE_PENDING_AND_DEOPT_r30 1039 +#define _IMPORT_FROM_r12 1040 +#define _IMPORT_NAME_r21 1041 +#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 1042 +#define _INIT_CALL_PY_EXACT_ARGS_r01 1043 +#define _INIT_CALL_PY_EXACT_ARGS_0_r01 1044 +#define _INIT_CALL_PY_EXACT_ARGS_1_r01 1045 +#define _INIT_CALL_PY_EXACT_ARGS_2_r01 1046 +#define _INIT_CALL_PY_EXACT_ARGS_3_r01 1047 +#define _INIT_CALL_PY_EXACT_ARGS_4_r01 1048 +#define _INSERT_1_LOAD_CONST_INLINE_r02 1049 +#define _INSERT_1_LOAD_CONST_INLINE_r12 1050 +#define _INSERT_1_LOAD_CONST_INLINE_r23 1051 +#define _INSERT_1_LOAD_CONST_INLINE_BORROW_r02 1052 +#define _INSERT_1_LOAD_CONST_INLINE_BORROW_r12 1053 +#define _INSERT_1_LOAD_CONST_INLINE_BORROW_r23 1054 +#define _INSERT_2_LOAD_CONST_INLINE_BORROW_r03 1055 +#define _INSERT_2_LOAD_CONST_INLINE_BORROW_r13 1056 +#define _INSERT_2_LOAD_CONST_INLINE_BORROW_r23 1057 +#define _INSERT_NULL_r10 1058 +#define _INSTRUMENTED_FOR_ITER_r23 1059 +#define _INSTRUMENTED_INSTRUCTION_r00 1060 +#define _INSTRUMENTED_JUMP_FORWARD_r00 1061 +#define _INSTRUMENTED_JUMP_FORWARD_r11 1062 +#define _INSTRUMENTED_JUMP_FORWARD_r22 1063 +#define _INSTRUMENTED_JUMP_FORWARD_r33 1064 +#define _INSTRUMENTED_LINE_r00 1065 +#define _INSTRUMENTED_NOT_TAKEN_r00 1066 +#define _INSTRUMENTED_NOT_TAKEN_r11 1067 +#define _INSTRUMENTED_NOT_TAKEN_r22 1068 +#define _INSTRUMENTED_NOT_TAKEN_r33 1069 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 1070 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 1071 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 1072 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 1073 +#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 1074 +#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 1075 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 1076 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 1077 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 1078 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 1079 +#define _IS_NONE_r11 1080 +#define _IS_OP_r03 1081 +#define _IS_OP_r13 1082 +#define _IS_OP_r23 1083 +#define _ITER_CHECK_LIST_r02 1084 +#define _ITER_CHECK_LIST_r12 1085 +#define _ITER_CHECK_LIST_r22 1086 +#define _ITER_CHECK_LIST_r33 1087 +#define _ITER_CHECK_RANGE_r02 1088 +#define _ITER_CHECK_RANGE_r12 1089 +#define _ITER_CHECK_RANGE_r22 1090 +#define _ITER_CHECK_RANGE_r33 1091 +#define _ITER_CHECK_TUPLE_r02 1092 +#define _ITER_CHECK_TUPLE_r12 1093 +#define _ITER_CHECK_TUPLE_r22 1094 +#define _ITER_CHECK_TUPLE_r33 1095 +#define _ITER_JUMP_LIST_r02 1096 +#define _ITER_JUMP_LIST_r12 1097 +#define _ITER_JUMP_LIST_r22 1098 +#define _ITER_JUMP_LIST_r33 1099 +#define _ITER_JUMP_RANGE_r02 1100 +#define _ITER_JUMP_RANGE_r12 1101 +#define _ITER_JUMP_RANGE_r22 1102 +#define _ITER_JUMP_RANGE_r33 1103 +#define _ITER_JUMP_TUPLE_r02 1104 +#define _ITER_JUMP_TUPLE_r12 1105 +#define _ITER_JUMP_TUPLE_r22 1106 +#define _ITER_JUMP_TUPLE_r33 1107 +#define _ITER_NEXT_LIST_r23 1108 +#define _ITER_NEXT_LIST_TIER_TWO_r23 1109 +#define _ITER_NEXT_RANGE_r03 1110 +#define _ITER_NEXT_RANGE_r13 1111 +#define _ITER_NEXT_RANGE_r23 1112 +#define _ITER_NEXT_TUPLE_r03 1113 +#define _ITER_NEXT_TUPLE_r13 1114 +#define _ITER_NEXT_TUPLE_r23 1115 +#define _JUMP_BACKWARD_NO_INTERRUPT_r00 1116 +#define _JUMP_BACKWARD_NO_INTERRUPT_r11 1117 +#define _JUMP_BACKWARD_NO_INTERRUPT_r22 1118 +#define _JUMP_BACKWARD_NO_INTERRUPT_r33 1119 +#define _JUMP_TO_TOP_r00 1120 +#define _LIST_APPEND_r10 1121 +#define _LIST_EXTEND_r10 1122 +#define _LOAD_ATTR_r10 1123 +#define _LOAD_ATTR_CLASS_r11 1124 +#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_r11 1125 +#define _LOAD_ATTR_INSTANCE_VALUE_r02 1126 +#define _LOAD_ATTR_INSTANCE_VALUE_r12 1127 +#define _LOAD_ATTR_INSTANCE_VALUE_r23 1128 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 1129 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 1130 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 1131 +#define _LOAD_ATTR_METHOD_NO_DICT_r02 1132 +#define _LOAD_ATTR_METHOD_NO_DICT_r12 1133 +#define _LOAD_ATTR_METHOD_NO_DICT_r23 1134 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 1135 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 1136 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 1137 +#define _LOAD_ATTR_MODULE_r12 1138 +#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 1139 +#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 1140 +#define _LOAD_ATTR_PROPERTY_FRAME_r11 1141 +#define _LOAD_ATTR_SLOT_r02 1142 +#define _LOAD_ATTR_SLOT_r12 1143 +#define _LOAD_ATTR_SLOT_r23 1144 +#define _LOAD_ATTR_WITH_HINT_r12 1145 +#define _LOAD_BUILD_CLASS_r01 1146 +#define _LOAD_BYTECODE_r00 1147 +#define _LOAD_COMMON_CONSTANT_r01 1148 +#define _LOAD_COMMON_CONSTANT_r12 1149 +#define _LOAD_COMMON_CONSTANT_r23 1150 +#define _LOAD_CONST_r01 1151 +#define _LOAD_CONST_r12 1152 +#define _LOAD_CONST_r23 1153 +#define _LOAD_CONST_INLINE_r01 1154 +#define _LOAD_CONST_INLINE_r12 1155 +#define _LOAD_CONST_INLINE_r23 1156 +#define _LOAD_CONST_INLINE_BORROW_r01 1157 +#define _LOAD_CONST_INLINE_BORROW_r12 1158 +#define _LOAD_CONST_INLINE_BORROW_r23 1159 +#define _LOAD_CONST_UNDER_INLINE_r02 1160 +#define _LOAD_CONST_UNDER_INLINE_r12 1161 +#define _LOAD_CONST_UNDER_INLINE_r23 1162 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r02 1163 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r12 1164 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r23 1165 +#define _LOAD_DEREF_r01 1166 +#define _LOAD_FAST_r01 1167 +#define _LOAD_FAST_r12 1168 +#define _LOAD_FAST_r23 1169 +#define _LOAD_FAST_0_r01 1170 +#define _LOAD_FAST_0_r12 1171 +#define _LOAD_FAST_0_r23 1172 +#define _LOAD_FAST_1_r01 1173 +#define _LOAD_FAST_1_r12 1174 +#define _LOAD_FAST_1_r23 1175 +#define _LOAD_FAST_2_r01 1176 +#define _LOAD_FAST_2_r12 1177 +#define _LOAD_FAST_2_r23 1178 +#define _LOAD_FAST_3_r01 1179 +#define _LOAD_FAST_3_r12 1180 +#define _LOAD_FAST_3_r23 1181 +#define _LOAD_FAST_4_r01 1182 +#define _LOAD_FAST_4_r12 1183 +#define _LOAD_FAST_4_r23 1184 +#define _LOAD_FAST_5_r01 1185 +#define _LOAD_FAST_5_r12 1186 +#define _LOAD_FAST_5_r23 1187 +#define _LOAD_FAST_6_r01 1188 +#define _LOAD_FAST_6_r12 1189 +#define _LOAD_FAST_6_r23 1190 +#define _LOAD_FAST_7_r01 1191 +#define _LOAD_FAST_7_r12 1192 +#define _LOAD_FAST_7_r23 1193 +#define _LOAD_FAST_AND_CLEAR_r01 1194 +#define _LOAD_FAST_AND_CLEAR_r12 1195 +#define _LOAD_FAST_AND_CLEAR_r23 1196 +#define _LOAD_FAST_BORROW_r01 1197 +#define _LOAD_FAST_BORROW_r12 1198 +#define _LOAD_FAST_BORROW_r23 1199 +#define _LOAD_FAST_BORROW_0_r01 1200 +#define _LOAD_FAST_BORROW_0_r12 1201 +#define _LOAD_FAST_BORROW_0_r23 1202 +#define _LOAD_FAST_BORROW_1_r01 1203 +#define _LOAD_FAST_BORROW_1_r12 1204 +#define _LOAD_FAST_BORROW_1_r23 1205 +#define _LOAD_FAST_BORROW_2_r01 1206 +#define _LOAD_FAST_BORROW_2_r12 1207 +#define _LOAD_FAST_BORROW_2_r23 1208 +#define _LOAD_FAST_BORROW_3_r01 1209 +#define _LOAD_FAST_BORROW_3_r12 1210 +#define _LOAD_FAST_BORROW_3_r23 1211 +#define _LOAD_FAST_BORROW_4_r01 1212 +#define _LOAD_FAST_BORROW_4_r12 1213 +#define _LOAD_FAST_BORROW_4_r23 1214 +#define _LOAD_FAST_BORROW_5_r01 1215 +#define _LOAD_FAST_BORROW_5_r12 1216 +#define _LOAD_FAST_BORROW_5_r23 1217 +#define _LOAD_FAST_BORROW_6_r01 1218 +#define _LOAD_FAST_BORROW_6_r12 1219 +#define _LOAD_FAST_BORROW_6_r23 1220 +#define _LOAD_FAST_BORROW_7_r01 1221 +#define _LOAD_FAST_BORROW_7_r12 1222 +#define _LOAD_FAST_BORROW_7_r23 1223 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1224 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1225 +#define _LOAD_FAST_CHECK_r01 1226 +#define _LOAD_FAST_CHECK_r12 1227 +#define _LOAD_FAST_CHECK_r23 1228 +#define _LOAD_FAST_LOAD_FAST_r02 1229 +#define _LOAD_FAST_LOAD_FAST_r13 1230 +#define _LOAD_FROM_DICT_OR_DEREF_r11 1231 +#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1232 +#define _LOAD_GLOBAL_r00 1233 +#define _LOAD_GLOBAL_BUILTINS_r01 1234 +#define _LOAD_GLOBAL_MODULE_r01 1235 +#define _LOAD_LOCALS_r01 1236 +#define _LOAD_LOCALS_r12 1237 +#define _LOAD_LOCALS_r23 1238 +#define _LOAD_NAME_r01 1239 +#define _LOAD_SMALL_INT_r01 1240 +#define _LOAD_SMALL_INT_r12 1241 +#define _LOAD_SMALL_INT_r23 1242 +#define _LOAD_SMALL_INT_0_r01 1243 +#define _LOAD_SMALL_INT_0_r12 1244 +#define _LOAD_SMALL_INT_0_r23 1245 +#define _LOAD_SMALL_INT_1_r01 1246 +#define _LOAD_SMALL_INT_1_r12 1247 +#define _LOAD_SMALL_INT_1_r23 1248 +#define _LOAD_SMALL_INT_2_r01 1249 +#define _LOAD_SMALL_INT_2_r12 1250 +#define _LOAD_SMALL_INT_2_r23 1251 +#define _LOAD_SMALL_INT_3_r01 1252 +#define _LOAD_SMALL_INT_3_r12 1253 +#define _LOAD_SMALL_INT_3_r23 1254 +#define _LOAD_SPECIAL_r00 1255 +#define _LOAD_SUPER_ATTR_ATTR_r31 1256 +#define _LOAD_SUPER_ATTR_METHOD_r32 1257 +#define _LOCK_OBJECT_r01 1258 +#define _LOCK_OBJECT_r11 1259 +#define _LOCK_OBJECT_r22 1260 +#define _LOCK_OBJECT_r33 1261 +#define _MAKE_CALLARGS_A_TUPLE_r33 1262 +#define _MAKE_CELL_r00 1263 +#define _MAKE_FUNCTION_r11 1264 +#define _MAKE_HEAP_SAFE_r01 1265 +#define _MAKE_HEAP_SAFE_r11 1266 +#define _MAKE_HEAP_SAFE_r22 1267 +#define _MAKE_HEAP_SAFE_r33 1268 +#define _MAKE_WARM_r00 1269 +#define _MAKE_WARM_r11 1270 +#define _MAKE_WARM_r22 1271 +#define _MAKE_WARM_r33 1272 +#define _MAP_ADD_r20 1273 +#define _MATCH_CLASS_r33 1274 +#define _MATCH_KEYS_r23 1275 +#define _MATCH_MAPPING_r02 1276 +#define _MATCH_MAPPING_r12 1277 +#define _MATCH_MAPPING_r23 1278 +#define _MATCH_SEQUENCE_r02 1279 +#define _MATCH_SEQUENCE_r12 1280 +#define _MATCH_SEQUENCE_r23 1281 +#define _MAYBE_EXPAND_METHOD_r00 1282 +#define _MAYBE_EXPAND_METHOD_KW_r11 1283 +#define _MONITOR_CALL_r00 1284 +#define _MONITOR_CALL_KW_r11 1285 +#define _MONITOR_JUMP_BACKWARD_r00 1286 +#define _MONITOR_JUMP_BACKWARD_r11 1287 +#define _MONITOR_JUMP_BACKWARD_r22 1288 +#define _MONITOR_JUMP_BACKWARD_r33 1289 +#define _MONITOR_RESUME_r00 1290 +#define _NOP_r00 1291 +#define _NOP_r11 1292 +#define _NOP_r22 1293 +#define _NOP_r33 1294 +#define _POP_CALL_r20 1295 +#define _POP_CALL_LOAD_CONST_INLINE_BORROW_r21 1296 +#define _POP_CALL_ONE_r30 1297 +#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW_r31 1298 +#define _POP_CALL_TWO_r30 1299 +#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW_r31 1300 +#define _POP_EXCEPT_r10 1301 +#define _POP_ITER_r20 1302 +#define _POP_JUMP_IF_FALSE_r00 1303 +#define _POP_JUMP_IF_FALSE_r10 1304 +#define _POP_JUMP_IF_FALSE_r21 1305 +#define _POP_JUMP_IF_FALSE_r32 1306 +#define _POP_JUMP_IF_TRUE_r00 1307 +#define _POP_JUMP_IF_TRUE_r10 1308 +#define _POP_JUMP_IF_TRUE_r21 1309 +#define _POP_JUMP_IF_TRUE_r32 1310 +#define _POP_TOP_r10 1311 +#define _POP_TOP_FLOAT_r00 1312 +#define _POP_TOP_FLOAT_r10 1313 +#define _POP_TOP_FLOAT_r21 1314 +#define _POP_TOP_FLOAT_r32 1315 +#define _POP_TOP_INT_r00 1316 +#define _POP_TOP_INT_r10 1317 +#define _POP_TOP_INT_r21 1318 +#define _POP_TOP_INT_r32 1319 +#define _POP_TOP_LOAD_CONST_INLINE_r11 1320 +#define _POP_TOP_LOAD_CONST_INLINE_BORROW_r11 1321 +#define _POP_TOP_NOP_r00 1322 +#define _POP_TOP_NOP_r10 1323 +#define _POP_TOP_NOP_r21 1324 +#define _POP_TOP_NOP_r32 1325 +#define _POP_TOP_UNICODE_r00 1326 +#define _POP_TOP_UNICODE_r10 1327 +#define _POP_TOP_UNICODE_r21 1328 +#define _POP_TOP_UNICODE_r32 1329 +#define _POP_TWO_r20 1330 +#define _POP_TWO_LOAD_CONST_INLINE_BORROW_r21 1331 +#define _PUSH_EXC_INFO_r02 1332 +#define _PUSH_EXC_INFO_r12 1333 +#define _PUSH_EXC_INFO_r23 1334 +#define _PUSH_FRAME_r10 1335 +#define _PUSH_NULL_r01 1336 +#define _PUSH_NULL_r12 1337 +#define _PUSH_NULL_r23 1338 +#define _PUSH_NULL_CONDITIONAL_r00 1339 +#define _PY_FRAME_EX_r31 1340 +#define _PY_FRAME_GENERAL_r01 1341 +#define _PY_FRAME_KW_r11 1342 +#define _QUICKEN_RESUME_r00 1343 +#define _QUICKEN_RESUME_r11 1344 +#define _QUICKEN_RESUME_r22 1345 +#define _QUICKEN_RESUME_r33 1346 +#define _REPLACE_WITH_TRUE_r02 1347 +#define _REPLACE_WITH_TRUE_r12 1348 +#define _REPLACE_WITH_TRUE_r23 1349 +#define _RESUME_CHECK_r00 1350 +#define _RESUME_CHECK_r11 1351 +#define _RESUME_CHECK_r22 1352 +#define _RESUME_CHECK_r33 1353 +#define _RETURN_GENERATOR_r01 1354 +#define _RETURN_VALUE_r11 1355 +#define _SAVE_RETURN_OFFSET_r00 1356 +#define _SAVE_RETURN_OFFSET_r11 1357 +#define _SAVE_RETURN_OFFSET_r22 1358 +#define _SAVE_RETURN_OFFSET_r33 1359 +#define _SEND_r22 1360 +#define _SEND_GEN_FRAME_r22 1361 +#define _SETUP_ANNOTATIONS_r00 1362 +#define _SET_ADD_r10 1363 +#define _SET_FUNCTION_ATTRIBUTE_r01 1364 +#define _SET_FUNCTION_ATTRIBUTE_r11 1365 +#define _SET_FUNCTION_ATTRIBUTE_r21 1366 +#define _SET_FUNCTION_ATTRIBUTE_r32 1367 +#define _SET_IP_r00 1368 +#define _SET_IP_r11 1369 +#define _SET_IP_r22 1370 +#define _SET_IP_r33 1371 +#define _SET_UPDATE_r10 1372 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r02 1373 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r12 1374 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r22 1375 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r32 1376 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r03 1377 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r13 1378 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r23 1379 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r33 1380 +#define _SPILL_OR_RELOAD_r01 1381 +#define _SPILL_OR_RELOAD_r02 1382 +#define _SPILL_OR_RELOAD_r03 1383 +#define _SPILL_OR_RELOAD_r10 1384 +#define _SPILL_OR_RELOAD_r12 1385 +#define _SPILL_OR_RELOAD_r13 1386 +#define _SPILL_OR_RELOAD_r20 1387 +#define _SPILL_OR_RELOAD_r21 1388 +#define _SPILL_OR_RELOAD_r23 1389 +#define _SPILL_OR_RELOAD_r30 1390 +#define _SPILL_OR_RELOAD_r31 1391 +#define _SPILL_OR_RELOAD_r32 1392 +#define _START_EXECUTOR_r00 1393 +#define _STORE_ATTR_r20 1394 +#define _STORE_ATTR_INSTANCE_VALUE_r21 1395 +#define _STORE_ATTR_SLOT_r21 1396 +#define _STORE_ATTR_WITH_HINT_r21 1397 +#define _STORE_DEREF_r10 1398 +#define _STORE_FAST_LOAD_FAST_r11 1399 +#define _STORE_FAST_STORE_FAST_r20 1400 +#define _STORE_GLOBAL_r10 1401 +#define _STORE_NAME_r10 1402 +#define _STORE_SLICE_r30 1403 +#define _STORE_SUBSCR_r30 1404 +#define _STORE_SUBSCR_DICT_r31 1405 +#define _STORE_SUBSCR_LIST_INT_r32 1406 +#define _SWAP_r11 1407 +#define _SWAP_2_r02 1408 +#define _SWAP_2_r12 1409 +#define _SWAP_2_r22 1410 +#define _SWAP_2_r33 1411 +#define _SWAP_3_r03 1412 +#define _SWAP_3_r13 1413 +#define _SWAP_3_r23 1414 +#define _SWAP_3_r33 1415 +#define _SWAP_FAST_r01 1416 +#define _SWAP_FAST_r11 1417 +#define _SWAP_FAST_r22 1418 +#define _SWAP_FAST_r33 1419 +#define _SWAP_FAST_0_r01 1420 +#define _SWAP_FAST_0_r11 1421 +#define _SWAP_FAST_0_r22 1422 +#define _SWAP_FAST_0_r33 1423 +#define _SWAP_FAST_1_r01 1424 +#define _SWAP_FAST_1_r11 1425 +#define _SWAP_FAST_1_r22 1426 +#define _SWAP_FAST_1_r33 1427 +#define _SWAP_FAST_2_r01 1428 +#define _SWAP_FAST_2_r11 1429 +#define _SWAP_FAST_2_r22 1430 +#define _SWAP_FAST_2_r33 1431 +#define _SWAP_FAST_3_r01 1432 +#define _SWAP_FAST_3_r11 1433 +#define _SWAP_FAST_3_r22 1434 +#define _SWAP_FAST_3_r33 1435 +#define _SWAP_FAST_4_r01 1436 +#define _SWAP_FAST_4_r11 1437 +#define _SWAP_FAST_4_r22 1438 +#define _SWAP_FAST_4_r33 1439 +#define _SWAP_FAST_5_r01 1440 +#define _SWAP_FAST_5_r11 1441 +#define _SWAP_FAST_5_r22 1442 +#define _SWAP_FAST_5_r33 1443 +#define _SWAP_FAST_6_r01 1444 +#define _SWAP_FAST_6_r11 1445 +#define _SWAP_FAST_6_r22 1446 +#define _SWAP_FAST_6_r33 1447 +#define _SWAP_FAST_7_r01 1448 +#define _SWAP_FAST_7_r11 1449 +#define _SWAP_FAST_7_r22 1450 +#define _SWAP_FAST_7_r33 1451 +#define _TIER2_RESUME_CHECK_r00 1452 +#define _TIER2_RESUME_CHECK_r11 1453 +#define _TIER2_RESUME_CHECK_r22 1454 +#define _TIER2_RESUME_CHECK_r33 1455 +#define _TO_BOOL_r11 1456 +#define _TO_BOOL_BOOL_r01 1457 +#define _TO_BOOL_BOOL_r11 1458 +#define _TO_BOOL_BOOL_r22 1459 +#define _TO_BOOL_BOOL_r33 1460 +#define _TO_BOOL_INT_r02 1461 +#define _TO_BOOL_INT_r12 1462 +#define _TO_BOOL_INT_r23 1463 +#define _TO_BOOL_LIST_r02 1464 +#define _TO_BOOL_LIST_r12 1465 +#define _TO_BOOL_LIST_r23 1466 +#define _TO_BOOL_NONE_r01 1467 +#define _TO_BOOL_NONE_r11 1468 +#define _TO_BOOL_NONE_r22 1469 +#define _TO_BOOL_NONE_r33 1470 +#define _TO_BOOL_STR_r02 1471 +#define _TO_BOOL_STR_r12 1472 +#define _TO_BOOL_STR_r23 1473 +#define _TRACE_RECORD_r00 1474 +#define _UNARY_INVERT_r12 1475 +#define _UNARY_NEGATIVE_r12 1476 +#define _UNARY_NOT_r01 1477 +#define _UNARY_NOT_r11 1478 +#define _UNARY_NOT_r22 1479 +#define _UNARY_NOT_r33 1480 +#define _UNPACK_EX_r10 1481 +#define _UNPACK_SEQUENCE_r10 1482 +#define _UNPACK_SEQUENCE_LIST_r10 1483 +#define _UNPACK_SEQUENCE_TUPLE_r10 1484 +#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1485 +#define _WITH_EXCEPT_START_r33 1486 +#define _YIELD_VALUE_r11 1487 +#define MAX_UOP_REGS_ID 1487 #ifdef __cplusplus } diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index 9a0852f872d763..413bc09468fd04 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -152,8 +152,6 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_POP_EXCEPT] = HAS_ESCAPES_FLAG, [_LOAD_COMMON_CONSTANT] = HAS_ARG_FLAG, [_LOAD_BUILD_CLASS] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, - [_STORE_NAME] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, - [_DELETE_NAME] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_UNPACK_SEQUENCE] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_UNPACK_SEQUENCE_TWO_TUPLE] = HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG, [_UNPACK_SEQUENCE_TUPLE] = HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG, @@ -1458,24 +1456,6 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { { -1, -1, -1 }, }, }, - [_STORE_NAME] = { - .best = { 1, 1, 1, 1 }, - .entries = { - { -1, -1, -1 }, - { 0, 1, _STORE_NAME_r10 }, - { -1, -1, -1 }, - { -1, -1, -1 }, - }, - }, - [_DELETE_NAME] = { - .best = { 0, 0, 0, 0 }, - .entries = { - { 0, 0, _DELETE_NAME_r00 }, - { -1, -1, -1 }, - { -1, -1, -1 }, - { -1, -1, -1 }, - }, - }, [_UNPACK_SEQUENCE] = { .best = { 1, 1, 1, 1 }, .entries = { @@ -3839,8 +3819,6 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_LOAD_COMMON_CONSTANT_r12] = _LOAD_COMMON_CONSTANT, [_LOAD_COMMON_CONSTANT_r23] = _LOAD_COMMON_CONSTANT, [_LOAD_BUILD_CLASS_r01] = _LOAD_BUILD_CLASS, - [_STORE_NAME_r10] = _STORE_NAME, - [_DELETE_NAME_r00] = _DELETE_NAME, [_UNPACK_SEQUENCE_r10] = _UNPACK_SEQUENCE, [_UNPACK_SEQUENCE_TWO_TUPLE_r12] = _UNPACK_SEQUENCE_TWO_TUPLE, [_UNPACK_SEQUENCE_TUPLE_r10] = _UNPACK_SEQUENCE_TUPLE, @@ -4604,8 +4582,6 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_DELETE_FAST_r00] = "_DELETE_FAST_r00", [_DELETE_GLOBAL] = "_DELETE_GLOBAL", [_DELETE_GLOBAL_r00] = "_DELETE_GLOBAL_r00", - [_DELETE_NAME] = "_DELETE_NAME", - [_DELETE_NAME_r00] = "_DELETE_NAME_r00", [_DELETE_SUBSCR] = "_DELETE_SUBSCR", [_DELETE_SUBSCR_r20] = "_DELETE_SUBSCR_r20", [_DEOPT] = "_DEOPT", @@ -5410,8 +5386,6 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_STORE_DEREF_r10] = "_STORE_DEREF_r10", [_STORE_GLOBAL] = "_STORE_GLOBAL", [_STORE_GLOBAL_r10] = "_STORE_GLOBAL_r10", - [_STORE_NAME] = "_STORE_NAME", - [_STORE_NAME_r10] = "_STORE_NAME_r10", [_STORE_SLICE] = "_STORE_SLICE", [_STORE_SLICE_r30] = "_STORE_SLICE_r30", [_STORE_SUBSCR] = "_STORE_SUBSCR", @@ -5767,10 +5741,6 @@ int _PyUop_num_popped(int opcode, int oparg) return 0; case _LOAD_BUILD_CLASS: return 0; - case _STORE_NAME: - return 1; - case _DELETE_NAME: - return 0; case _UNPACK_SEQUENCE: return 1; case _UNPACK_SEQUENCE_TWO_TUPLE: diff --git a/Include/opcode_ids.h b/Include/opcode_ids.h index c46368444f4c59..afc58b67524500 100644 --- a/Include/opcode_ids.h +++ b/Include/opcode_ids.h @@ -75,62 +75,61 @@ extern "C" { #define DELETE_DEREF 62 #define DELETE_FAST 63 #define DELETE_GLOBAL 64 -#define DELETE_NAME 65 -#define DICT_MERGE 66 -#define DICT_UPDATE 67 -#define END_ASYNC_FOR 68 -#define EXTENDED_ARG 69 -#define FOR_ITER 70 -#define GET_AWAITABLE 71 -#define IMPORT_FROM 72 -#define IMPORT_NAME 73 -#define IS_OP 74 -#define JUMP_BACKWARD 75 -#define JUMP_BACKWARD_NO_INTERRUPT 76 -#define JUMP_FORWARD 77 -#define LIST_APPEND 78 -#define LIST_EXTEND 79 -#define LOAD_ATTR 80 -#define LOAD_COMMON_CONSTANT 81 -#define LOAD_CONST 82 -#define LOAD_DEREF 83 -#define LOAD_FAST 84 -#define LOAD_FAST_AND_CLEAR 85 -#define LOAD_FAST_BORROW 86 -#define LOAD_FAST_BORROW_LOAD_FAST_BORROW 87 -#define LOAD_FAST_CHECK 88 -#define LOAD_FAST_LOAD_FAST 89 -#define LOAD_FROM_DICT_OR_DEREF 90 -#define LOAD_FROM_DICT_OR_GLOBALS 91 -#define LOAD_GLOBAL 92 -#define LOAD_NAME 93 -#define LOAD_SMALL_INT 94 -#define LOAD_SPECIAL 95 -#define LOAD_SUPER_ATTR 96 -#define MAKE_CELL 97 -#define MAP_ADD 98 -#define MATCH_CLASS 99 -#define POP_JUMP_IF_FALSE 100 -#define POP_JUMP_IF_NONE 101 -#define POP_JUMP_IF_NOT_NONE 102 -#define POP_JUMP_IF_TRUE 103 -#define RAISE_VARARGS 104 -#define RERAISE 105 -#define SEND 106 -#define SET_ADD 107 -#define SET_FUNCTION_ATTRIBUTE 108 -#define SET_UPDATE 109 -#define STORE_ATTR 110 -#define STORE_DEREF 111 -#define STORE_FAST 112 -#define STORE_FAST_LOAD_FAST 113 -#define STORE_FAST_STORE_FAST 114 -#define STORE_GLOBAL 115 -#define STORE_NAME 116 -#define SWAP 117 -#define UNPACK_EX 118 -#define UNPACK_SEQUENCE 119 -#define YIELD_VALUE 120 +#define DICT_MERGE 65 +#define DICT_UPDATE 66 +#define END_ASYNC_FOR 67 +#define EXTENDED_ARG 68 +#define FOR_ITER 69 +#define GET_AWAITABLE 70 +#define IMPORT_FROM 71 +#define IMPORT_NAME 72 +#define IS_OP 73 +#define JUMP_BACKWARD 74 +#define JUMP_BACKWARD_NO_INTERRUPT 75 +#define JUMP_FORWARD 76 +#define LIST_APPEND 77 +#define LIST_EXTEND 78 +#define LOAD_ATTR 79 +#define LOAD_COMMON_CONSTANT 80 +#define LOAD_CONST 81 +#define LOAD_DEREF 82 +#define LOAD_FAST 83 +#define LOAD_FAST_AND_CLEAR 84 +#define LOAD_FAST_BORROW 85 +#define LOAD_FAST_BORROW_LOAD_FAST_BORROW 86 +#define LOAD_FAST_CHECK 87 +#define LOAD_FAST_LOAD_FAST 88 +#define LOAD_FROM_DICT_OR_DEREF 89 +#define LOAD_FROM_DICT_OR_GLOBALS 90 +#define LOAD_GLOBAL 91 +#define LOAD_NAME 92 +#define LOAD_SMALL_INT 93 +#define LOAD_SPECIAL 94 +#define LOAD_SUPER_ATTR 95 +#define MAKE_CELL 96 +#define MAP_ADD 97 +#define MATCH_CLASS 98 +#define POP_JUMP_IF_FALSE 99 +#define POP_JUMP_IF_NONE 100 +#define POP_JUMP_IF_NOT_NONE 101 +#define POP_JUMP_IF_TRUE 102 +#define RAISE_VARARGS 103 +#define RERAISE 104 +#define SEND 105 +#define SET_ADD 106 +#define SET_FUNCTION_ATTRIBUTE 107 +#define SET_UPDATE 108 +#define STORE_ATTR 109 +#define STORE_DEREF 110 +#define STORE_FAST 111 +#define STORE_FAST_LOAD_FAST 112 +#define STORE_FAST_STORE_FAST 113 +#define STORE_GLOBAL 114 +#define STORE_NAME 115 +#define SWAP 116 +#define UNPACK_EX 117 +#define UNPACK_SEQUENCE 118 +#define YIELD_VALUE 119 #define RESUME 128 #define BINARY_OP_ADD_FLOAT 129 #define BINARY_OP_ADD_INT 130 diff --git a/Lib/_opcode_metadata.py b/Lib/_opcode_metadata.py index 6e37288c32dd9a..b545fa2b5ada9c 100644 --- a/Lib/_opcode_metadata.py +++ b/Lib/_opcode_metadata.py @@ -281,62 +281,61 @@ DELETE_DEREF=62, DELETE_FAST=63, DELETE_GLOBAL=64, - DELETE_NAME=65, - DICT_MERGE=66, - DICT_UPDATE=67, - END_ASYNC_FOR=68, - EXTENDED_ARG=69, - FOR_ITER=70, - GET_AWAITABLE=71, - IMPORT_FROM=72, - IMPORT_NAME=73, - IS_OP=74, - JUMP_BACKWARD=75, - JUMP_BACKWARD_NO_INTERRUPT=76, - JUMP_FORWARD=77, - LIST_APPEND=78, - LIST_EXTEND=79, - LOAD_ATTR=80, - LOAD_COMMON_CONSTANT=81, - LOAD_CONST=82, - LOAD_DEREF=83, - LOAD_FAST=84, - LOAD_FAST_AND_CLEAR=85, - LOAD_FAST_BORROW=86, - LOAD_FAST_BORROW_LOAD_FAST_BORROW=87, - LOAD_FAST_CHECK=88, - LOAD_FAST_LOAD_FAST=89, - LOAD_FROM_DICT_OR_DEREF=90, - LOAD_FROM_DICT_OR_GLOBALS=91, - LOAD_GLOBAL=92, - LOAD_NAME=93, - LOAD_SMALL_INT=94, - LOAD_SPECIAL=95, - LOAD_SUPER_ATTR=96, - MAKE_CELL=97, - MAP_ADD=98, - MATCH_CLASS=99, - POP_JUMP_IF_FALSE=100, - POP_JUMP_IF_NONE=101, - POP_JUMP_IF_NOT_NONE=102, - POP_JUMP_IF_TRUE=103, - RAISE_VARARGS=104, - RERAISE=105, - SEND=106, - SET_ADD=107, - SET_FUNCTION_ATTRIBUTE=108, - SET_UPDATE=109, - STORE_ATTR=110, - STORE_DEREF=111, - STORE_FAST=112, - STORE_FAST_LOAD_FAST=113, - STORE_FAST_STORE_FAST=114, - STORE_GLOBAL=115, - STORE_NAME=116, - SWAP=117, - UNPACK_EX=118, - UNPACK_SEQUENCE=119, - YIELD_VALUE=120, + DICT_MERGE=65, + DICT_UPDATE=66, + END_ASYNC_FOR=67, + EXTENDED_ARG=68, + FOR_ITER=69, + GET_AWAITABLE=70, + IMPORT_FROM=71, + IMPORT_NAME=72, + IS_OP=73, + JUMP_BACKWARD=74, + JUMP_BACKWARD_NO_INTERRUPT=75, + JUMP_FORWARD=76, + LIST_APPEND=77, + LIST_EXTEND=78, + LOAD_ATTR=79, + LOAD_COMMON_CONSTANT=80, + LOAD_CONST=81, + LOAD_DEREF=82, + LOAD_FAST=83, + LOAD_FAST_AND_CLEAR=84, + LOAD_FAST_BORROW=85, + LOAD_FAST_BORROW_LOAD_FAST_BORROW=86, + LOAD_FAST_CHECK=87, + LOAD_FAST_LOAD_FAST=88, + LOAD_FROM_DICT_OR_DEREF=89, + LOAD_FROM_DICT_OR_GLOBALS=90, + LOAD_GLOBAL=91, + LOAD_NAME=92, + LOAD_SMALL_INT=93, + LOAD_SPECIAL=94, + LOAD_SUPER_ATTR=95, + MAKE_CELL=96, + MAP_ADD=97, + MATCH_CLASS=98, + POP_JUMP_IF_FALSE=99, + POP_JUMP_IF_NONE=100, + POP_JUMP_IF_NOT_NONE=101, + POP_JUMP_IF_TRUE=102, + RAISE_VARARGS=103, + RERAISE=104, + SEND=105, + SET_ADD=106, + SET_FUNCTION_ATTRIBUTE=107, + SET_UPDATE=108, + STORE_ATTR=109, + STORE_DEREF=110, + STORE_FAST=111, + STORE_FAST_LOAD_FAST=112, + STORE_FAST_STORE_FAST=113, + STORE_GLOBAL=114, + STORE_NAME=115, + SWAP=116, + UNPACK_EX=117, + UNPACK_SEQUENCE=118, + YIELD_VALUE=119, INSTRUMENTED_END_FOR=233, INSTRUMENTED_POP_ITER=234, INSTRUMENTED_END_SEND=235, diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py index 0d5c6e6e77f5d7..bb6d244f3a8fd7 100644 --- a/Lib/test/test_code.py +++ b/Lib/test/test_code.py @@ -541,7 +541,8 @@ def test_co_positions_artificial_instructions(self): ("PUSH_EXC_INFO", None), ("LOAD_CONST", None), # artificial 'None' ("STORE_NAME", "e"), # XX: we know the location for this - ("DELETE_NAME", "e"), + ("PUSH_NULL", None), + ("STORE_NAME", "e"), ("RERAISE", 1), ("COPY", 3), ("POP_EXCEPT", None), diff --git a/Modules/_testinternalcapi/test_cases.c.h b/Modules/_testinternalcapi/test_cases.c.h index 9e86bc42f20074..49ca360ee2129c 100644 --- a/Modules/_testinternalcapi/test_cases.c.h +++ b/Modules/_testinternalcapi/test_cases.c.h @@ -5443,38 +5443,6 @@ DISPATCH(); } - TARGET(DELETE_NAME) { - #if _Py_TAIL_CALL_INTERP - int opcode = DELETE_NAME; - (void)(opcode); - #endif - frame->instr_ptr = next_instr; - next_instr += 1; - INSTRUCTION_STATS(DELETE_NAME); - PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); - PyObject *ns = LOCALS(); - int err; - if (ns == NULL) { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyErr_Format(tstate, PyExc_SystemError, - "no locals when deleting %R", name); - stack_pointer = _PyFrame_GetStackPointer(frame); - JUMP_TO_LABEL(error); - } - _PyFrame_SetStackPointer(frame, stack_pointer); - err = PyObject_DelItem(ns, name); - stack_pointer = _PyFrame_GetStackPointer(frame); - if (err != 0) { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, - NAME_ERROR_MSG, - name); - stack_pointer = _PyFrame_GetStackPointer(frame); - JUMP_TO_LABEL(error); - } - DISPATCH(); - } - TARGET(DELETE_SUBSCR) { #if _Py_TAIL_CALL_INTERP int opcode = DELETE_SUBSCR; @@ -11389,23 +11357,40 @@ stack_pointer = _PyFrame_GetStackPointer(frame); JUMP_TO_LABEL(error); } - if (PyDict_CheckExact(ns)) { + if (PyStackRef_IsNull(v)) { + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); _PyFrame_SetStackPointer(frame, stack_pointer); - err = PyDict_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); + err = PyObject_DelItem(ns, name); stack_pointer = _PyFrame_GetStackPointer(frame); + if (err != 0) { + _PyFrame_SetStackPointer(frame, stack_pointer); + _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, + NAME_ERROR_MSG, + name); + stack_pointer = _PyFrame_GetStackPointer(frame); + JUMP_TO_LABEL(error); + } } else { + if (PyDict_CheckExact(ns)) { + _PyFrame_SetStackPointer(frame, stack_pointer); + err = PyDict_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); + stack_pointer = _PyFrame_GetStackPointer(frame); + } + else { + _PyFrame_SetStackPointer(frame, stack_pointer); + err = PyObject_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); + stack_pointer = _PyFrame_GetStackPointer(frame); + } + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); _PyFrame_SetStackPointer(frame, stack_pointer); - err = PyObject_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); + PyStackRef_CLOSE(v); stack_pointer = _PyFrame_GetStackPointer(frame); - } - stack_pointer += -1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - PyStackRef_CLOSE(v); - stack_pointer = _PyFrame_GetStackPointer(frame); - if (err) { - JUMP_TO_LABEL(error); + if (err) { + JUMP_TO_LABEL(error); + } } DISPATCH(); } diff --git a/Modules/_testinternalcapi/test_targets.h b/Modules/_testinternalcapi/test_targets.h index f57c33feec2ac2..46721be3aff249 100644 --- a/Modules/_testinternalcapi/test_targets.h +++ b/Modules/_testinternalcapi/test_targets.h @@ -65,7 +65,6 @@ static void *opcode_targets_table[256] = { &&TARGET_DELETE_DEREF, &&TARGET_DELETE_FAST, &&TARGET_DELETE_GLOBAL, - &&TARGET_DELETE_NAME, &&TARGET_DICT_MERGE, &&TARGET_DICT_UPDATE, &&TARGET_END_ASYNC_FOR, @@ -128,6 +127,7 @@ static void *opcode_targets_table[256] = { &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, + &&_unknown_opcode, &&TARGET_RESUME, &&TARGET_BINARY_OP_ADD_FLOAT, &&TARGET_BINARY_OP_ADD_INT, @@ -379,7 +379,7 @@ static void *opcode_tracing_targets_table[256] = { &&TARGET_TRACE_RECORD, &&TARGET_TRACE_RECORD, &&TARGET_TRACE_RECORD, - &&TARGET_TRACE_RECORD, + &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, @@ -604,7 +604,6 @@ static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DELETE_ATTR(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DELETE_DEREF(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DELETE_FAST(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DELETE_GLOBAL(TAIL_CALL_PARAMS); -static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DELETE_NAME(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DELETE_SUBSCR(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DICT_MERGE(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DICT_UPDATE(TAIL_CALL_PARAMS); @@ -845,7 +844,6 @@ static py_tail_call_funcptr instruction_funcptr_handler_table[256] = { [DELETE_DEREF] = _TAIL_CALL_DELETE_DEREF, [DELETE_FAST] = _TAIL_CALL_DELETE_FAST, [DELETE_GLOBAL] = _TAIL_CALL_DELETE_GLOBAL, - [DELETE_NAME] = _TAIL_CALL_DELETE_NAME, [DELETE_SUBSCR] = _TAIL_CALL_DELETE_SUBSCR, [DICT_MERGE] = _TAIL_CALL_DICT_MERGE, [DICT_UPDATE] = _TAIL_CALL_DICT_UPDATE, @@ -1000,6 +998,7 @@ static py_tail_call_funcptr instruction_funcptr_handler_table[256] = { [UNPACK_SEQUENCE_TWO_TUPLE] = _TAIL_CALL_UNPACK_SEQUENCE_TWO_TUPLE, [WITH_EXCEPT_START] = _TAIL_CALL_WITH_EXCEPT_START, [YIELD_VALUE] = _TAIL_CALL_YIELD_VALUE, + [120] = _TAIL_CALL_UNKNOWN_OPCODE, [121] = _TAIL_CALL_UNKNOWN_OPCODE, [122] = _TAIL_CALL_UNKNOWN_OPCODE, [123] = _TAIL_CALL_UNKNOWN_OPCODE, @@ -1103,7 +1102,6 @@ static py_tail_call_funcptr instruction_funcptr_tracing_table[256] = { [DELETE_DEREF] = _TAIL_CALL_TRACE_RECORD, [DELETE_FAST] = _TAIL_CALL_TRACE_RECORD, [DELETE_GLOBAL] = _TAIL_CALL_TRACE_RECORD, - [DELETE_NAME] = _TAIL_CALL_TRACE_RECORD, [DELETE_SUBSCR] = _TAIL_CALL_TRACE_RECORD, [DICT_MERGE] = _TAIL_CALL_TRACE_RECORD, [DICT_UPDATE] = _TAIL_CALL_TRACE_RECORD, @@ -1258,6 +1256,7 @@ static py_tail_call_funcptr instruction_funcptr_tracing_table[256] = { [UNPACK_SEQUENCE_TWO_TUPLE] = _TAIL_CALL_TRACE_RECORD, [WITH_EXCEPT_START] = _TAIL_CALL_TRACE_RECORD, [YIELD_VALUE] = _TAIL_CALL_TRACE_RECORD, + [120] = _TAIL_CALL_UNKNOWN_OPCODE, [121] = _TAIL_CALL_UNKNOWN_OPCODE, [122] = _TAIL_CALL_UNKNOWN_OPCODE, [123] = _TAIL_CALL_UNKNOWN_OPCODE, diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h index f808544045e153..94f06050b7bc59 100644 --- a/Programs/test_frozenmain.h +++ b/Programs/test_frozenmain.h @@ -1,18 +1,18 @@ // Auto-generated by Programs/freeze_test_frozenmain.py unsigned char M_test_frozenmain[] = { 227,0,0,0,0,0,0,0,0,0,0,0,0,9,0,0, - 0,0,0,0,0,243,184,0,0,0,128,0,94,0,82,1, - 73,0,116,0,94,0,82,1,73,4,116,1,93,2,33,0, - 82,2,52,1,0,0,0,0,0,0,31,0,93,2,33,0, - 82,3,93,0,80,6,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,243,184,0,0,0,128,0,93,0,81,1, + 72,0,115,0,93,0,81,1,72,4,115,1,92,2,33,0, + 81,2,52,1,0,0,0,0,0,0,31,0,92,2,33,0, + 81,3,92,0,79,6,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,52,2,0,0,0,0,0,0, - 31,0,93,1,80,8,0,0,0,0,0,0,0,0,0,0, + 31,0,92,1,79,8,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,33,0,52,0,0,0,0,0, - 0,0,82,4,44,26,0,0,0,0,0,0,0,0,0,0, - 116,5,82,7,16,0,70,24,0,0,116,6,93,2,33,0, - 82,5,93,6,12,0,82,6,93,5,93,6,44,26,0,0, + 0,0,81,4,44,26,0,0,0,0,0,0,0,0,0,0, + 115,5,81,7,16,0,69,24,0,0,115,6,92,2,33,0, + 81,5,92,6,12,0,81,6,92,5,92,6,44,26,0,0, 0,0,0,0,0,0,0,0,12,0,50,4,52,1,0,0, - 0,0,0,0,31,0,75,26,0,0,9,0,30,0,82,1, + 0,0,0,0,31,0,74,26,0,0,9,0,30,0,81,1, 35,0,41,8,233,0,0,0,0,78,122,18,70,114,111,122, 101,110,32,72,101,108,108,111,32,87,111,114,108,100,122,8, 115,121,115,46,97,114,103,118,218,6,99,111,110,102,105,103, diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 43a512611fb1ee..b92bde1a0c98af 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -1635,32 +1635,27 @@ dummy_func( PyStackRef_CLOSE(v); ERROR_IF(true); } - if (PyDict_CheckExact(ns)) { - err = PyDict_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); - } - else { - err = PyObject_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); - } - PyStackRef_CLOSE(v); - ERROR_IF(err); - } - inst(DELETE_NAME, (--)) { - PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); - PyObject *ns = LOCALS(); - int err; - if (ns == NULL) { - _PyErr_Format(tstate, PyExc_SystemError, - "no locals when deleting %R", name); - ERROR_NO_POP(); + if (PyStackRef_IsNull(v)) { + DEAD(v); + err = PyObject_DelItem(ns, name); + if (err != 0) { + _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, + NAME_ERROR_MSG, + name); + ERROR_NO_POP(); + } } - err = PyObject_DelItem(ns, name); - // Can't use ERROR_IF here. - if (err != 0) { - _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, - NAME_ERROR_MSG, - name); - ERROR_NO_POP(); + + else { + if (PyDict_CheckExact(ns)) { + err = PyDict_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); + } + else { + err = PyObject_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); + } + PyStackRef_CLOSE(v); + ERROR_IF(err); } } diff --git a/Python/codegen.c b/Python/codegen.c index 5749b615386717..61c7a708081374 100644 --- a/Python/codegen.c +++ b/Python/codegen.c @@ -3349,7 +3349,10 @@ codegen_nameop(compiler *c, location loc, : LOAD_NAME; break; case Store: op = STORE_NAME; break; - case Del: op = DELETE_NAME; break; + case Del: + ADDOP(c, loc, PUSH_NULL); + op = STORE_NAME; + break; } break; } diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index 7a698e422abd77..c83e3b91e52d4d 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -7312,99 +7312,7 @@ break; } - case _STORE_NAME_r10: { - CHECK_CURRENT_CACHED_VALUES(1); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - _PyStackRef v; - _PyStackRef _stack_item_0 = _tos_cache0; - oparg = CURRENT_OPARG(); - v = _stack_item_0; - PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); - PyObject *ns = LOCALS(); - int err; - if (ns == NULL) { - stack_pointer[0] = v; - stack_pointer += 1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyErr_Format(tstate, PyExc_SystemError, - "no locals found when storing %R", name); - stack_pointer = _PyFrame_GetStackPointer(frame); - stack_pointer += -1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - PyStackRef_CLOSE(v); - stack_pointer = _PyFrame_GetStackPointer(frame); - SET_CURRENT_CACHED_VALUES(0); - JUMP_TO_ERROR(); - } - if (PyDict_CheckExact(ns)) { - stack_pointer[0] = v; - stack_pointer += 1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - err = PyDict_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); - stack_pointer = _PyFrame_GetStackPointer(frame); - } - else { - stack_pointer[0] = v; - stack_pointer += 1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - err = PyObject_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); - stack_pointer = _PyFrame_GetStackPointer(frame); - } - stack_pointer += -1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - PyStackRef_CLOSE(v); - stack_pointer = _PyFrame_GetStackPointer(frame); - if (err) { - SET_CURRENT_CACHED_VALUES(0); - JUMP_TO_ERROR(); - } - _tos_cache0 = PyStackRef_ZERO_BITS; - _tos_cache1 = PyStackRef_ZERO_BITS; - _tos_cache2 = PyStackRef_ZERO_BITS; - SET_CURRENT_CACHED_VALUES(0); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - break; - } - - case _DELETE_NAME_r00: { - CHECK_CURRENT_CACHED_VALUES(0); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - oparg = CURRENT_OPARG(); - PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); - PyObject *ns = LOCALS(); - int err; - if (ns == NULL) { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyErr_Format(tstate, PyExc_SystemError, - "no locals when deleting %R", name); - stack_pointer = _PyFrame_GetStackPointer(frame); - SET_CURRENT_CACHED_VALUES(0); - JUMP_TO_ERROR(); - } - _PyFrame_SetStackPointer(frame, stack_pointer); - err = PyObject_DelItem(ns, name); - stack_pointer = _PyFrame_GetStackPointer(frame); - if (err != 0) { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, - NAME_ERROR_MSG, - name); - stack_pointer = _PyFrame_GetStackPointer(frame); - SET_CURRENT_CACHED_VALUES(0); - JUMP_TO_ERROR(); - } - _tos_cache0 = PyStackRef_ZERO_BITS; - _tos_cache1 = PyStackRef_ZERO_BITS; - _tos_cache2 = PyStackRef_ZERO_BITS; - SET_CURRENT_CACHED_VALUES(0); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - break; - } + /* _STORE_NAME is not a viable micro-op for tier 2 because it has both popping and not-popping errors */ case _UNPACK_SEQUENCE_r10: { CHECK_CURRENT_CACHED_VALUES(1); diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 72619fd3afa91a..ac8e3f84f541d5 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -5443,38 +5443,6 @@ DISPATCH(); } - TARGET(DELETE_NAME) { - #if _Py_TAIL_CALL_INTERP - int opcode = DELETE_NAME; - (void)(opcode); - #endif - frame->instr_ptr = next_instr; - next_instr += 1; - INSTRUCTION_STATS(DELETE_NAME); - PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); - PyObject *ns = LOCALS(); - int err; - if (ns == NULL) { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyErr_Format(tstate, PyExc_SystemError, - "no locals when deleting %R", name); - stack_pointer = _PyFrame_GetStackPointer(frame); - JUMP_TO_LABEL(error); - } - _PyFrame_SetStackPointer(frame, stack_pointer); - err = PyObject_DelItem(ns, name); - stack_pointer = _PyFrame_GetStackPointer(frame); - if (err != 0) { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, - NAME_ERROR_MSG, - name); - stack_pointer = _PyFrame_GetStackPointer(frame); - JUMP_TO_LABEL(error); - } - DISPATCH(); - } - TARGET(DELETE_SUBSCR) { #if _Py_TAIL_CALL_INTERP int opcode = DELETE_SUBSCR; @@ -11386,23 +11354,40 @@ stack_pointer = _PyFrame_GetStackPointer(frame); JUMP_TO_LABEL(error); } - if (PyDict_CheckExact(ns)) { + if (PyStackRef_IsNull(v)) { + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); _PyFrame_SetStackPointer(frame, stack_pointer); - err = PyDict_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); + err = PyObject_DelItem(ns, name); stack_pointer = _PyFrame_GetStackPointer(frame); + if (err != 0) { + _PyFrame_SetStackPointer(frame, stack_pointer); + _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, + NAME_ERROR_MSG, + name); + stack_pointer = _PyFrame_GetStackPointer(frame); + JUMP_TO_LABEL(error); + } } else { + if (PyDict_CheckExact(ns)) { + _PyFrame_SetStackPointer(frame, stack_pointer); + err = PyDict_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); + stack_pointer = _PyFrame_GetStackPointer(frame); + } + else { + _PyFrame_SetStackPointer(frame, stack_pointer); + err = PyObject_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); + stack_pointer = _PyFrame_GetStackPointer(frame); + } + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); _PyFrame_SetStackPointer(frame, stack_pointer); - err = PyObject_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); + PyStackRef_CLOSE(v); stack_pointer = _PyFrame_GetStackPointer(frame); - } - stack_pointer += -1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - PyStackRef_CLOSE(v); - stack_pointer = _PyFrame_GetStackPointer(frame); - if (err) { - JUMP_TO_LABEL(error); + if (err) { + JUMP_TO_LABEL(error); + } } DISPATCH(); } diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h index f57c33feec2ac2..46721be3aff249 100644 --- a/Python/opcode_targets.h +++ b/Python/opcode_targets.h @@ -65,7 +65,6 @@ static void *opcode_targets_table[256] = { &&TARGET_DELETE_DEREF, &&TARGET_DELETE_FAST, &&TARGET_DELETE_GLOBAL, - &&TARGET_DELETE_NAME, &&TARGET_DICT_MERGE, &&TARGET_DICT_UPDATE, &&TARGET_END_ASYNC_FOR, @@ -128,6 +127,7 @@ static void *opcode_targets_table[256] = { &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, + &&_unknown_opcode, &&TARGET_RESUME, &&TARGET_BINARY_OP_ADD_FLOAT, &&TARGET_BINARY_OP_ADD_INT, @@ -379,7 +379,7 @@ static void *opcode_tracing_targets_table[256] = { &&TARGET_TRACE_RECORD, &&TARGET_TRACE_RECORD, &&TARGET_TRACE_RECORD, - &&TARGET_TRACE_RECORD, + &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, &&_unknown_opcode, @@ -604,7 +604,6 @@ static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DELETE_ATTR(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DELETE_DEREF(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DELETE_FAST(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DELETE_GLOBAL(TAIL_CALL_PARAMS); -static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DELETE_NAME(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DELETE_SUBSCR(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DICT_MERGE(TAIL_CALL_PARAMS); static PyObject *Py_PRESERVE_NONE_CC _TAIL_CALL_DICT_UPDATE(TAIL_CALL_PARAMS); @@ -845,7 +844,6 @@ static py_tail_call_funcptr instruction_funcptr_handler_table[256] = { [DELETE_DEREF] = _TAIL_CALL_DELETE_DEREF, [DELETE_FAST] = _TAIL_CALL_DELETE_FAST, [DELETE_GLOBAL] = _TAIL_CALL_DELETE_GLOBAL, - [DELETE_NAME] = _TAIL_CALL_DELETE_NAME, [DELETE_SUBSCR] = _TAIL_CALL_DELETE_SUBSCR, [DICT_MERGE] = _TAIL_CALL_DICT_MERGE, [DICT_UPDATE] = _TAIL_CALL_DICT_UPDATE, @@ -1000,6 +998,7 @@ static py_tail_call_funcptr instruction_funcptr_handler_table[256] = { [UNPACK_SEQUENCE_TWO_TUPLE] = _TAIL_CALL_UNPACK_SEQUENCE_TWO_TUPLE, [WITH_EXCEPT_START] = _TAIL_CALL_WITH_EXCEPT_START, [YIELD_VALUE] = _TAIL_CALL_YIELD_VALUE, + [120] = _TAIL_CALL_UNKNOWN_OPCODE, [121] = _TAIL_CALL_UNKNOWN_OPCODE, [122] = _TAIL_CALL_UNKNOWN_OPCODE, [123] = _TAIL_CALL_UNKNOWN_OPCODE, @@ -1103,7 +1102,6 @@ static py_tail_call_funcptr instruction_funcptr_tracing_table[256] = { [DELETE_DEREF] = _TAIL_CALL_TRACE_RECORD, [DELETE_FAST] = _TAIL_CALL_TRACE_RECORD, [DELETE_GLOBAL] = _TAIL_CALL_TRACE_RECORD, - [DELETE_NAME] = _TAIL_CALL_TRACE_RECORD, [DELETE_SUBSCR] = _TAIL_CALL_TRACE_RECORD, [DICT_MERGE] = _TAIL_CALL_TRACE_RECORD, [DICT_UPDATE] = _TAIL_CALL_TRACE_RECORD, @@ -1258,6 +1256,7 @@ static py_tail_call_funcptr instruction_funcptr_tracing_table[256] = { [UNPACK_SEQUENCE_TWO_TUPLE] = _TAIL_CALL_TRACE_RECORD, [WITH_EXCEPT_START] = _TAIL_CALL_TRACE_RECORD, [YIELD_VALUE] = _TAIL_CALL_TRACE_RECORD, + [120] = _TAIL_CALL_UNKNOWN_OPCODE, [121] = _TAIL_CALL_UNKNOWN_OPCODE, [122] = _TAIL_CALL_UNKNOWN_OPCODE, [123] = _TAIL_CALL_UNKNOWN_OPCODE, diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 2df50ebbcaa1c0..913bd3c6c8d07d 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -1447,16 +1447,7 @@ break; } - case _STORE_NAME: { - CHECK_STACK_BOUNDS(-1); - stack_pointer += -1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - break; - } - - case _DELETE_NAME: { - break; - } + /* _STORE_NAME is not a viable micro-op for tier 2 */ case _UNPACK_SEQUENCE: { JitOptRef *values; From ed1b9710d5c4330df4908126bdcab1cbb426a611 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2026 02:23:49 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2026-03-16-02-23-48.gh-issue-145854.rRexF3.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Core_and_Builtins/2026-03-16-02-23-48.gh-issue-145854.rRexF3.rst diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-03-16-02-23-48.gh-issue-145854.rRexF3.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-03-16-02-23-48.gh-issue-145854.rRexF3.rst new file mode 100644 index 00000000000000..a4944615369edf --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2026-03-16-02-23-48.gh-issue-145854.rRexF3.rst @@ -0,0 +1 @@ +The ``DELETE_NAME`` opcode is now replaced with ``PUSH_NULL; STORE_NAME``. From 93d91b8f305202506c3ce178ee2343f502d884fa Mon Sep 17 00:00:00 2001 From: Brij <97006829+bkap123@users.noreply.github.com> Date: Mon, 16 Mar 2026 17:53:05 -0400 Subject: [PATCH 3/3] Updated STORE_FAST; Changed magic number; Added test --- Include/internal/pycore_magic_number.h | 3 ++- Lib/test/test_compiler_codegen.py | 12 ++++++++++ Modules/_testinternalcapi/test_cases.c.h | 28 +++++++++++++++--------- Python/bytecodes.c | 18 ++++++++++----- Python/generated_cases.c.h | 28 +++++++++++++++--------- 5 files changed, 63 insertions(+), 26 deletions(-) diff --git a/Include/internal/pycore_magic_number.h b/Include/internal/pycore_magic_number.h index 3fcf650426d36d..a7a0c60fd5d53f 100644 --- a/Include/internal/pycore_magic_number.h +++ b/Include/internal/pycore_magic_number.h @@ -292,6 +292,7 @@ Known values: Python 3.15a4 3659 (Add CALL_FUNCTION_EX specialization) Python 3.15a4 3660 (Change generator preamble code) Python 3.15a4 3661 (Lazy imports IMPORT_NAME opcode changes) + Python 3.15a7+ 3662 (Replace DELETE_FAST with PUSH_NULL; STORE_FAST) Python 3.16 will start with 3700 @@ -305,7 +306,7 @@ PC/launcher.c must also be updated. */ -#define PYC_MAGIC_NUMBER 3661 +#define PYC_MAGIC_NUMBER 3662 /* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes (little-endian) and then appending b'\r\n'. */ #define PYC_MAGIC_NUMBER_TOKEN \ diff --git a/Lib/test/test_compiler_codegen.py b/Lib/test/test_compiler_codegen.py index d02937c84d9534..ef9baf680873e2 100644 --- a/Lib/test/test_compiler_codegen.py +++ b/Lib/test/test_compiler_codegen.py @@ -161,3 +161,15 @@ def test_syntax_error__return_not_in_function(self): self.assertIsNone(cm.exception.text) self.assertEqual(cm.exception.offset, 1) self.assertEqual(cm.exception.end_offset, 10) + + def test_del_for_store_name(self): + snippet = "del x" + expected = [ + ('RESUME', 0), + ('ANNOTATIONS_PLACEHOLDER', None), + ('PUSH_NULL', None), + ('STORE_NAME', 0), + ('LOAD_CONST', 0), + ('RETURN_VALUE', None), + ] + self.codegen_test(snippet, expected) diff --git a/Modules/_testinternalcapi/test_cases.c.h b/Modules/_testinternalcapi/test_cases.c.h index 49ca360ee2129c..a4715913b1047c 100644 --- a/Modules/_testinternalcapi/test_cases.c.h +++ b/Modules/_testinternalcapi/test_cases.c.h @@ -11344,26 +11344,34 @@ v = stack_pointer[-1]; PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); PyObject *ns = LOCALS(); + int deletion = PyStackRef_IsNull(v); int err; if (ns == NULL) { + const char *msg = deletion + ? "no locals found when deleting %R" + : "no locals found when storing %R"; _PyFrame_SetStackPointer(frame, stack_pointer); - _PyErr_Format(tstate, PyExc_SystemError, - "no locals found when storing %R", name); + _PyErr_Format(tstate, PyExc_SystemError, msg, name); stack_pointer = _PyFrame_GetStackPointer(frame); - stack_pointer += -1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - PyStackRef_CLOSE(v); - stack_pointer = _PyFrame_GetStackPointer(frame); - JUMP_TO_LABEL(error); + if (deletion) { + } + else { + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + _PyFrame_SetStackPointer(frame, stack_pointer); + PyStackRef_CLOSE(v); + stack_pointer = _PyFrame_GetStackPointer(frame); + stack_pointer += 1; + } + JUMP_TO_LABEL(pop_1_error); } - if (PyStackRef_IsNull(v)) { + if (deletion) { stack_pointer += -1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); _PyFrame_SetStackPointer(frame, stack_pointer); err = PyObject_DelItem(ns, name); stack_pointer = _PyFrame_GetStackPointer(frame); - if (err != 0) { + if (err) { _PyFrame_SetStackPointer(frame, stack_pointer); _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, NAME_ERROR_MSG, diff --git a/Python/bytecodes.c b/Python/bytecodes.c index b92bde1a0c98af..e48f46e0614f9f 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -1628,18 +1628,26 @@ dummy_func( inst(STORE_NAME, (v -- )) { PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); PyObject *ns = LOCALS(); + int deletion = PyStackRef_IsNull(v); int err; if (ns == NULL) { - _PyErr_Format(tstate, PyExc_SystemError, - "no locals found when storing %R", name); - PyStackRef_CLOSE(v); + const char *msg = deletion + ? "no locals found when deleting %R" + : "no locals found when storing %R"; + _PyErr_Format(tstate, PyExc_SystemError, msg, name); + if (deletion) { + DEAD(v); + } + else { + PyStackRef_CLOSE(v); + } ERROR_IF(true); } - if (PyStackRef_IsNull(v)) { + if (deletion) { DEAD(v); err = PyObject_DelItem(ns, name); - if (err != 0) { + if (err) { _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, NAME_ERROR_MSG, name); diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index ac8e3f84f541d5..96f9c3368b2ceb 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -11341,26 +11341,34 @@ v = stack_pointer[-1]; PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); PyObject *ns = LOCALS(); + int deletion = PyStackRef_IsNull(v); int err; if (ns == NULL) { + const char *msg = deletion + ? "no locals found when deleting %R" + : "no locals found when storing %R"; _PyFrame_SetStackPointer(frame, stack_pointer); - _PyErr_Format(tstate, PyExc_SystemError, - "no locals found when storing %R", name); + _PyErr_Format(tstate, PyExc_SystemError, msg, name); stack_pointer = _PyFrame_GetStackPointer(frame); - stack_pointer += -1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - PyStackRef_CLOSE(v); - stack_pointer = _PyFrame_GetStackPointer(frame); - JUMP_TO_LABEL(error); + if (deletion) { + } + else { + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); + _PyFrame_SetStackPointer(frame, stack_pointer); + PyStackRef_CLOSE(v); + stack_pointer = _PyFrame_GetStackPointer(frame); + stack_pointer += 1; + } + JUMP_TO_LABEL(pop_1_error); } - if (PyStackRef_IsNull(v)) { + if (deletion) { stack_pointer += -1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); _PyFrame_SetStackPointer(frame, stack_pointer); err = PyObject_DelItem(ns, name); stack_pointer = _PyFrame_GetStackPointer(frame); - if (err != 0) { + if (err) { _PyFrame_SetStackPointer(frame, stack_pointer); _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, NAME_ERROR_MSG,