https://github.com/python/cpython/commit/c393ab61d9d999a24735e883ef58c72132c... commit: c393ab61d9d999a24735e883ef58c72132c857f6 branch: main author: Brij Kapadia <97006829+brijkapadia@users.noreply.github.com> committer: markshannon <Mark.Shannon@arm.com> date: 2026-06-30T17:21:31+01:00 summary: gh-145854: Replace `DELETE_NAME` with `PUSH_NULL; STORE_NAME` (GH-146006) files: A Misc/NEWS.d/next/Core_and_Builtins/2026-03-16-02-23-48.gh-issue-145854.rRexF3.rst M Doc/library/dis.rst M Doc/tools/removed-ids.txt M Include/internal/pycore_ceval.h M Include/internal/pycore_magic_number.h M Include/internal/pycore_opcode_metadata.h M Include/internal/pycore_uop_ids.h M Include/internal/pycore_uop_metadata.h M Include/opcode_ids.h M Lib/_opcode_metadata.py M Lib/test/test_code.py M Lib/test/test_compiler_codegen.py M Modules/_testinternalcapi/test_cases.c.h M Modules/_testinternalcapi/test_targets.h M Programs/test_frozenmain.h M Python/bytecodes.c M Python/ceval.c M Python/codegen.c M Python/executor_cases.c.h M Python/generated_cases.c.h M Python/opcode_targets.h M Python/optimizer_cases.c.h diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst index 4e1ba4327faec49..294604c70642ece 100644 --- a/Doc/library/dis.rst +++ b/Doc/library/dis.rst @@ -1056,12 +1056,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 <code-objects>`. - - .. opcode:: UNPACK_SEQUENCE (count) Unpacks ``STACK[-1]`` into *count* individual values, which are put onto the stack @@ -1119,7 +1113,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/Doc/tools/removed-ids.txt b/Doc/tools/removed-ids.txt index 0549ae735a92d63..d5dc3854c5ccaa2 100644 --- a/Doc/tools/removed-ids.txt +++ b/Doc/tools/removed-ids.txt @@ -6,7 +6,9 @@ c-api/file.html: deprecated-api # Removed sections library/asyncio-task.html: terminating-a-task-group +library/dis.html: opcode-DELETE_NAME library/asyncio-llapi-index.html: event-loop-policies + deprecations/index.html: pending-removal-in-python-3-15 deprecations/index.html: pending-removal-in-python-3-16 deprecations/index.html: c-api-pending-removal-in-python-3-15 diff --git a/Include/internal/pycore_ceval.h b/Include/internal/pycore_ceval.h index 06c4ca1619d7ce1..19b5473271fffb5 100644 --- a/Include/internal/pycore_ceval.h +++ b/Include/internal/pycore_ceval.h @@ -329,6 +329,7 @@ PyAPI_FUNC(PyObject *) _PyEval_LoadName(PyThreadState *tstate, _PyInterpreterFra PyAPI_FUNC(int) _Py_Check_ArgsIterable(PyThreadState *tstate, PyObject *func, PyObject *args); PyAPI_FUNC(_PyStackRef) _PyEval_GetIter(_PyStackRef iterable, _PyStackRef *null_or_index, int yield_from); +PyAPI_FUNC(int) _PyEval_StoreName(PyThreadState *tstate, _PyStackRef v, PyObject *name, PyObject* ns); /* * Indicate whether a special method of given 'oparg' can use the (improved) diff --git a/Include/internal/pycore_magic_number.h b/Include/internal/pycore_magic_number.h index 6a8fa124ba38a7c..3530da1109a42e5 100644 --- a/Include/internal/pycore_magic_number.h +++ b/Include/internal/pycore_magic_number.h @@ -299,6 +299,7 @@ Known values: Python 3.15b1 3666 (Add SEND_VIRTUAL and SEND_ASYNC_GEN specializations) Python 3.16a0 3700 (Initial version) Python 3.16a0 3701 (Add CONSTANT_EMPTY_TUPLE to LOAD_COMMON_CONSTANT) + Python 3.16a1 3702 (Replace DELETE_NAME with PUSH_NULL; STORE_NAME) Python 3.17 will start with 3750 @@ -312,7 +313,7 @@ PC/launcher.c must also be updated. */ -#define PYC_MAGIC_NUMBER 3701 +#define PYC_MAGIC_NUMBER 3702 /* 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/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h index 025a521ef99effa..09a56608e25ee85 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: @@ -687,8 +685,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: @@ -1186,7 +1182,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_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, [DICT_UPDATE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG }, @@ -1439,7 +1434,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 = 2, .uops = { { _DICT_MERGE, OPARG_SIMPLE, 0 }, { _POP_TOP, OPARG_SIMPLE, 0 } } }, [DICT_UPDATE] = { .nuops = 2, .uops = { { _DICT_UPDATE, OPARG_SIMPLE, 0 }, { _POP_TOP, OPARG_SIMPLE, 0 } } }, @@ -1644,7 +1638,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", @@ -1848,6 +1841,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] = { + [119] = 119, [120] = 120, [121] = 121, [122] = 122, @@ -1944,7 +1938,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, @@ -2109,6 +2102,7 @@ const uint8_t _PyOpcode_Deopt[256] = { #endif // NEED_OPCODE_METADATA #define EXTRA_CASES \ + case 119: \ case 120: \ case 121: \ case 122: \ diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index 7c44c0a430b7311..9345b4d4f036aa5 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -124,7 +124,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 399 #define _DICT_MERGE 400 @@ -651,800 +650,799 @@ extern "C" { #define _DELETE_DEREF_r00 863 #define _DELETE_FAST_r00 864 #define _DELETE_GLOBAL_r00 865 -#define _DELETE_NAME_r00 866 -#define _DELETE_SUBSCR_r20 867 -#define _DEOPT_r00 868 -#define _DEOPT_r10 869 -#define _DEOPT_r20 870 -#define _DEOPT_r30 871 -#define _DICT_MERGE_r11 872 -#define _DICT_UPDATE_r11 873 -#define _DO_CALL_r01 874 -#define _DO_CALL_FUNCTION_EX_r31 875 -#define _DO_CALL_KW_r11 876 -#define _DYNAMIC_EXIT_r00 877 -#define _DYNAMIC_EXIT_r10 878 -#define _DYNAMIC_EXIT_r20 879 -#define _DYNAMIC_EXIT_r30 880 -#define _END_FOR_r10 881 -#define _END_SEND_r31 882 -#define _ERROR_POP_N_r00 883 -#define _EXIT_INIT_CHECK_r10 884 -#define _EXIT_TRACE_r00 885 -#define _EXIT_TRACE_r10 886 -#define _EXIT_TRACE_r20 887 -#define _EXIT_TRACE_r30 888 -#define _EXPAND_METHOD_r00 889 -#define _EXPAND_METHOD_KW_r11 890 -#define _FATAL_ERROR_r00 891 -#define _FATAL_ERROR_r11 892 -#define _FATAL_ERROR_r22 893 -#define _FATAL_ERROR_r33 894 -#define _FORMAT_SIMPLE_r11 895 -#define _FORMAT_WITH_SPEC_r21 896 -#define _FOR_ITER_r23 897 -#define _FOR_ITER_GEN_FRAME_r03 898 -#define _FOR_ITER_GEN_FRAME_r13 899 -#define _FOR_ITER_GEN_FRAME_r23 900 -#define _FOR_ITER_TIER_TWO_r23 901 -#define _FOR_ITER_VIRTUAL_r23 902 -#define _FOR_ITER_VIRTUAL_TIER_TWO_r23 903 -#define _GET_AITER_r11 904 -#define _GET_ANEXT_r12 905 -#define _GET_AWAITABLE_r11 906 -#define _GET_ITER_r12 907 -#define _GET_ITER_TRAD_r12 908 -#define _GET_LEN_r12 909 -#define _GUARD_3OS_ASYNC_GEN_ASEND_r03 910 -#define _GUARD_3OS_ASYNC_GEN_ASEND_r13 911 -#define _GUARD_3OS_ASYNC_GEN_ASEND_r23 912 -#define _GUARD_3OS_ASYNC_GEN_ASEND_r33 913 -#define _GUARD_BINARY_OP_EXTEND_r22 914 -#define _GUARD_BINARY_OP_EXTEND_LHS_r02 915 -#define _GUARD_BINARY_OP_EXTEND_LHS_r12 916 -#define _GUARD_BINARY_OP_EXTEND_LHS_r22 917 -#define _GUARD_BINARY_OP_EXTEND_LHS_r33 918 -#define _GUARD_BINARY_OP_EXTEND_RHS_r02 919 -#define _GUARD_BINARY_OP_EXTEND_RHS_r12 920 -#define _GUARD_BINARY_OP_EXTEND_RHS_r22 921 -#define _GUARD_BINARY_OP_EXTEND_RHS_r33 922 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r02 923 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r12 924 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r22 925 -#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r33 926 -#define _GUARD_BIT_IS_SET_POP_r00 927 -#define _GUARD_BIT_IS_SET_POP_r10 928 -#define _GUARD_BIT_IS_SET_POP_r21 929 -#define _GUARD_BIT_IS_SET_POP_r32 930 -#define _GUARD_BIT_IS_SET_POP_4_r00 931 -#define _GUARD_BIT_IS_SET_POP_4_r10 932 -#define _GUARD_BIT_IS_SET_POP_4_r21 933 -#define _GUARD_BIT_IS_SET_POP_4_r32 934 -#define _GUARD_BIT_IS_SET_POP_5_r00 935 -#define _GUARD_BIT_IS_SET_POP_5_r10 936 -#define _GUARD_BIT_IS_SET_POP_5_r21 937 -#define _GUARD_BIT_IS_SET_POP_5_r32 938 -#define _GUARD_BIT_IS_SET_POP_6_r00 939 -#define _GUARD_BIT_IS_SET_POP_6_r10 940 -#define _GUARD_BIT_IS_SET_POP_6_r21 941 -#define _GUARD_BIT_IS_SET_POP_6_r32 942 -#define _GUARD_BIT_IS_SET_POP_7_r00 943 -#define _GUARD_BIT_IS_SET_POP_7_r10 944 -#define _GUARD_BIT_IS_SET_POP_7_r21 945 -#define _GUARD_BIT_IS_SET_POP_7_r32 946 -#define _GUARD_BIT_IS_UNSET_POP_r00 947 -#define _GUARD_BIT_IS_UNSET_POP_r10 948 -#define _GUARD_BIT_IS_UNSET_POP_r21 949 -#define _GUARD_BIT_IS_UNSET_POP_r32 950 -#define _GUARD_BIT_IS_UNSET_POP_4_r00 951 -#define _GUARD_BIT_IS_UNSET_POP_4_r10 952 -#define _GUARD_BIT_IS_UNSET_POP_4_r21 953 -#define _GUARD_BIT_IS_UNSET_POP_4_r32 954 -#define _GUARD_BIT_IS_UNSET_POP_5_r00 955 -#define _GUARD_BIT_IS_UNSET_POP_5_r10 956 -#define _GUARD_BIT_IS_UNSET_POP_5_r21 957 -#define _GUARD_BIT_IS_UNSET_POP_5_r32 958 -#define _GUARD_BIT_IS_UNSET_POP_6_r00 959 -#define _GUARD_BIT_IS_UNSET_POP_6_r10 960 -#define _GUARD_BIT_IS_UNSET_POP_6_r21 961 -#define _GUARD_BIT_IS_UNSET_POP_6_r32 962 -#define _GUARD_BIT_IS_UNSET_POP_7_r00 963 -#define _GUARD_BIT_IS_UNSET_POP_7_r10 964 -#define _GUARD_BIT_IS_UNSET_POP_7_r21 965 -#define _GUARD_BIT_IS_UNSET_POP_7_r32 966 -#define _GUARD_CALLABLE_BUILTIN_CLASS_r00 967 -#define _GUARD_CALLABLE_BUILTIN_FAST_r00 968 -#define _GUARD_CALLABLE_BUILTIN_FAST_WITH_KEYWORDS_r00 969 -#define _GUARD_CALLABLE_BUILTIN_O_r00 970 -#define _GUARD_CALLABLE_ISINSTANCE_r03 971 -#define _GUARD_CALLABLE_ISINSTANCE_r13 972 -#define _GUARD_CALLABLE_ISINSTANCE_r23 973 -#define _GUARD_CALLABLE_ISINSTANCE_r33 974 -#define _GUARD_CALLABLE_LEN_r03 975 -#define _GUARD_CALLABLE_LEN_r13 976 -#define _GUARD_CALLABLE_LEN_r23 977 -#define _GUARD_CALLABLE_LEN_r33 978 -#define _GUARD_CALLABLE_LIST_APPEND_r03 979 -#define _GUARD_CALLABLE_LIST_APPEND_r13 980 -#define _GUARD_CALLABLE_LIST_APPEND_r23 981 -#define _GUARD_CALLABLE_LIST_APPEND_r33 982 -#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_r00 983 -#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r00 984 -#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS_r00 985 -#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_O_r00 986 -#define _GUARD_CALLABLE_STR_1_r03 987 -#define _GUARD_CALLABLE_STR_1_r13 988 -#define _GUARD_CALLABLE_STR_1_r23 989 -#define _GUARD_CALLABLE_STR_1_r33 990 -#define _GUARD_CALLABLE_TUPLE_1_r03 991 -#define _GUARD_CALLABLE_TUPLE_1_r13 992 -#define _GUARD_CALLABLE_TUPLE_1_r23 993 -#define _GUARD_CALLABLE_TUPLE_1_r33 994 -#define _GUARD_CALLABLE_TYPE_1_r03 995 -#define _GUARD_CALLABLE_TYPE_1_r13 996 -#define _GUARD_CALLABLE_TYPE_1_r23 997 -#define _GUARD_CALLABLE_TYPE_1_r33 998 -#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r00 999 -#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r11 1000 -#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r22 1001 -#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r33 1002 -#define _GUARD_CODE_VERSION_RETURN_VALUE_r00 1003 -#define _GUARD_CODE_VERSION_RETURN_VALUE_r11 1004 -#define _GUARD_CODE_VERSION_RETURN_VALUE_r22 1005 -#define _GUARD_CODE_VERSION_RETURN_VALUE_r33 1006 -#define _GUARD_CODE_VERSION_YIELD_VALUE_r00 1007 -#define _GUARD_CODE_VERSION_YIELD_VALUE_r11 1008 -#define _GUARD_CODE_VERSION_YIELD_VALUE_r22 1009 -#define _GUARD_CODE_VERSION_YIELD_VALUE_r33 1010 -#define _GUARD_CODE_VERSION__PUSH_FRAME_r00 1011 -#define _GUARD_CODE_VERSION__PUSH_FRAME_r11 1012 -#define _GUARD_CODE_VERSION__PUSH_FRAME_r22 1013 -#define _GUARD_CODE_VERSION__PUSH_FRAME_r33 1014 -#define _GUARD_DORV_NO_DICT_r01 1015 -#define _GUARD_DORV_NO_DICT_r11 1016 -#define _GUARD_DORV_NO_DICT_r22 1017 -#define _GUARD_DORV_NO_DICT_r33 1018 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 1019 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 1020 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 1021 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 1022 -#define _GUARD_GLOBALS_VERSION_r00 1023 -#define _GUARD_GLOBALS_VERSION_r11 1024 -#define _GUARD_GLOBALS_VERSION_r22 1025 -#define _GUARD_GLOBALS_VERSION_r33 1026 -#define _GUARD_IP_RETURN_GENERATOR_r00 1027 -#define _GUARD_IP_RETURN_GENERATOR_r11 1028 -#define _GUARD_IP_RETURN_GENERATOR_r22 1029 -#define _GUARD_IP_RETURN_GENERATOR_r33 1030 -#define _GUARD_IP_RETURN_VALUE_r00 1031 -#define _GUARD_IP_RETURN_VALUE_r11 1032 -#define _GUARD_IP_RETURN_VALUE_r22 1033 -#define _GUARD_IP_RETURN_VALUE_r33 1034 -#define _GUARD_IP_YIELD_VALUE_r00 1035 -#define _GUARD_IP_YIELD_VALUE_r11 1036 -#define _GUARD_IP_YIELD_VALUE_r22 1037 -#define _GUARD_IP_YIELD_VALUE_r33 1038 -#define _GUARD_IP__PUSH_FRAME_r00 1039 -#define _GUARD_IP__PUSH_FRAME_r11 1040 -#define _GUARD_IP__PUSH_FRAME_r22 1041 -#define _GUARD_IP__PUSH_FRAME_r33 1042 -#define _GUARD_IS_FALSE_POP_r00 1043 -#define _GUARD_IS_FALSE_POP_r10 1044 -#define _GUARD_IS_FALSE_POP_r21 1045 -#define _GUARD_IS_FALSE_POP_r32 1046 -#define _GUARD_IS_NONE_POP_r00 1047 -#define _GUARD_IS_NONE_POP_r10 1048 -#define _GUARD_IS_NONE_POP_r21 1049 -#define _GUARD_IS_NONE_POP_r32 1050 -#define _GUARD_IS_NOT_NONE_POP_r10 1051 -#define _GUARD_IS_TRUE_POP_r00 1052 -#define _GUARD_IS_TRUE_POP_r10 1053 -#define _GUARD_IS_TRUE_POP_r21 1054 -#define _GUARD_IS_TRUE_POP_r32 1055 -#define _GUARD_ITERATOR_r01 1056 -#define _GUARD_ITERATOR_r11 1057 -#define _GUARD_ITERATOR_r22 1058 -#define _GUARD_ITERATOR_r33 1059 -#define _GUARD_ITER_VIRTUAL_r01 1060 -#define _GUARD_ITER_VIRTUAL_r11 1061 -#define _GUARD_ITER_VIRTUAL_r22 1062 -#define _GUARD_ITER_VIRTUAL_r33 1063 -#define _GUARD_KEYS_VERSION_r01 1064 -#define _GUARD_KEYS_VERSION_r11 1065 -#define _GUARD_KEYS_VERSION_r22 1066 -#define _GUARD_KEYS_VERSION_r33 1067 -#define _GUARD_LOAD_SUPER_ATTR_METHOD_r03 1068 -#define _GUARD_LOAD_SUPER_ATTR_METHOD_r13 1069 -#define _GUARD_LOAD_SUPER_ATTR_METHOD_r23 1070 -#define _GUARD_LOAD_SUPER_ATTR_METHOD_r33 1071 -#define _GUARD_NOS_COMPACT_ASCII_r02 1072 -#define _GUARD_NOS_COMPACT_ASCII_r12 1073 -#define _GUARD_NOS_COMPACT_ASCII_r22 1074 -#define _GUARD_NOS_COMPACT_ASCII_r33 1075 -#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r03 1076 -#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r13 1077 -#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r23 1078 -#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r33 1079 -#define _GUARD_NOS_DICT_SUBSCRIPT_r02 1080 -#define _GUARD_NOS_DICT_SUBSCRIPT_r12 1081 -#define _GUARD_NOS_DICT_SUBSCRIPT_r22 1082 -#define _GUARD_NOS_DICT_SUBSCRIPT_r33 1083 -#define _GUARD_NOS_FLOAT_r02 1084 -#define _GUARD_NOS_FLOAT_r12 1085 -#define _GUARD_NOS_FLOAT_r22 1086 -#define _GUARD_NOS_FLOAT_r33 1087 -#define _GUARD_NOS_INT_r02 1088 -#define _GUARD_NOS_INT_r12 1089 -#define _GUARD_NOS_INT_r22 1090 -#define _GUARD_NOS_INT_r33 1091 -#define _GUARD_NOS_ITER_VIRTUAL_r02 1092 -#define _GUARD_NOS_ITER_VIRTUAL_r12 1093 -#define _GUARD_NOS_ITER_VIRTUAL_r22 1094 -#define _GUARD_NOS_ITER_VIRTUAL_r33 1095 -#define _GUARD_NOS_LIST_r02 1096 -#define _GUARD_NOS_LIST_r12 1097 -#define _GUARD_NOS_LIST_r22 1098 -#define _GUARD_NOS_LIST_r33 1099 -#define _GUARD_NOS_NOT_NULL_r02 1100 -#define _GUARD_NOS_NOT_NULL_r12 1101 -#define _GUARD_NOS_NOT_NULL_r22 1102 -#define _GUARD_NOS_NOT_NULL_r33 1103 -#define _GUARD_NOS_NULL_r02 1104 -#define _GUARD_NOS_NULL_r12 1105 -#define _GUARD_NOS_NULL_r22 1106 -#define _GUARD_NOS_NULL_r33 1107 -#define _GUARD_NOS_OVERFLOWED_r02 1108 -#define _GUARD_NOS_OVERFLOWED_r12 1109 -#define _GUARD_NOS_OVERFLOWED_r22 1110 -#define _GUARD_NOS_OVERFLOWED_r33 1111 -#define _GUARD_NOS_TUPLE_r02 1112 -#define _GUARD_NOS_TUPLE_r12 1113 -#define _GUARD_NOS_TUPLE_r22 1114 -#define _GUARD_NOS_TUPLE_r33 1115 -#define _GUARD_NOS_TYPE_VERSION_r02 1116 -#define _GUARD_NOS_TYPE_VERSION_r12 1117 -#define _GUARD_NOS_TYPE_VERSION_r22 1118 -#define _GUARD_NOS_TYPE_VERSION_r33 1119 -#define _GUARD_NOS_UNICODE_r02 1120 -#define _GUARD_NOS_UNICODE_r12 1121 -#define _GUARD_NOS_UNICODE_r22 1122 -#define _GUARD_NOS_UNICODE_r33 1123 -#define _GUARD_NOT_EXHAUSTED_LIST_r02 1124 -#define _GUARD_NOT_EXHAUSTED_LIST_r12 1125 -#define _GUARD_NOT_EXHAUSTED_LIST_r22 1126 -#define _GUARD_NOT_EXHAUSTED_LIST_r33 1127 -#define _GUARD_NOT_EXHAUSTED_RANGE_r02 1128 -#define _GUARD_NOT_EXHAUSTED_RANGE_r12 1129 -#define _GUARD_NOT_EXHAUSTED_RANGE_r22 1130 -#define _GUARD_NOT_EXHAUSTED_RANGE_r33 1131 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 1132 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 1133 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 1134 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 1135 -#define _GUARD_THIRD_NULL_r03 1136 -#define _GUARD_THIRD_NULL_r13 1137 -#define _GUARD_THIRD_NULL_r23 1138 -#define _GUARD_THIRD_NULL_r33 1139 -#define _GUARD_TOS_ANY_DICT_r01 1140 -#define _GUARD_TOS_ANY_DICT_r11 1141 -#define _GUARD_TOS_ANY_DICT_r22 1142 -#define _GUARD_TOS_ANY_DICT_r33 1143 -#define _GUARD_TOS_ANY_SET_r01 1144 -#define _GUARD_TOS_ANY_SET_r11 1145 -#define _GUARD_TOS_ANY_SET_r22 1146 -#define _GUARD_TOS_ANY_SET_r33 1147 -#define _GUARD_TOS_DICT_r01 1148 -#define _GUARD_TOS_DICT_r11 1149 -#define _GUARD_TOS_DICT_r22 1150 -#define _GUARD_TOS_DICT_r33 1151 -#define _GUARD_TOS_FLOAT_r01 1152 -#define _GUARD_TOS_FLOAT_r11 1153 -#define _GUARD_TOS_FLOAT_r22 1154 -#define _GUARD_TOS_FLOAT_r33 1155 -#define _GUARD_TOS_FROZENDICT_r01 1156 -#define _GUARD_TOS_FROZENDICT_r11 1157 -#define _GUARD_TOS_FROZENDICT_r22 1158 -#define _GUARD_TOS_FROZENDICT_r33 1159 -#define _GUARD_TOS_FROZENSET_r01 1160 -#define _GUARD_TOS_FROZENSET_r11 1161 -#define _GUARD_TOS_FROZENSET_r22 1162 -#define _GUARD_TOS_FROZENSET_r33 1163 -#define _GUARD_TOS_INT_r01 1164 -#define _GUARD_TOS_INT_r11 1165 -#define _GUARD_TOS_INT_r22 1166 -#define _GUARD_TOS_INT_r33 1167 -#define _GUARD_TOS_IS_NONE_r01 1168 -#define _GUARD_TOS_IS_NONE_r11 1169 -#define _GUARD_TOS_IS_NONE_r22 1170 -#define _GUARD_TOS_IS_NONE_r33 1171 -#define _GUARD_TOS_LIST_r01 1172 -#define _GUARD_TOS_LIST_r11 1173 -#define _GUARD_TOS_LIST_r22 1174 -#define _GUARD_TOS_LIST_r33 1175 -#define _GUARD_TOS_NOT_NULL_r01 1176 -#define _GUARD_TOS_NOT_NULL_r11 1177 -#define _GUARD_TOS_NOT_NULL_r22 1178 -#define _GUARD_TOS_NOT_NULL_r33 1179 -#define _GUARD_TOS_OVERFLOWED_r01 1180 -#define _GUARD_TOS_OVERFLOWED_r11 1181 -#define _GUARD_TOS_OVERFLOWED_r22 1182 -#define _GUARD_TOS_OVERFLOWED_r33 1183 -#define _GUARD_TOS_SET_r01 1184 -#define _GUARD_TOS_SET_r11 1185 -#define _GUARD_TOS_SET_r22 1186 -#define _GUARD_TOS_SET_r33 1187 -#define _GUARD_TOS_SLICE_r01 1188 -#define _GUARD_TOS_SLICE_r11 1189 -#define _GUARD_TOS_SLICE_r22 1190 -#define _GUARD_TOS_SLICE_r33 1191 -#define _GUARD_TOS_TUPLE_r01 1192 -#define _GUARD_TOS_TUPLE_r11 1193 -#define _GUARD_TOS_TUPLE_r22 1194 -#define _GUARD_TOS_TUPLE_r33 1195 -#define _GUARD_TOS_UNICODE_r01 1196 -#define _GUARD_TOS_UNICODE_r11 1197 -#define _GUARD_TOS_UNICODE_r22 1198 -#define _GUARD_TOS_UNICODE_r33 1199 -#define _GUARD_TYPE_r01 1200 -#define _GUARD_TYPE_r11 1201 -#define _GUARD_TYPE_r22 1202 -#define _GUARD_TYPE_r33 1203 -#define _GUARD_TYPE_ITER_r02 1204 -#define _GUARD_TYPE_ITER_r12 1205 -#define _GUARD_TYPE_ITER_r22 1206 -#define _GUARD_TYPE_ITER_r33 1207 -#define _GUARD_TYPE_VERSION_r01 1208 -#define _GUARD_TYPE_VERSION_r11 1209 -#define _GUARD_TYPE_VERSION_r22 1210 -#define _GUARD_TYPE_VERSION_r33 1211 -#define _GUARD_TYPE_VERSION_LOCKED_r01 1212 -#define _GUARD_TYPE_VERSION_LOCKED_r11 1213 -#define _GUARD_TYPE_VERSION_LOCKED_r22 1214 -#define _GUARD_TYPE_VERSION_LOCKED_r33 1215 -#define _HANDLE_PENDING_AND_DEOPT_r00 1216 -#define _HANDLE_PENDING_AND_DEOPT_r10 1217 -#define _HANDLE_PENDING_AND_DEOPT_r20 1218 -#define _HANDLE_PENDING_AND_DEOPT_r30 1219 -#define _IMPORT_FROM_r12 1220 -#define _IMPORT_NAME_r21 1221 -#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 1222 -#define _INIT_CALL_PY_EXACT_ARGS_r01 1223 -#define _INIT_CALL_PY_EXACT_ARGS_0_r01 1224 -#define _INIT_CALL_PY_EXACT_ARGS_1_r01 1225 -#define _INIT_CALL_PY_EXACT_ARGS_2_r01 1226 -#define _INIT_CALL_PY_EXACT_ARGS_3_r01 1227 -#define _INIT_CALL_PY_EXACT_ARGS_4_r01 1228 -#define _INSERT_NULL_r10 1229 -#define _INSTRUMENTED_FOR_ITER_r23 1230 -#define _INSTRUMENTED_INSTRUCTION_r00 1231 -#define _INSTRUMENTED_JUMP_FORWARD_r00 1232 -#define _INSTRUMENTED_JUMP_FORWARD_r11 1233 -#define _INSTRUMENTED_JUMP_FORWARD_r22 1234 -#define _INSTRUMENTED_JUMP_FORWARD_r33 1235 -#define _INSTRUMENTED_LINE_r00 1236 -#define _INSTRUMENTED_NOT_TAKEN_r00 1237 -#define _INSTRUMENTED_NOT_TAKEN_r11 1238 -#define _INSTRUMENTED_NOT_TAKEN_r22 1239 -#define _INSTRUMENTED_NOT_TAKEN_r33 1240 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 1241 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 1242 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 1243 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 1244 -#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 1245 -#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 1246 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 1247 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 1248 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 1249 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 1250 -#define _IS_NONE_r11 1251 -#define _IS_OP_r03 1252 -#define _IS_OP_r13 1253 -#define _IS_OP_r23 1254 -#define _ITER_CHECK_LIST_r02 1255 -#define _ITER_CHECK_LIST_r12 1256 -#define _ITER_CHECK_LIST_r22 1257 -#define _ITER_CHECK_LIST_r33 1258 -#define _ITER_CHECK_RANGE_r02 1259 -#define _ITER_CHECK_RANGE_r12 1260 -#define _ITER_CHECK_RANGE_r22 1261 -#define _ITER_CHECK_RANGE_r33 1262 -#define _ITER_CHECK_TUPLE_r02 1263 -#define _ITER_CHECK_TUPLE_r12 1264 -#define _ITER_CHECK_TUPLE_r22 1265 -#define _ITER_CHECK_TUPLE_r33 1266 -#define _ITER_JUMP_LIST_r02 1267 -#define _ITER_JUMP_LIST_r12 1268 -#define _ITER_JUMP_LIST_r22 1269 -#define _ITER_JUMP_LIST_r33 1270 -#define _ITER_JUMP_RANGE_r02 1271 -#define _ITER_JUMP_RANGE_r12 1272 -#define _ITER_JUMP_RANGE_r22 1273 -#define _ITER_JUMP_RANGE_r33 1274 -#define _ITER_JUMP_TUPLE_r02 1275 -#define _ITER_JUMP_TUPLE_r12 1276 -#define _ITER_JUMP_TUPLE_r22 1277 -#define _ITER_JUMP_TUPLE_r33 1278 -#define _ITER_NEXT_INLINE_r23 1279 -#define _ITER_NEXT_LIST_r23 1280 -#define _ITER_NEXT_LIST_TIER_TWO_r23 1281 -#define _ITER_NEXT_RANGE_r03 1282 -#define _ITER_NEXT_RANGE_r13 1283 -#define _ITER_NEXT_RANGE_r23 1284 -#define _ITER_NEXT_TUPLE_r03 1285 -#define _ITER_NEXT_TUPLE_r13 1286 -#define _ITER_NEXT_TUPLE_r23 1287 -#define _JUMP_BACKWARD_NO_INTERRUPT_r00 1288 -#define _JUMP_BACKWARD_NO_INTERRUPT_r11 1289 -#define _JUMP_BACKWARD_NO_INTERRUPT_r22 1290 -#define _JUMP_BACKWARD_NO_INTERRUPT_r33 1291 -#define _JUMP_TO_TOP_r00 1292 -#define _LIST_APPEND_r10 1293 -#define _LIST_EXTEND_r11 1294 -#define _LOAD_ATTR_r10 1295 -#define _LOAD_ATTR_CLASS_r11 1296 -#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_FRAME_r11 1297 -#define _LOAD_ATTR_INSTANCE_VALUE_r02 1298 -#define _LOAD_ATTR_INSTANCE_VALUE_r12 1299 -#define _LOAD_ATTR_INSTANCE_VALUE_r23 1300 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 1301 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 1302 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 1303 -#define _LOAD_ATTR_METHOD_NO_DICT_r02 1304 -#define _LOAD_ATTR_METHOD_NO_DICT_r12 1305 -#define _LOAD_ATTR_METHOD_NO_DICT_r23 1306 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 1307 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 1308 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 1309 -#define _LOAD_ATTR_MODULE_r12 1310 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 1311 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 1312 -#define _LOAD_ATTR_PROPERTY_FRAME_r01 1313 -#define _LOAD_ATTR_PROPERTY_FRAME_r11 1314 -#define _LOAD_ATTR_PROPERTY_FRAME_r22 1315 -#define _LOAD_ATTR_PROPERTY_FRAME_r33 1316 -#define _LOAD_ATTR_SLOT_r02 1317 -#define _LOAD_ATTR_SLOT_r12 1318 -#define _LOAD_ATTR_SLOT_r23 1319 -#define _LOAD_ATTR_WITH_HINT_r12 1320 -#define _LOAD_BUILD_CLASS_r01 1321 -#define _LOAD_BYTECODE_r00 1322 -#define _LOAD_COMMON_CONSTANT_r01 1323 -#define _LOAD_COMMON_CONSTANT_r12 1324 -#define _LOAD_COMMON_CONSTANT_r23 1325 -#define _LOAD_CONST_r01 1326 -#define _LOAD_CONST_r12 1327 -#define _LOAD_CONST_r23 1328 -#define _LOAD_CONST_INLINE_r01 1329 -#define _LOAD_CONST_INLINE_r12 1330 -#define _LOAD_CONST_INLINE_r23 1331 -#define _LOAD_CONST_INLINE_BORROW_r01 1332 -#define _LOAD_CONST_INLINE_BORROW_r12 1333 -#define _LOAD_CONST_INLINE_BORROW_r23 1334 -#define _LOAD_DEREF_r01 1335 -#define _LOAD_FAST_r01 1336 -#define _LOAD_FAST_r12 1337 -#define _LOAD_FAST_r23 1338 -#define _LOAD_FAST_0_r01 1339 -#define _LOAD_FAST_0_r12 1340 -#define _LOAD_FAST_0_r23 1341 -#define _LOAD_FAST_1_r01 1342 -#define _LOAD_FAST_1_r12 1343 -#define _LOAD_FAST_1_r23 1344 -#define _LOAD_FAST_2_r01 1345 -#define _LOAD_FAST_2_r12 1346 -#define _LOAD_FAST_2_r23 1347 -#define _LOAD_FAST_3_r01 1348 -#define _LOAD_FAST_3_r12 1349 -#define _LOAD_FAST_3_r23 1350 -#define _LOAD_FAST_4_r01 1351 -#define _LOAD_FAST_4_r12 1352 -#define _LOAD_FAST_4_r23 1353 -#define _LOAD_FAST_5_r01 1354 -#define _LOAD_FAST_5_r12 1355 -#define _LOAD_FAST_5_r23 1356 -#define _LOAD_FAST_6_r01 1357 -#define _LOAD_FAST_6_r12 1358 -#define _LOAD_FAST_6_r23 1359 -#define _LOAD_FAST_7_r01 1360 -#define _LOAD_FAST_7_r12 1361 -#define _LOAD_FAST_7_r23 1362 -#define _LOAD_FAST_AND_CLEAR_r01 1363 -#define _LOAD_FAST_AND_CLEAR_r12 1364 -#define _LOAD_FAST_AND_CLEAR_r23 1365 -#define _LOAD_FAST_BORROW_r01 1366 -#define _LOAD_FAST_BORROW_r12 1367 -#define _LOAD_FAST_BORROW_r23 1368 -#define _LOAD_FAST_BORROW_0_r01 1369 -#define _LOAD_FAST_BORROW_0_r12 1370 -#define _LOAD_FAST_BORROW_0_r23 1371 -#define _LOAD_FAST_BORROW_1_r01 1372 -#define _LOAD_FAST_BORROW_1_r12 1373 -#define _LOAD_FAST_BORROW_1_r23 1374 -#define _LOAD_FAST_BORROW_2_r01 1375 -#define _LOAD_FAST_BORROW_2_r12 1376 -#define _LOAD_FAST_BORROW_2_r23 1377 -#define _LOAD_FAST_BORROW_3_r01 1378 -#define _LOAD_FAST_BORROW_3_r12 1379 -#define _LOAD_FAST_BORROW_3_r23 1380 -#define _LOAD_FAST_BORROW_4_r01 1381 -#define _LOAD_FAST_BORROW_4_r12 1382 -#define _LOAD_FAST_BORROW_4_r23 1383 -#define _LOAD_FAST_BORROW_5_r01 1384 -#define _LOAD_FAST_BORROW_5_r12 1385 -#define _LOAD_FAST_BORROW_5_r23 1386 -#define _LOAD_FAST_BORROW_6_r01 1387 -#define _LOAD_FAST_BORROW_6_r12 1388 -#define _LOAD_FAST_BORROW_6_r23 1389 -#define _LOAD_FAST_BORROW_7_r01 1390 -#define _LOAD_FAST_BORROW_7_r12 1391 -#define _LOAD_FAST_BORROW_7_r23 1392 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1393 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1394 -#define _LOAD_FAST_CHECK_r01 1395 -#define _LOAD_FAST_CHECK_r12 1396 -#define _LOAD_FAST_CHECK_r23 1397 -#define _LOAD_FAST_LOAD_FAST_r02 1398 -#define _LOAD_FAST_LOAD_FAST_r13 1399 -#define _LOAD_FROM_DICT_OR_DEREF_r11 1400 -#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1401 -#define _LOAD_GLOBAL_r00 1402 -#define _LOAD_GLOBAL_BUILTINS_r01 1403 -#define _LOAD_GLOBAL_MODULE_r01 1404 -#define _LOAD_LOCALS_r01 1405 -#define _LOAD_LOCALS_r12 1406 -#define _LOAD_LOCALS_r23 1407 -#define _LOAD_NAME_r01 1408 -#define _LOAD_SMALL_INT_r01 1409 -#define _LOAD_SMALL_INT_r12 1410 -#define _LOAD_SMALL_INT_r23 1411 -#define _LOAD_SMALL_INT_0_r01 1412 -#define _LOAD_SMALL_INT_0_r12 1413 -#define _LOAD_SMALL_INT_0_r23 1414 -#define _LOAD_SMALL_INT_1_r01 1415 -#define _LOAD_SMALL_INT_1_r12 1416 -#define _LOAD_SMALL_INT_1_r23 1417 -#define _LOAD_SMALL_INT_2_r01 1418 -#define _LOAD_SMALL_INT_2_r12 1419 -#define _LOAD_SMALL_INT_2_r23 1420 -#define _LOAD_SMALL_INT_3_r01 1421 -#define _LOAD_SMALL_INT_3_r12 1422 -#define _LOAD_SMALL_INT_3_r23 1423 -#define _LOAD_SPECIAL_r00 1424 -#define _LOAD_SUPER_ATTR_ATTR_r31 1425 -#define _LOAD_SUPER_ATTR_METHOD_r32 1426 -#define _LOCK_OBJECT_r01 1427 -#define _LOCK_OBJECT_r11 1428 -#define _LOCK_OBJECT_r22 1429 -#define _LOCK_OBJECT_r33 1430 -#define _MAKE_CALLARGS_A_TUPLE_r33 1431 -#define _MAKE_CELL_r00 1432 -#define _MAKE_FUNCTION_r12 1433 -#define _MAKE_HEAP_SAFE_r01 1434 -#define _MAKE_HEAP_SAFE_r11 1435 -#define _MAKE_HEAP_SAFE_r22 1436 -#define _MAKE_HEAP_SAFE_r33 1437 -#define _MAKE_WARM_r00 1438 -#define _MAKE_WARM_r11 1439 -#define _MAKE_WARM_r22 1440 -#define _MAKE_WARM_r33 1441 -#define _MAP_ADD_r20 1442 -#define _MATCH_CLASS_r33 1443 -#define _MATCH_KEYS_r23 1444 -#define _MATCH_MAPPING_r02 1445 -#define _MATCH_MAPPING_r12 1446 -#define _MATCH_MAPPING_r23 1447 -#define _MATCH_SEQUENCE_r02 1448 -#define _MATCH_SEQUENCE_r12 1449 -#define _MATCH_SEQUENCE_r23 1450 -#define _MAYBE_EXPAND_METHOD_r00 1451 -#define _MAYBE_EXPAND_METHOD_KW_r11 1452 -#define _MONITOR_CALL_r00 1453 -#define _MONITOR_CALL_KW_r11 1454 -#define _MONITOR_JUMP_BACKWARD_r00 1455 -#define _MONITOR_JUMP_BACKWARD_r11 1456 -#define _MONITOR_JUMP_BACKWARD_r22 1457 -#define _MONITOR_JUMP_BACKWARD_r33 1458 -#define _MONITOR_RESUME_r00 1459 -#define _NOP_r00 1460 -#define _NOP_r11 1461 -#define _NOP_r22 1462 -#define _NOP_r33 1463 -#define _POP_EXCEPT_r10 1464 -#define _POP_ITER_r20 1465 -#define _POP_JUMP_IF_FALSE_r00 1466 -#define _POP_JUMP_IF_FALSE_r10 1467 -#define _POP_JUMP_IF_FALSE_r21 1468 -#define _POP_JUMP_IF_FALSE_r32 1469 -#define _POP_JUMP_IF_TRUE_r00 1470 -#define _POP_JUMP_IF_TRUE_r10 1471 -#define _POP_JUMP_IF_TRUE_r21 1472 -#define _POP_JUMP_IF_TRUE_r32 1473 -#define _POP_TOP_r10 1474 -#define _POP_TOP_FLOAT_r00 1475 -#define _POP_TOP_FLOAT_r10 1476 -#define _POP_TOP_FLOAT_r21 1477 -#define _POP_TOP_FLOAT_r32 1478 -#define _POP_TOP_INT_r00 1479 -#define _POP_TOP_INT_r10 1480 -#define _POP_TOP_INT_r21 1481 -#define _POP_TOP_INT_r32 1482 -#define _POP_TOP_NOP_r00 1483 -#define _POP_TOP_NOP_r10 1484 -#define _POP_TOP_NOP_r21 1485 -#define _POP_TOP_NOP_r32 1486 -#define _POP_TOP_OPARG_r00 1487 -#define _POP_TOP_UNICODE_r00 1488 -#define _POP_TOP_UNICODE_r10 1489 -#define _POP_TOP_UNICODE_r21 1490 -#define _POP_TOP_UNICODE_r32 1491 -#define _PUSH_EXC_INFO_r02 1492 -#define _PUSH_EXC_INFO_r12 1493 -#define _PUSH_EXC_INFO_r23 1494 -#define _PUSH_FRAME_r10 1495 -#define _PUSH_NULL_r01 1496 -#define _PUSH_NULL_r12 1497 -#define _PUSH_NULL_r23 1498 -#define _PUSH_NULL_CONDITIONAL_r00 1499 -#define _PUSH_TAGGED_ZERO_r01 1500 -#define _PUSH_TAGGED_ZERO_r12 1501 -#define _PUSH_TAGGED_ZERO_r23 1502 -#define _PY_FRAME_EX_r31 1503 -#define _PY_FRAME_GENERAL_r01 1504 -#define _PY_FRAME_KW_r11 1505 -#define _REPLACE_WITH_TRUE_r02 1506 -#define _REPLACE_WITH_TRUE_r12 1507 -#define _REPLACE_WITH_TRUE_r23 1508 -#define _RESUME_CHECK_r00 1509 -#define _RESUME_CHECK_r11 1510 -#define _RESUME_CHECK_r22 1511 -#define _RESUME_CHECK_r33 1512 -#define _RETURN_GENERATOR_r01 1513 -#define _RETURN_VALUE_r11 1514 -#define _RROT_3_r03 1515 -#define _RROT_3_r13 1516 -#define _RROT_3_r23 1517 -#define _RROT_3_r33 1518 -#define _SAVE_RETURN_OFFSET_r00 1519 -#define _SAVE_RETURN_OFFSET_r11 1520 -#define _SAVE_RETURN_OFFSET_r22 1521 -#define _SAVE_RETURN_OFFSET_r33 1522 -#define _SEND_ASYNC_GEN_r33 1523 -#define _SEND_ASYNC_GEN_TIER_TWO_r33 1524 -#define _SEND_GEN_FRAME_r33 1525 -#define _SEND_VIRTUAL_r33 1526 -#define _SEND_VIRTUAL_TIER_TWO_r03 1527 -#define _SEND_VIRTUAL_TIER_TWO_r13 1528 -#define _SEND_VIRTUAL_TIER_TWO_r23 1529 -#define _SEND_VIRTUAL_TIER_TWO_r33 1530 -#define _SETUP_ANNOTATIONS_r00 1531 -#define _SET_ADD_r10 1532 -#define _SET_FUNCTION_ATTRIBUTE_r01 1533 -#define _SET_FUNCTION_ATTRIBUTE_r11 1534 -#define _SET_FUNCTION_ATTRIBUTE_r21 1535 -#define _SET_FUNCTION_ATTRIBUTE_r32 1536 -#define _SET_IP_r00 1537 -#define _SET_IP_r11 1538 -#define _SET_IP_r22 1539 -#define _SET_IP_r33 1540 -#define _SET_UPDATE_r11 1541 -#define _SPILL_OR_RELOAD_r01 1542 -#define _SPILL_OR_RELOAD_r02 1543 -#define _SPILL_OR_RELOAD_r03 1544 -#define _SPILL_OR_RELOAD_r10 1545 -#define _SPILL_OR_RELOAD_r12 1546 -#define _SPILL_OR_RELOAD_r13 1547 -#define _SPILL_OR_RELOAD_r20 1548 -#define _SPILL_OR_RELOAD_r21 1549 -#define _SPILL_OR_RELOAD_r23 1550 -#define _SPILL_OR_RELOAD_r30 1551 -#define _SPILL_OR_RELOAD_r31 1552 -#define _SPILL_OR_RELOAD_r32 1553 -#define _START_EXECUTOR_r00 1554 -#define _STORE_ATTR_r20 1555 -#define _STORE_ATTR_INSTANCE_VALUE_r21 1556 -#define _STORE_ATTR_SLOT_r21 1557 -#define _STORE_ATTR_WITH_HINT_r21 1558 -#define _STORE_DEREF_r10 1559 -#define _STORE_FAST_LOAD_FAST_r11 1560 -#define _STORE_FAST_STORE_FAST_r20 1561 -#define _STORE_GLOBAL_r10 1562 -#define _STORE_NAME_r10 1563 -#define _STORE_SLICE_r30 1564 -#define _STORE_SUBSCR_r30 1565 -#define _STORE_SUBSCR_DICT_r31 1566 -#define _STORE_SUBSCR_DICT_KNOWN_HASH_r31 1567 -#define _STORE_SUBSCR_LIST_INT_r32 1568 -#define _SWAP_r11 1569 -#define _SWAP_2_r02 1570 -#define _SWAP_2_r12 1571 -#define _SWAP_2_r22 1572 -#define _SWAP_2_r33 1573 -#define _SWAP_3_r03 1574 -#define _SWAP_3_r13 1575 -#define _SWAP_3_r23 1576 -#define _SWAP_3_r33 1577 -#define _SWAP_FAST_r01 1578 -#define _SWAP_FAST_r11 1579 -#define _SWAP_FAST_r22 1580 -#define _SWAP_FAST_r33 1581 -#define _SWAP_FAST_0_r01 1582 -#define _SWAP_FAST_0_r11 1583 -#define _SWAP_FAST_0_r22 1584 -#define _SWAP_FAST_0_r33 1585 -#define _SWAP_FAST_1_r01 1586 -#define _SWAP_FAST_1_r11 1587 -#define _SWAP_FAST_1_r22 1588 -#define _SWAP_FAST_1_r33 1589 -#define _SWAP_FAST_2_r01 1590 -#define _SWAP_FAST_2_r11 1591 -#define _SWAP_FAST_2_r22 1592 -#define _SWAP_FAST_2_r33 1593 -#define _SWAP_FAST_3_r01 1594 -#define _SWAP_FAST_3_r11 1595 -#define _SWAP_FAST_3_r22 1596 -#define _SWAP_FAST_3_r33 1597 -#define _SWAP_FAST_4_r01 1598 -#define _SWAP_FAST_4_r11 1599 -#define _SWAP_FAST_4_r22 1600 -#define _SWAP_FAST_4_r33 1601 -#define _SWAP_FAST_5_r01 1602 -#define _SWAP_FAST_5_r11 1603 -#define _SWAP_FAST_5_r22 1604 -#define _SWAP_FAST_5_r33 1605 -#define _SWAP_FAST_6_r01 1606 -#define _SWAP_FAST_6_r11 1607 -#define _SWAP_FAST_6_r22 1608 -#define _SWAP_FAST_6_r33 1609 -#define _SWAP_FAST_7_r01 1610 -#define _SWAP_FAST_7_r11 1611 -#define _SWAP_FAST_7_r22 1612 -#define _SWAP_FAST_7_r33 1613 -#define _TIER2_RESUME_CHECK_r00 1614 -#define _TIER2_RESUME_CHECK_r11 1615 -#define _TIER2_RESUME_CHECK_r22 1616 -#define _TIER2_RESUME_CHECK_r33 1617 -#define _TO_BOOL_r11 1618 -#define _TO_BOOL_BOOL_r01 1619 -#define _TO_BOOL_BOOL_r11 1620 -#define _TO_BOOL_BOOL_r22 1621 -#define _TO_BOOL_BOOL_r33 1622 -#define _TO_BOOL_INT_r02 1623 -#define _TO_BOOL_INT_r12 1624 -#define _TO_BOOL_INT_r23 1625 -#define _TO_BOOL_LIST_r02 1626 -#define _TO_BOOL_LIST_r12 1627 -#define _TO_BOOL_LIST_r23 1628 -#define _TO_BOOL_NONE_r01 1629 -#define _TO_BOOL_NONE_r11 1630 -#define _TO_BOOL_NONE_r22 1631 -#define _TO_BOOL_NONE_r33 1632 -#define _TO_BOOL_STR_r02 1633 -#define _TO_BOOL_STR_r12 1634 -#define _TO_BOOL_STR_r23 1635 -#define _TRACE_RECORD_r00 1636 -#define _UNARY_INVERT_r12 1637 -#define _UNARY_NEGATIVE_r12 1638 -#define _UNARY_NEGATIVE_FLOAT_INPLACE_r02 1639 -#define _UNARY_NEGATIVE_FLOAT_INPLACE_r12 1640 -#define _UNARY_NEGATIVE_FLOAT_INPLACE_r23 1641 -#define _UNARY_NOT_r01 1642 -#define _UNARY_NOT_r11 1643 -#define _UNARY_NOT_r22 1644 -#define _UNARY_NOT_r33 1645 -#define _UNPACK_EX_r10 1646 -#define _UNPACK_SEQUENCE_r10 1647 -#define _UNPACK_SEQUENCE_LIST_r10 1648 -#define _UNPACK_SEQUENCE_TUPLE_r10 1649 -#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1650 -#define _UNPACK_SEQUENCE_UNIQUE_THREE_TUPLE_r03 1651 -#define _UNPACK_SEQUENCE_UNIQUE_THREE_TUPLE_r13 1652 -#define _UNPACK_SEQUENCE_UNIQUE_TUPLE_r10 1653 -#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE_r02 1654 -#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE_r12 1655 -#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE_r23 1656 -#define _WITH_EXCEPT_START_r33 1657 -#define _YIELD_VALUE_r11 1658 -#define MAX_UOP_REGS_ID 1658 +#define _DELETE_SUBSCR_r20 866 +#define _DEOPT_r00 867 +#define _DEOPT_r10 868 +#define _DEOPT_r20 869 +#define _DEOPT_r30 870 +#define _DICT_MERGE_r11 871 +#define _DICT_UPDATE_r11 872 +#define _DO_CALL_r01 873 +#define _DO_CALL_FUNCTION_EX_r31 874 +#define _DO_CALL_KW_r11 875 +#define _DYNAMIC_EXIT_r00 876 +#define _DYNAMIC_EXIT_r10 877 +#define _DYNAMIC_EXIT_r20 878 +#define _DYNAMIC_EXIT_r30 879 +#define _END_FOR_r10 880 +#define _END_SEND_r31 881 +#define _ERROR_POP_N_r00 882 +#define _EXIT_INIT_CHECK_r10 883 +#define _EXIT_TRACE_r00 884 +#define _EXIT_TRACE_r10 885 +#define _EXIT_TRACE_r20 886 +#define _EXIT_TRACE_r30 887 +#define _EXPAND_METHOD_r00 888 +#define _EXPAND_METHOD_KW_r11 889 +#define _FATAL_ERROR_r00 890 +#define _FATAL_ERROR_r11 891 +#define _FATAL_ERROR_r22 892 +#define _FATAL_ERROR_r33 893 +#define _FORMAT_SIMPLE_r11 894 +#define _FORMAT_WITH_SPEC_r21 895 +#define _FOR_ITER_r23 896 +#define _FOR_ITER_GEN_FRAME_r03 897 +#define _FOR_ITER_GEN_FRAME_r13 898 +#define _FOR_ITER_GEN_FRAME_r23 899 +#define _FOR_ITER_TIER_TWO_r23 900 +#define _FOR_ITER_VIRTUAL_r23 901 +#define _FOR_ITER_VIRTUAL_TIER_TWO_r23 902 +#define _GET_AITER_r11 903 +#define _GET_ANEXT_r12 904 +#define _GET_AWAITABLE_r11 905 +#define _GET_ITER_r12 906 +#define _GET_ITER_TRAD_r12 907 +#define _GET_LEN_r12 908 +#define _GUARD_3OS_ASYNC_GEN_ASEND_r03 909 +#define _GUARD_3OS_ASYNC_GEN_ASEND_r13 910 +#define _GUARD_3OS_ASYNC_GEN_ASEND_r23 911 +#define _GUARD_3OS_ASYNC_GEN_ASEND_r33 912 +#define _GUARD_BINARY_OP_EXTEND_r22 913 +#define _GUARD_BINARY_OP_EXTEND_LHS_r02 914 +#define _GUARD_BINARY_OP_EXTEND_LHS_r12 915 +#define _GUARD_BINARY_OP_EXTEND_LHS_r22 916 +#define _GUARD_BINARY_OP_EXTEND_LHS_r33 917 +#define _GUARD_BINARY_OP_EXTEND_RHS_r02 918 +#define _GUARD_BINARY_OP_EXTEND_RHS_r12 919 +#define _GUARD_BINARY_OP_EXTEND_RHS_r22 920 +#define _GUARD_BINARY_OP_EXTEND_RHS_r33 921 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r02 922 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r12 923 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r22 924 +#define _GUARD_BINARY_OP_SUBSCR_TUPLE_INT_BOUNDS_r33 925 +#define _GUARD_BIT_IS_SET_POP_r00 926 +#define _GUARD_BIT_IS_SET_POP_r10 927 +#define _GUARD_BIT_IS_SET_POP_r21 928 +#define _GUARD_BIT_IS_SET_POP_r32 929 +#define _GUARD_BIT_IS_SET_POP_4_r00 930 +#define _GUARD_BIT_IS_SET_POP_4_r10 931 +#define _GUARD_BIT_IS_SET_POP_4_r21 932 +#define _GUARD_BIT_IS_SET_POP_4_r32 933 +#define _GUARD_BIT_IS_SET_POP_5_r00 934 +#define _GUARD_BIT_IS_SET_POP_5_r10 935 +#define _GUARD_BIT_IS_SET_POP_5_r21 936 +#define _GUARD_BIT_IS_SET_POP_5_r32 937 +#define _GUARD_BIT_IS_SET_POP_6_r00 938 +#define _GUARD_BIT_IS_SET_POP_6_r10 939 +#define _GUARD_BIT_IS_SET_POP_6_r21 940 +#define _GUARD_BIT_IS_SET_POP_6_r32 941 +#define _GUARD_BIT_IS_SET_POP_7_r00 942 +#define _GUARD_BIT_IS_SET_POP_7_r10 943 +#define _GUARD_BIT_IS_SET_POP_7_r21 944 +#define _GUARD_BIT_IS_SET_POP_7_r32 945 +#define _GUARD_BIT_IS_UNSET_POP_r00 946 +#define _GUARD_BIT_IS_UNSET_POP_r10 947 +#define _GUARD_BIT_IS_UNSET_POP_r21 948 +#define _GUARD_BIT_IS_UNSET_POP_r32 949 +#define _GUARD_BIT_IS_UNSET_POP_4_r00 950 +#define _GUARD_BIT_IS_UNSET_POP_4_r10 951 +#define _GUARD_BIT_IS_UNSET_POP_4_r21 952 +#define _GUARD_BIT_IS_UNSET_POP_4_r32 953 +#define _GUARD_BIT_IS_UNSET_POP_5_r00 954 +#define _GUARD_BIT_IS_UNSET_POP_5_r10 955 +#define _GUARD_BIT_IS_UNSET_POP_5_r21 956 +#define _GUARD_BIT_IS_UNSET_POP_5_r32 957 +#define _GUARD_BIT_IS_UNSET_POP_6_r00 958 +#define _GUARD_BIT_IS_UNSET_POP_6_r10 959 +#define _GUARD_BIT_IS_UNSET_POP_6_r21 960 +#define _GUARD_BIT_IS_UNSET_POP_6_r32 961 +#define _GUARD_BIT_IS_UNSET_POP_7_r00 962 +#define _GUARD_BIT_IS_UNSET_POP_7_r10 963 +#define _GUARD_BIT_IS_UNSET_POP_7_r21 964 +#define _GUARD_BIT_IS_UNSET_POP_7_r32 965 +#define _GUARD_CALLABLE_BUILTIN_CLASS_r00 966 +#define _GUARD_CALLABLE_BUILTIN_FAST_r00 967 +#define _GUARD_CALLABLE_BUILTIN_FAST_WITH_KEYWORDS_r00 968 +#define _GUARD_CALLABLE_BUILTIN_O_r00 969 +#define _GUARD_CALLABLE_ISINSTANCE_r03 970 +#define _GUARD_CALLABLE_ISINSTANCE_r13 971 +#define _GUARD_CALLABLE_ISINSTANCE_r23 972 +#define _GUARD_CALLABLE_ISINSTANCE_r33 973 +#define _GUARD_CALLABLE_LEN_r03 974 +#define _GUARD_CALLABLE_LEN_r13 975 +#define _GUARD_CALLABLE_LEN_r23 976 +#define _GUARD_CALLABLE_LEN_r33 977 +#define _GUARD_CALLABLE_LIST_APPEND_r03 978 +#define _GUARD_CALLABLE_LIST_APPEND_r13 979 +#define _GUARD_CALLABLE_LIST_APPEND_r23 980 +#define _GUARD_CALLABLE_LIST_APPEND_r33 981 +#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_r00 982 +#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r00 983 +#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_NOARGS_r00 984 +#define _GUARD_CALLABLE_METHOD_DESCRIPTOR_O_r00 985 +#define _GUARD_CALLABLE_STR_1_r03 986 +#define _GUARD_CALLABLE_STR_1_r13 987 +#define _GUARD_CALLABLE_STR_1_r23 988 +#define _GUARD_CALLABLE_STR_1_r33 989 +#define _GUARD_CALLABLE_TUPLE_1_r03 990 +#define _GUARD_CALLABLE_TUPLE_1_r13 991 +#define _GUARD_CALLABLE_TUPLE_1_r23 992 +#define _GUARD_CALLABLE_TUPLE_1_r33 993 +#define _GUARD_CALLABLE_TYPE_1_r03 994 +#define _GUARD_CALLABLE_TYPE_1_r13 995 +#define _GUARD_CALLABLE_TYPE_1_r23 996 +#define _GUARD_CALLABLE_TYPE_1_r33 997 +#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r00 998 +#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r11 999 +#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r22 1000 +#define _GUARD_CODE_VERSION_RETURN_GENERATOR_r33 1001 +#define _GUARD_CODE_VERSION_RETURN_VALUE_r00 1002 +#define _GUARD_CODE_VERSION_RETURN_VALUE_r11 1003 +#define _GUARD_CODE_VERSION_RETURN_VALUE_r22 1004 +#define _GUARD_CODE_VERSION_RETURN_VALUE_r33 1005 +#define _GUARD_CODE_VERSION_YIELD_VALUE_r00 1006 +#define _GUARD_CODE_VERSION_YIELD_VALUE_r11 1007 +#define _GUARD_CODE_VERSION_YIELD_VALUE_r22 1008 +#define _GUARD_CODE_VERSION_YIELD_VALUE_r33 1009 +#define _GUARD_CODE_VERSION__PUSH_FRAME_r00 1010 +#define _GUARD_CODE_VERSION__PUSH_FRAME_r11 1011 +#define _GUARD_CODE_VERSION__PUSH_FRAME_r22 1012 +#define _GUARD_CODE_VERSION__PUSH_FRAME_r33 1013 +#define _GUARD_DORV_NO_DICT_r01 1014 +#define _GUARD_DORV_NO_DICT_r11 1015 +#define _GUARD_DORV_NO_DICT_r22 1016 +#define _GUARD_DORV_NO_DICT_r33 1017 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 1018 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 1019 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 1020 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 1021 +#define _GUARD_GLOBALS_VERSION_r00 1022 +#define _GUARD_GLOBALS_VERSION_r11 1023 +#define _GUARD_GLOBALS_VERSION_r22 1024 +#define _GUARD_GLOBALS_VERSION_r33 1025 +#define _GUARD_IP_RETURN_GENERATOR_r00 1026 +#define _GUARD_IP_RETURN_GENERATOR_r11 1027 +#define _GUARD_IP_RETURN_GENERATOR_r22 1028 +#define _GUARD_IP_RETURN_GENERATOR_r33 1029 +#define _GUARD_IP_RETURN_VALUE_r00 1030 +#define _GUARD_IP_RETURN_VALUE_r11 1031 +#define _GUARD_IP_RETURN_VALUE_r22 1032 +#define _GUARD_IP_RETURN_VALUE_r33 1033 +#define _GUARD_IP_YIELD_VALUE_r00 1034 +#define _GUARD_IP_YIELD_VALUE_r11 1035 +#define _GUARD_IP_YIELD_VALUE_r22 1036 +#define _GUARD_IP_YIELD_VALUE_r33 1037 +#define _GUARD_IP__PUSH_FRAME_r00 1038 +#define _GUARD_IP__PUSH_FRAME_r11 1039 +#define _GUARD_IP__PUSH_FRAME_r22 1040 +#define _GUARD_IP__PUSH_FRAME_r33 1041 +#define _GUARD_IS_FALSE_POP_r00 1042 +#define _GUARD_IS_FALSE_POP_r10 1043 +#define _GUARD_IS_FALSE_POP_r21 1044 +#define _GUARD_IS_FALSE_POP_r32 1045 +#define _GUARD_IS_NONE_POP_r00 1046 +#define _GUARD_IS_NONE_POP_r10 1047 +#define _GUARD_IS_NONE_POP_r21 1048 +#define _GUARD_IS_NONE_POP_r32 1049 +#define _GUARD_IS_NOT_NONE_POP_r10 1050 +#define _GUARD_IS_TRUE_POP_r00 1051 +#define _GUARD_IS_TRUE_POP_r10 1052 +#define _GUARD_IS_TRUE_POP_r21 1053 +#define _GUARD_IS_TRUE_POP_r32 1054 +#define _GUARD_ITERATOR_r01 1055 +#define _GUARD_ITERATOR_r11 1056 +#define _GUARD_ITERATOR_r22 1057 +#define _GUARD_ITERATOR_r33 1058 +#define _GUARD_ITER_VIRTUAL_r01 1059 +#define _GUARD_ITER_VIRTUAL_r11 1060 +#define _GUARD_ITER_VIRTUAL_r22 1061 +#define _GUARD_ITER_VIRTUAL_r33 1062 +#define _GUARD_KEYS_VERSION_r01 1063 +#define _GUARD_KEYS_VERSION_r11 1064 +#define _GUARD_KEYS_VERSION_r22 1065 +#define _GUARD_KEYS_VERSION_r33 1066 +#define _GUARD_LOAD_SUPER_ATTR_METHOD_r03 1067 +#define _GUARD_LOAD_SUPER_ATTR_METHOD_r13 1068 +#define _GUARD_LOAD_SUPER_ATTR_METHOD_r23 1069 +#define _GUARD_LOAD_SUPER_ATTR_METHOD_r33 1070 +#define _GUARD_NOS_COMPACT_ASCII_r02 1071 +#define _GUARD_NOS_COMPACT_ASCII_r12 1072 +#define _GUARD_NOS_COMPACT_ASCII_r22 1073 +#define _GUARD_NOS_COMPACT_ASCII_r33 1074 +#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r03 1075 +#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r13 1076 +#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r23 1077 +#define _GUARD_NOS_DICT_STORE_SUBSCRIPT_r33 1078 +#define _GUARD_NOS_DICT_SUBSCRIPT_r02 1079 +#define _GUARD_NOS_DICT_SUBSCRIPT_r12 1080 +#define _GUARD_NOS_DICT_SUBSCRIPT_r22 1081 +#define _GUARD_NOS_DICT_SUBSCRIPT_r33 1082 +#define _GUARD_NOS_FLOAT_r02 1083 +#define _GUARD_NOS_FLOAT_r12 1084 +#define _GUARD_NOS_FLOAT_r22 1085 +#define _GUARD_NOS_FLOAT_r33 1086 +#define _GUARD_NOS_INT_r02 1087 +#define _GUARD_NOS_INT_r12 1088 +#define _GUARD_NOS_INT_r22 1089 +#define _GUARD_NOS_INT_r33 1090 +#define _GUARD_NOS_ITER_VIRTUAL_r02 1091 +#define _GUARD_NOS_ITER_VIRTUAL_r12 1092 +#define _GUARD_NOS_ITER_VIRTUAL_r22 1093 +#define _GUARD_NOS_ITER_VIRTUAL_r33 1094 +#define _GUARD_NOS_LIST_r02 1095 +#define _GUARD_NOS_LIST_r12 1096 +#define _GUARD_NOS_LIST_r22 1097 +#define _GUARD_NOS_LIST_r33 1098 +#define _GUARD_NOS_NOT_NULL_r02 1099 +#define _GUARD_NOS_NOT_NULL_r12 1100 +#define _GUARD_NOS_NOT_NULL_r22 1101 +#define _GUARD_NOS_NOT_NULL_r33 1102 +#define _GUARD_NOS_NULL_r02 1103 +#define _GUARD_NOS_NULL_r12 1104 +#define _GUARD_NOS_NULL_r22 1105 +#define _GUARD_NOS_NULL_r33 1106 +#define _GUARD_NOS_OVERFLOWED_r02 1107 +#define _GUARD_NOS_OVERFLOWED_r12 1108 +#define _GUARD_NOS_OVERFLOWED_r22 1109 +#define _GUARD_NOS_OVERFLOWED_r33 1110 +#define _GUARD_NOS_TUPLE_r02 1111 +#define _GUARD_NOS_TUPLE_r12 1112 +#define _GUARD_NOS_TUPLE_r22 1113 +#define _GUARD_NOS_TUPLE_r33 1114 +#define _GUARD_NOS_TYPE_VERSION_r02 1115 +#define _GUARD_NOS_TYPE_VERSION_r12 1116 +#define _GUARD_NOS_TYPE_VERSION_r22 1117 +#define _GUARD_NOS_TYPE_VERSION_r33 1118 +#define _GUARD_NOS_UNICODE_r02 1119 +#define _GUARD_NOS_UNICODE_r12 1120 +#define _GUARD_NOS_UNICODE_r22 1121 +#define _GUARD_NOS_UNICODE_r33 1122 +#define _GUARD_NOT_EXHAUSTED_LIST_r02 1123 +#define _GUARD_NOT_EXHAUSTED_LIST_r12 1124 +#define _GUARD_NOT_EXHAUSTED_LIST_r22 1125 +#define _GUARD_NOT_EXHAUSTED_LIST_r33 1126 +#define _GUARD_NOT_EXHAUSTED_RANGE_r02 1127 +#define _GUARD_NOT_EXHAUSTED_RANGE_r12 1128 +#define _GUARD_NOT_EXHAUSTED_RANGE_r22 1129 +#define _GUARD_NOT_EXHAUSTED_RANGE_r33 1130 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 1131 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 1132 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 1133 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 1134 +#define _GUARD_THIRD_NULL_r03 1135 +#define _GUARD_THIRD_NULL_r13 1136 +#define _GUARD_THIRD_NULL_r23 1137 +#define _GUARD_THIRD_NULL_r33 1138 +#define _GUARD_TOS_ANY_DICT_r01 1139 +#define _GUARD_TOS_ANY_DICT_r11 1140 +#define _GUARD_TOS_ANY_DICT_r22 1141 +#define _GUARD_TOS_ANY_DICT_r33 1142 +#define _GUARD_TOS_ANY_SET_r01 1143 +#define _GUARD_TOS_ANY_SET_r11 1144 +#define _GUARD_TOS_ANY_SET_r22 1145 +#define _GUARD_TOS_ANY_SET_r33 1146 +#define _GUARD_TOS_DICT_r01 1147 +#define _GUARD_TOS_DICT_r11 1148 +#define _GUARD_TOS_DICT_r22 1149 +#define _GUARD_TOS_DICT_r33 1150 +#define _GUARD_TOS_FLOAT_r01 1151 +#define _GUARD_TOS_FLOAT_r11 1152 +#define _GUARD_TOS_FLOAT_r22 1153 +#define _GUARD_TOS_FLOAT_r33 1154 +#define _GUARD_TOS_FROZENDICT_r01 1155 +#define _GUARD_TOS_FROZENDICT_r11 1156 +#define _GUARD_TOS_FROZENDICT_r22 1157 +#define _GUARD_TOS_FROZENDICT_r33 1158 +#define _GUARD_TOS_FROZENSET_r01 1159 +#define _GUARD_TOS_FROZENSET_r11 1160 +#define _GUARD_TOS_FROZENSET_r22 1161 +#define _GUARD_TOS_FROZENSET_r33 1162 +#define _GUARD_TOS_INT_r01 1163 +#define _GUARD_TOS_INT_r11 1164 +#define _GUARD_TOS_INT_r22 1165 +#define _GUARD_TOS_INT_r33 1166 +#define _GUARD_TOS_IS_NONE_r01 1167 +#define _GUARD_TOS_IS_NONE_r11 1168 +#define _GUARD_TOS_IS_NONE_r22 1169 +#define _GUARD_TOS_IS_NONE_r33 1170 +#define _GUARD_TOS_LIST_r01 1171 +#define _GUARD_TOS_LIST_r11 1172 +#define _GUARD_TOS_LIST_r22 1173 +#define _GUARD_TOS_LIST_r33 1174 +#define _GUARD_TOS_NOT_NULL_r01 1175 +#define _GUARD_TOS_NOT_NULL_r11 1176 +#define _GUARD_TOS_NOT_NULL_r22 1177 +#define _GUARD_TOS_NOT_NULL_r33 1178 +#define _GUARD_TOS_OVERFLOWED_r01 1179 +#define _GUARD_TOS_OVERFLOWED_r11 1180 +#define _GUARD_TOS_OVERFLOWED_r22 1181 +#define _GUARD_TOS_OVERFLOWED_r33 1182 +#define _GUARD_TOS_SET_r01 1183 +#define _GUARD_TOS_SET_r11 1184 +#define _GUARD_TOS_SET_r22 1185 +#define _GUARD_TOS_SET_r33 1186 +#define _GUARD_TOS_SLICE_r01 1187 +#define _GUARD_TOS_SLICE_r11 1188 +#define _GUARD_TOS_SLICE_r22 1189 +#define _GUARD_TOS_SLICE_r33 1190 +#define _GUARD_TOS_TUPLE_r01 1191 +#define _GUARD_TOS_TUPLE_r11 1192 +#define _GUARD_TOS_TUPLE_r22 1193 +#define _GUARD_TOS_TUPLE_r33 1194 +#define _GUARD_TOS_UNICODE_r01 1195 +#define _GUARD_TOS_UNICODE_r11 1196 +#define _GUARD_TOS_UNICODE_r22 1197 +#define _GUARD_TOS_UNICODE_r33 1198 +#define _GUARD_TYPE_r01 1199 +#define _GUARD_TYPE_r11 1200 +#define _GUARD_TYPE_r22 1201 +#define _GUARD_TYPE_r33 1202 +#define _GUARD_TYPE_ITER_r02 1203 +#define _GUARD_TYPE_ITER_r12 1204 +#define _GUARD_TYPE_ITER_r22 1205 +#define _GUARD_TYPE_ITER_r33 1206 +#define _GUARD_TYPE_VERSION_r01 1207 +#define _GUARD_TYPE_VERSION_r11 1208 +#define _GUARD_TYPE_VERSION_r22 1209 +#define _GUARD_TYPE_VERSION_r33 1210 +#define _GUARD_TYPE_VERSION_LOCKED_r01 1211 +#define _GUARD_TYPE_VERSION_LOCKED_r11 1212 +#define _GUARD_TYPE_VERSION_LOCKED_r22 1213 +#define _GUARD_TYPE_VERSION_LOCKED_r33 1214 +#define _HANDLE_PENDING_AND_DEOPT_r00 1215 +#define _HANDLE_PENDING_AND_DEOPT_r10 1216 +#define _HANDLE_PENDING_AND_DEOPT_r20 1217 +#define _HANDLE_PENDING_AND_DEOPT_r30 1218 +#define _IMPORT_FROM_r12 1219 +#define _IMPORT_NAME_r21 1220 +#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 1221 +#define _INIT_CALL_PY_EXACT_ARGS_r01 1222 +#define _INIT_CALL_PY_EXACT_ARGS_0_r01 1223 +#define _INIT_CALL_PY_EXACT_ARGS_1_r01 1224 +#define _INIT_CALL_PY_EXACT_ARGS_2_r01 1225 +#define _INIT_CALL_PY_EXACT_ARGS_3_r01 1226 +#define _INIT_CALL_PY_EXACT_ARGS_4_r01 1227 +#define _INSERT_NULL_r10 1228 +#define _INSTRUMENTED_FOR_ITER_r23 1229 +#define _INSTRUMENTED_INSTRUCTION_r00 1230 +#define _INSTRUMENTED_JUMP_FORWARD_r00 1231 +#define _INSTRUMENTED_JUMP_FORWARD_r11 1232 +#define _INSTRUMENTED_JUMP_FORWARD_r22 1233 +#define _INSTRUMENTED_JUMP_FORWARD_r33 1234 +#define _INSTRUMENTED_LINE_r00 1235 +#define _INSTRUMENTED_NOT_TAKEN_r00 1236 +#define _INSTRUMENTED_NOT_TAKEN_r11 1237 +#define _INSTRUMENTED_NOT_TAKEN_r22 1238 +#define _INSTRUMENTED_NOT_TAKEN_r33 1239 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 1240 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 1241 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 1242 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 1243 +#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 1244 +#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 1245 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 1246 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 1247 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 1248 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 1249 +#define _IS_NONE_r11 1250 +#define _IS_OP_r03 1251 +#define _IS_OP_r13 1252 +#define _IS_OP_r23 1253 +#define _ITER_CHECK_LIST_r02 1254 +#define _ITER_CHECK_LIST_r12 1255 +#define _ITER_CHECK_LIST_r22 1256 +#define _ITER_CHECK_LIST_r33 1257 +#define _ITER_CHECK_RANGE_r02 1258 +#define _ITER_CHECK_RANGE_r12 1259 +#define _ITER_CHECK_RANGE_r22 1260 +#define _ITER_CHECK_RANGE_r33 1261 +#define _ITER_CHECK_TUPLE_r02 1262 +#define _ITER_CHECK_TUPLE_r12 1263 +#define _ITER_CHECK_TUPLE_r22 1264 +#define _ITER_CHECK_TUPLE_r33 1265 +#define _ITER_JUMP_LIST_r02 1266 +#define _ITER_JUMP_LIST_r12 1267 +#define _ITER_JUMP_LIST_r22 1268 +#define _ITER_JUMP_LIST_r33 1269 +#define _ITER_JUMP_RANGE_r02 1270 +#define _ITER_JUMP_RANGE_r12 1271 +#define _ITER_JUMP_RANGE_r22 1272 +#define _ITER_JUMP_RANGE_r33 1273 +#define _ITER_JUMP_TUPLE_r02 1274 +#define _ITER_JUMP_TUPLE_r12 1275 +#define _ITER_JUMP_TUPLE_r22 1276 +#define _ITER_JUMP_TUPLE_r33 1277 +#define _ITER_NEXT_INLINE_r23 1278 +#define _ITER_NEXT_LIST_r23 1279 +#define _ITER_NEXT_LIST_TIER_TWO_r23 1280 +#define _ITER_NEXT_RANGE_r03 1281 +#define _ITER_NEXT_RANGE_r13 1282 +#define _ITER_NEXT_RANGE_r23 1283 +#define _ITER_NEXT_TUPLE_r03 1284 +#define _ITER_NEXT_TUPLE_r13 1285 +#define _ITER_NEXT_TUPLE_r23 1286 +#define _JUMP_BACKWARD_NO_INTERRUPT_r00 1287 +#define _JUMP_BACKWARD_NO_INTERRUPT_r11 1288 +#define _JUMP_BACKWARD_NO_INTERRUPT_r22 1289 +#define _JUMP_BACKWARD_NO_INTERRUPT_r33 1290 +#define _JUMP_TO_TOP_r00 1291 +#define _LIST_APPEND_r10 1292 +#define _LIST_EXTEND_r11 1293 +#define _LOAD_ATTR_r10 1294 +#define _LOAD_ATTR_CLASS_r11 1295 +#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_FRAME_r11 1296 +#define _LOAD_ATTR_INSTANCE_VALUE_r02 1297 +#define _LOAD_ATTR_INSTANCE_VALUE_r12 1298 +#define _LOAD_ATTR_INSTANCE_VALUE_r23 1299 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 1300 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 1301 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 1302 +#define _LOAD_ATTR_METHOD_NO_DICT_r02 1303 +#define _LOAD_ATTR_METHOD_NO_DICT_r12 1304 +#define _LOAD_ATTR_METHOD_NO_DICT_r23 1305 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 1306 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 1307 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 1308 +#define _LOAD_ATTR_MODULE_r12 1309 +#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 1310 +#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 1311 +#define _LOAD_ATTR_PROPERTY_FRAME_r01 1312 +#define _LOAD_ATTR_PROPERTY_FRAME_r11 1313 +#define _LOAD_ATTR_PROPERTY_FRAME_r22 1314 +#define _LOAD_ATTR_PROPERTY_FRAME_r33 1315 +#define _LOAD_ATTR_SLOT_r02 1316 +#define _LOAD_ATTR_SLOT_r12 1317 +#define _LOAD_ATTR_SLOT_r23 1318 +#define _LOAD_ATTR_WITH_HINT_r12 1319 +#define _LOAD_BUILD_CLASS_r01 1320 +#define _LOAD_BYTECODE_r00 1321 +#define _LOAD_COMMON_CONSTANT_r01 1322 +#define _LOAD_COMMON_CONSTANT_r12 1323 +#define _LOAD_COMMON_CONSTANT_r23 1324 +#define _LOAD_CONST_r01 1325 +#define _LOAD_CONST_r12 1326 +#define _LOAD_CONST_r23 1327 +#define _LOAD_CONST_INLINE_r01 1328 +#define _LOAD_CONST_INLINE_r12 1329 +#define _LOAD_CONST_INLINE_r23 1330 +#define _LOAD_CONST_INLINE_BORROW_r01 1331 +#define _LOAD_CONST_INLINE_BORROW_r12 1332 +#define _LOAD_CONST_INLINE_BORROW_r23 1333 +#define _LOAD_DEREF_r01 1334 +#define _LOAD_FAST_r01 1335 +#define _LOAD_FAST_r12 1336 +#define _LOAD_FAST_r23 1337 +#define _LOAD_FAST_0_r01 1338 +#define _LOAD_FAST_0_r12 1339 +#define _LOAD_FAST_0_r23 1340 +#define _LOAD_FAST_1_r01 1341 +#define _LOAD_FAST_1_r12 1342 +#define _LOAD_FAST_1_r23 1343 +#define _LOAD_FAST_2_r01 1344 +#define _LOAD_FAST_2_r12 1345 +#define _LOAD_FAST_2_r23 1346 +#define _LOAD_FAST_3_r01 1347 +#define _LOAD_FAST_3_r12 1348 +#define _LOAD_FAST_3_r23 1349 +#define _LOAD_FAST_4_r01 1350 +#define _LOAD_FAST_4_r12 1351 +#define _LOAD_FAST_4_r23 1352 +#define _LOAD_FAST_5_r01 1353 +#define _LOAD_FAST_5_r12 1354 +#define _LOAD_FAST_5_r23 1355 +#define _LOAD_FAST_6_r01 1356 +#define _LOAD_FAST_6_r12 1357 +#define _LOAD_FAST_6_r23 1358 +#define _LOAD_FAST_7_r01 1359 +#define _LOAD_FAST_7_r12 1360 +#define _LOAD_FAST_7_r23 1361 +#define _LOAD_FAST_AND_CLEAR_r01 1362 +#define _LOAD_FAST_AND_CLEAR_r12 1363 +#define _LOAD_FAST_AND_CLEAR_r23 1364 +#define _LOAD_FAST_BORROW_r01 1365 +#define _LOAD_FAST_BORROW_r12 1366 +#define _LOAD_FAST_BORROW_r23 1367 +#define _LOAD_FAST_BORROW_0_r01 1368 +#define _LOAD_FAST_BORROW_0_r12 1369 +#define _LOAD_FAST_BORROW_0_r23 1370 +#define _LOAD_FAST_BORROW_1_r01 1371 +#define _LOAD_FAST_BORROW_1_r12 1372 +#define _LOAD_FAST_BORROW_1_r23 1373 +#define _LOAD_FAST_BORROW_2_r01 1374 +#define _LOAD_FAST_BORROW_2_r12 1375 +#define _LOAD_FAST_BORROW_2_r23 1376 +#define _LOAD_FAST_BORROW_3_r01 1377 +#define _LOAD_FAST_BORROW_3_r12 1378 +#define _LOAD_FAST_BORROW_3_r23 1379 +#define _LOAD_FAST_BORROW_4_r01 1380 +#define _LOAD_FAST_BORROW_4_r12 1381 +#define _LOAD_FAST_BORROW_4_r23 1382 +#define _LOAD_FAST_BORROW_5_r01 1383 +#define _LOAD_FAST_BORROW_5_r12 1384 +#define _LOAD_FAST_BORROW_5_r23 1385 +#define _LOAD_FAST_BORROW_6_r01 1386 +#define _LOAD_FAST_BORROW_6_r12 1387 +#define _LOAD_FAST_BORROW_6_r23 1388 +#define _LOAD_FAST_BORROW_7_r01 1389 +#define _LOAD_FAST_BORROW_7_r12 1390 +#define _LOAD_FAST_BORROW_7_r23 1391 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1392 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1393 +#define _LOAD_FAST_CHECK_r01 1394 +#define _LOAD_FAST_CHECK_r12 1395 +#define _LOAD_FAST_CHECK_r23 1396 +#define _LOAD_FAST_LOAD_FAST_r02 1397 +#define _LOAD_FAST_LOAD_FAST_r13 1398 +#define _LOAD_FROM_DICT_OR_DEREF_r11 1399 +#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1400 +#define _LOAD_GLOBAL_r00 1401 +#define _LOAD_GLOBAL_BUILTINS_r01 1402 +#define _LOAD_GLOBAL_MODULE_r01 1403 +#define _LOAD_LOCALS_r01 1404 +#define _LOAD_LOCALS_r12 1405 +#define _LOAD_LOCALS_r23 1406 +#define _LOAD_NAME_r01 1407 +#define _LOAD_SMALL_INT_r01 1408 +#define _LOAD_SMALL_INT_r12 1409 +#define _LOAD_SMALL_INT_r23 1410 +#define _LOAD_SMALL_INT_0_r01 1411 +#define _LOAD_SMALL_INT_0_r12 1412 +#define _LOAD_SMALL_INT_0_r23 1413 +#define _LOAD_SMALL_INT_1_r01 1414 +#define _LOAD_SMALL_INT_1_r12 1415 +#define _LOAD_SMALL_INT_1_r23 1416 +#define _LOAD_SMALL_INT_2_r01 1417 +#define _LOAD_SMALL_INT_2_r12 1418 +#define _LOAD_SMALL_INT_2_r23 1419 +#define _LOAD_SMALL_INT_3_r01 1420 +#define _LOAD_SMALL_INT_3_r12 1421 +#define _LOAD_SMALL_INT_3_r23 1422 +#define _LOAD_SPECIAL_r00 1423 +#define _LOAD_SUPER_ATTR_ATTR_r31 1424 +#define _LOAD_SUPER_ATTR_METHOD_r32 1425 +#define _LOCK_OBJECT_r01 1426 +#define _LOCK_OBJECT_r11 1427 +#define _LOCK_OBJECT_r22 1428 +#define _LOCK_OBJECT_r33 1429 +#define _MAKE_CALLARGS_A_TUPLE_r33 1430 +#define _MAKE_CELL_r00 1431 +#define _MAKE_FUNCTION_r12 1432 +#define _MAKE_HEAP_SAFE_r01 1433 +#define _MAKE_HEAP_SAFE_r11 1434 +#define _MAKE_HEAP_SAFE_r22 1435 +#define _MAKE_HEAP_SAFE_r33 1436 +#define _MAKE_WARM_r00 1437 +#define _MAKE_WARM_r11 1438 +#define _MAKE_WARM_r22 1439 +#define _MAKE_WARM_r33 1440 +#define _MAP_ADD_r20 1441 +#define _MATCH_CLASS_r33 1442 +#define _MATCH_KEYS_r23 1443 +#define _MATCH_MAPPING_r02 1444 +#define _MATCH_MAPPING_r12 1445 +#define _MATCH_MAPPING_r23 1446 +#define _MATCH_SEQUENCE_r02 1447 +#define _MATCH_SEQUENCE_r12 1448 +#define _MATCH_SEQUENCE_r23 1449 +#define _MAYBE_EXPAND_METHOD_r00 1450 +#define _MAYBE_EXPAND_METHOD_KW_r11 1451 +#define _MONITOR_CALL_r00 1452 +#define _MONITOR_CALL_KW_r11 1453 +#define _MONITOR_JUMP_BACKWARD_r00 1454 +#define _MONITOR_JUMP_BACKWARD_r11 1455 +#define _MONITOR_JUMP_BACKWARD_r22 1456 +#define _MONITOR_JUMP_BACKWARD_r33 1457 +#define _MONITOR_RESUME_r00 1458 +#define _NOP_r00 1459 +#define _NOP_r11 1460 +#define _NOP_r22 1461 +#define _NOP_r33 1462 +#define _POP_EXCEPT_r10 1463 +#define _POP_ITER_r20 1464 +#define _POP_JUMP_IF_FALSE_r00 1465 +#define _POP_JUMP_IF_FALSE_r10 1466 +#define _POP_JUMP_IF_FALSE_r21 1467 +#define _POP_JUMP_IF_FALSE_r32 1468 +#define _POP_JUMP_IF_TRUE_r00 1469 +#define _POP_JUMP_IF_TRUE_r10 1470 +#define _POP_JUMP_IF_TRUE_r21 1471 +#define _POP_JUMP_IF_TRUE_r32 1472 +#define _POP_TOP_r10 1473 +#define _POP_TOP_FLOAT_r00 1474 +#define _POP_TOP_FLOAT_r10 1475 +#define _POP_TOP_FLOAT_r21 1476 +#define _POP_TOP_FLOAT_r32 1477 +#define _POP_TOP_INT_r00 1478 +#define _POP_TOP_INT_r10 1479 +#define _POP_TOP_INT_r21 1480 +#define _POP_TOP_INT_r32 1481 +#define _POP_TOP_NOP_r00 1482 +#define _POP_TOP_NOP_r10 1483 +#define _POP_TOP_NOP_r21 1484 +#define _POP_TOP_NOP_r32 1485 +#define _POP_TOP_OPARG_r00 1486 +#define _POP_TOP_UNICODE_r00 1487 +#define _POP_TOP_UNICODE_r10 1488 +#define _POP_TOP_UNICODE_r21 1489 +#define _POP_TOP_UNICODE_r32 1490 +#define _PUSH_EXC_INFO_r02 1491 +#define _PUSH_EXC_INFO_r12 1492 +#define _PUSH_EXC_INFO_r23 1493 +#define _PUSH_FRAME_r10 1494 +#define _PUSH_NULL_r01 1495 +#define _PUSH_NULL_r12 1496 +#define _PUSH_NULL_r23 1497 +#define _PUSH_NULL_CONDITIONAL_r00 1498 +#define _PUSH_TAGGED_ZERO_r01 1499 +#define _PUSH_TAGGED_ZERO_r12 1500 +#define _PUSH_TAGGED_ZERO_r23 1501 +#define _PY_FRAME_EX_r31 1502 +#define _PY_FRAME_GENERAL_r01 1503 +#define _PY_FRAME_KW_r11 1504 +#define _REPLACE_WITH_TRUE_r02 1505 +#define _REPLACE_WITH_TRUE_r12 1506 +#define _REPLACE_WITH_TRUE_r23 1507 +#define _RESUME_CHECK_r00 1508 +#define _RESUME_CHECK_r11 1509 +#define _RESUME_CHECK_r22 1510 +#define _RESUME_CHECK_r33 1511 +#define _RETURN_GENERATOR_r01 1512 +#define _RETURN_VALUE_r11 1513 +#define _RROT_3_r03 1514 +#define _RROT_3_r13 1515 +#define _RROT_3_r23 1516 +#define _RROT_3_r33 1517 +#define _SAVE_RETURN_OFFSET_r00 1518 +#define _SAVE_RETURN_OFFSET_r11 1519 +#define _SAVE_RETURN_OFFSET_r22 1520 +#define _SAVE_RETURN_OFFSET_r33 1521 +#define _SEND_ASYNC_GEN_r33 1522 +#define _SEND_ASYNC_GEN_TIER_TWO_r33 1523 +#define _SEND_GEN_FRAME_r33 1524 +#define _SEND_VIRTUAL_r33 1525 +#define _SEND_VIRTUAL_TIER_TWO_r03 1526 +#define _SEND_VIRTUAL_TIER_TWO_r13 1527 +#define _SEND_VIRTUAL_TIER_TWO_r23 1528 +#define _SEND_VIRTUAL_TIER_TWO_r33 1529 +#define _SETUP_ANNOTATIONS_r00 1530 +#define _SET_ADD_r10 1531 +#define _SET_FUNCTION_ATTRIBUTE_r01 1532 +#define _SET_FUNCTION_ATTRIBUTE_r11 1533 +#define _SET_FUNCTION_ATTRIBUTE_r21 1534 +#define _SET_FUNCTION_ATTRIBUTE_r32 1535 +#define _SET_IP_r00 1536 +#define _SET_IP_r11 1537 +#define _SET_IP_r22 1538 +#define _SET_IP_r33 1539 +#define _SET_UPDATE_r11 1540 +#define _SPILL_OR_RELOAD_r01 1541 +#define _SPILL_OR_RELOAD_r02 1542 +#define _SPILL_OR_RELOAD_r03 1543 +#define _SPILL_OR_RELOAD_r10 1544 +#define _SPILL_OR_RELOAD_r12 1545 +#define _SPILL_OR_RELOAD_r13 1546 +#define _SPILL_OR_RELOAD_r20 1547 +#define _SPILL_OR_RELOAD_r21 1548 +#define _SPILL_OR_RELOAD_r23 1549 +#define _SPILL_OR_RELOAD_r30 1550 +#define _SPILL_OR_RELOAD_r31 1551 +#define _SPILL_OR_RELOAD_r32 1552 +#define _START_EXECUTOR_r00 1553 +#define _STORE_ATTR_r20 1554 +#define _STORE_ATTR_INSTANCE_VALUE_r21 1555 +#define _STORE_ATTR_SLOT_r21 1556 +#define _STORE_ATTR_WITH_HINT_r21 1557 +#define _STORE_DEREF_r10 1558 +#define _STORE_FAST_LOAD_FAST_r11 1559 +#define _STORE_FAST_STORE_FAST_r20 1560 +#define _STORE_GLOBAL_r10 1561 +#define _STORE_NAME_r10 1562 +#define _STORE_SLICE_r30 1563 +#define _STORE_SUBSCR_r30 1564 +#define _STORE_SUBSCR_DICT_r31 1565 +#define _STORE_SUBSCR_DICT_KNOWN_HASH_r31 1566 +#define _STORE_SUBSCR_LIST_INT_r32 1567 +#define _SWAP_r11 1568 +#define _SWAP_2_r02 1569 +#define _SWAP_2_r12 1570 +#define _SWAP_2_r22 1571 +#define _SWAP_2_r33 1572 +#define _SWAP_3_r03 1573 +#define _SWAP_3_r13 1574 +#define _SWAP_3_r23 1575 +#define _SWAP_3_r33 1576 +#define _SWAP_FAST_r01 1577 +#define _SWAP_FAST_r11 1578 +#define _SWAP_FAST_r22 1579 +#define _SWAP_FAST_r33 1580 +#define _SWAP_FAST_0_r01 1581 +#define _SWAP_FAST_0_r11 1582 +#define _SWAP_FAST_0_r22 1583 +#define _SWAP_FAST_0_r33 1584 +#define _SWAP_FAST_1_r01 1585 +#define _SWAP_FAST_1_r11 1586 +#define _SWAP_FAST_1_r22 1587 +#define _SWAP_FAST_1_r33 1588 +#define _SWAP_FAST_2_r01 1589 +#define _SWAP_FAST_2_r11 1590 +#define _SWAP_FAST_2_r22 1591 +#define _SWAP_FAST_2_r33 1592 +#define _SWAP_FAST_3_r01 1593 +#define _SWAP_FAST_3_r11 1594 +#define _SWAP_FAST_3_r22 1595 +#define _SWAP_FAST_3_r33 1596 +#define _SWAP_FAST_4_r01 1597 +#define _SWAP_FAST_4_r11 1598 +#define _SWAP_FAST_4_r22 1599 +#define _SWAP_FAST_4_r33 1600 +#define _SWAP_FAST_5_r01 1601 +#define _SWAP_FAST_5_r11 1602 +#define _SWAP_FAST_5_r22 1603 +#define _SWAP_FAST_5_r33 1604 +#define _SWAP_FAST_6_r01 1605 +#define _SWAP_FAST_6_r11 1606 +#define _SWAP_FAST_6_r22 1607 +#define _SWAP_FAST_6_r33 1608 +#define _SWAP_FAST_7_r01 1609 +#define _SWAP_FAST_7_r11 1610 +#define _SWAP_FAST_7_r22 1611 +#define _SWAP_FAST_7_r33 1612 +#define _TIER2_RESUME_CHECK_r00 1613 +#define _TIER2_RESUME_CHECK_r11 1614 +#define _TIER2_RESUME_CHECK_r22 1615 +#define _TIER2_RESUME_CHECK_r33 1616 +#define _TO_BOOL_r11 1617 +#define _TO_BOOL_BOOL_r01 1618 +#define _TO_BOOL_BOOL_r11 1619 +#define _TO_BOOL_BOOL_r22 1620 +#define _TO_BOOL_BOOL_r33 1621 +#define _TO_BOOL_INT_r02 1622 +#define _TO_BOOL_INT_r12 1623 +#define _TO_BOOL_INT_r23 1624 +#define _TO_BOOL_LIST_r02 1625 +#define _TO_BOOL_LIST_r12 1626 +#define _TO_BOOL_LIST_r23 1627 +#define _TO_BOOL_NONE_r01 1628 +#define _TO_BOOL_NONE_r11 1629 +#define _TO_BOOL_NONE_r22 1630 +#define _TO_BOOL_NONE_r33 1631 +#define _TO_BOOL_STR_r02 1632 +#define _TO_BOOL_STR_r12 1633 +#define _TO_BOOL_STR_r23 1634 +#define _TRACE_RECORD_r00 1635 +#define _UNARY_INVERT_r12 1636 +#define _UNARY_NEGATIVE_r12 1637 +#define _UNARY_NEGATIVE_FLOAT_INPLACE_r02 1638 +#define _UNARY_NEGATIVE_FLOAT_INPLACE_r12 1639 +#define _UNARY_NEGATIVE_FLOAT_INPLACE_r23 1640 +#define _UNARY_NOT_r01 1641 +#define _UNARY_NOT_r11 1642 +#define _UNARY_NOT_r22 1643 +#define _UNARY_NOT_r33 1644 +#define _UNPACK_EX_r10 1645 +#define _UNPACK_SEQUENCE_r10 1646 +#define _UNPACK_SEQUENCE_LIST_r10 1647 +#define _UNPACK_SEQUENCE_TUPLE_r10 1648 +#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1649 +#define _UNPACK_SEQUENCE_UNIQUE_THREE_TUPLE_r03 1650 +#define _UNPACK_SEQUENCE_UNIQUE_THREE_TUPLE_r13 1651 +#define _UNPACK_SEQUENCE_UNIQUE_TUPLE_r10 1652 +#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE_r02 1653 +#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE_r12 1654 +#define _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE_r23 1655 +#define _WITH_EXCEPT_START_r33 1656 +#define _YIELD_VALUE_r11 1657 +#define MAX_UOP_REGS_ID 1657 #ifdef __cplusplus } diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index 3355ebec725e01c..6b4621e49f4c2cf 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -178,7 +178,6 @@ const uint32_t _PyUop_Flags[MAX_UOP_ID+1] = { [_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_UNIQUE_TWO_TUPLE] = 0, @@ -1736,15 +1735,6 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+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 = { @@ -4326,7 +4316,6 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_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_UNIQUE_TWO_TUPLE_r02] = _UNPACK_SEQUENCE_UNIQUE_TWO_TUPLE, @@ -5209,8 +5198,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", @@ -6510,8 +6497,6 @@ int _PyUop_num_popped(int opcode, int oparg) 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 758542720acf317..a09fdec4d951944 100644 --- a/Include/opcode_ids.h +++ b/Include/opcode_ids.h @@ -73,63 +73,62 @@ extern "C" { #define DELETE_DEREF 60 #define DELETE_FAST 61 #define DELETE_GLOBAL 62 -#define DELETE_NAME 63 -#define DICT_MERGE 64 -#define DICT_UPDATE 65 -#define END_ASYNC_FOR 66 -#define EXTENDED_ARG 67 -#define FOR_ITER 68 -#define GET_AWAITABLE 69 -#define GET_ITER 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 DICT_MERGE 63 +#define DICT_UPDATE 64 +#define END_ASYNC_FOR 65 +#define EXTENDED_ARG 66 +#define FOR_ITER 67 +#define GET_AWAITABLE 68 +#define GET_ITER 69 +#define IMPORT_FROM 70 +#define IMPORT_NAME 71 +#define IS_OP 72 +#define JUMP_BACKWARD 73 +#define JUMP_BACKWARD_NO_INTERRUPT 74 +#define JUMP_FORWARD 75 +#define LIST_APPEND 76 +#define LIST_EXTEND 77 +#define LOAD_ATTR 78 +#define LOAD_COMMON_CONSTANT 79 +#define LOAD_CONST 80 +#define LOAD_DEREF 81 +#define LOAD_FAST 82 +#define LOAD_FAST_AND_CLEAR 83 +#define LOAD_FAST_BORROW 84 +#define LOAD_FAST_BORROW_LOAD_FAST_BORROW 85 +#define LOAD_FAST_CHECK 86 +#define LOAD_FAST_LOAD_FAST 87 +#define LOAD_FROM_DICT_OR_DEREF 88 +#define LOAD_FROM_DICT_OR_GLOBALS 89 +#define LOAD_GLOBAL 90 +#define LOAD_NAME 91 +#define LOAD_SMALL_INT 92 +#define LOAD_SPECIAL 93 +#define LOAD_SUPER_ATTR 94 +#define MAKE_CELL 95 +#define MAP_ADD 96 +#define MATCH_CLASS 97 +#define POP_JUMP_IF_FALSE 98 +#define POP_JUMP_IF_NONE 99 +#define POP_JUMP_IF_NOT_NONE 100 +#define POP_JUMP_IF_TRUE 101 +#define RAISE_VARARGS 102 +#define RERAISE 103 +#define SEND 104 +#define SET_ADD 105 +#define SET_FUNCTION_ATTRIBUTE 106 +#define SET_UPDATE 107 +#define STORE_ATTR 108 +#define STORE_DEREF 109 +#define STORE_FAST 110 +#define STORE_FAST_LOAD_FAST 111 +#define STORE_FAST_STORE_FAST 112 +#define STORE_GLOBAL 113 +#define STORE_NAME 114 +#define SWAP 115 +#define UNPACK_EX 116 +#define UNPACK_SEQUENCE 117 +#define YIELD_VALUE 118 #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 183d0af30acf438..1ef5281085edd4b 100644 --- a/Lib/_opcode_metadata.py +++ b/Lib/_opcode_metadata.py @@ -293,63 +293,62 @@ DELETE_DEREF=60, DELETE_FAST=61, DELETE_GLOBAL=62, - DELETE_NAME=63, - DICT_MERGE=64, - DICT_UPDATE=65, - END_ASYNC_FOR=66, - EXTENDED_ARG=67, - FOR_ITER=68, - GET_AWAITABLE=69, - GET_ITER=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, + DICT_MERGE=63, + DICT_UPDATE=64, + END_ASYNC_FOR=65, + EXTENDED_ARG=66, + FOR_ITER=67, + GET_AWAITABLE=68, + GET_ITER=69, + IMPORT_FROM=70, + IMPORT_NAME=71, + IS_OP=72, + JUMP_BACKWARD=73, + JUMP_BACKWARD_NO_INTERRUPT=74, + JUMP_FORWARD=75, + LIST_APPEND=76, + LIST_EXTEND=77, + LOAD_ATTR=78, + LOAD_COMMON_CONSTANT=79, + LOAD_CONST=80, + LOAD_DEREF=81, + LOAD_FAST=82, + LOAD_FAST_AND_CLEAR=83, + LOAD_FAST_BORROW=84, + LOAD_FAST_BORROW_LOAD_FAST_BORROW=85, + LOAD_FAST_CHECK=86, + LOAD_FAST_LOAD_FAST=87, + LOAD_FROM_DICT_OR_DEREF=88, + LOAD_FROM_DICT_OR_GLOBALS=89, + LOAD_GLOBAL=90, + LOAD_NAME=91, + LOAD_SMALL_INT=92, + LOAD_SPECIAL=93, + LOAD_SUPER_ATTR=94, + MAKE_CELL=95, + MAP_ADD=96, + MATCH_CLASS=97, + POP_JUMP_IF_FALSE=98, + POP_JUMP_IF_NONE=99, + POP_JUMP_IF_NOT_NONE=100, + POP_JUMP_IF_TRUE=101, + RAISE_VARARGS=102, + RERAISE=103, + SEND=104, + SET_ADD=105, + SET_FUNCTION_ATTRIBUTE=106, + SET_UPDATE=107, + STORE_ATTR=108, + STORE_DEREF=109, + STORE_FAST=110, + STORE_FAST_LOAD_FAST=111, + STORE_FAST_STORE_FAST=112, + STORE_GLOBAL=113, + STORE_NAME=114, + SWAP=115, + UNPACK_EX=116, + UNPACK_SEQUENCE=117, + YIELD_VALUE=118, 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 657e70a92f09b9d..bd2fa1d7b70421a 100644 --- a/Lib/test/test_code.py +++ b/Lib/test/test_code.py @@ -533,7 +533,8 @@ def test_co_positions_artificial_instructions(self): ("PUSH_EXC_INFO", None), ("LOAD_COMMON_CONSTANT", 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/Lib/test/test_compiler_codegen.py b/Lib/test/test_compiler_codegen.py index 36058854a41d63e..08cf54235f1c0d2 100644 --- a/Lib/test/test_compiler_codegen.py +++ b/Lib/test/test_compiler_codegen.py @@ -162,6 +162,18 @@ def test_syntax_error__return_not_in_function(self): 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) + def test_frozenset_optimization(self): l1 = self.Label() snippet = "frozenset({1, 2, 3})" 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 000000000000000..a4944615369edf5 --- /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``. diff --git a/Modules/_testinternalcapi/test_cases.c.h b/Modules/_testinternalcapi/test_cases.c.h index 51234e8749de261..41d5ef14654277a 100644 --- a/Modules/_testinternalcapi/test_cases.c.h +++ b/Modules/_testinternalcapi/test_cases.c.h @@ -5933,41 +5933,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); - _PyFrame_StackPointerValidate(frame); - _PyErr_Format(tstate, PyExc_SystemError, - "no locals when deleting %R", name); - _PyFrame_StackPointerInvalidate(frame); - JUMP_TO_LABEL(error); - } - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyFrame_StackPointerValidate(frame); - err = PyObject_DelItem(ns, name); - _PyFrame_StackPointerInvalidate(frame); - if (err != 0) { - assert(stack_pointer == _PyFrame_GetStackPointer(frame)); - _PyFrame_StackPointerValidate(frame); - _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, - NAME_ERROR_MSG, - name); - _PyFrame_StackPointerInvalidate(frame); - JUMP_TO_LABEL(error); - } - DISPATCH(); - } - TARGET(DELETE_SUBSCR) { #if _Py_TAIL_CALL_INTERP int opcode = DELETE_SUBSCR; @@ -12597,42 +12562,26 @@ v = stack_pointer[-1]; PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); PyObject *ns = LOCALS(); - int err; - if (ns == NULL) { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyFrame_StackPointerValidate(frame); - _PyErr_Format(tstate, PyExc_SystemError, - "no locals found when storing %R", name); - _PyFrame_StackPointerInvalidate(frame); + _PyFrame_SetStackPointer(frame, stack_pointer); + _PyFrame_StackPointerValidate(frame); + int error = _PyEval_StoreName(tstate, v, name, ns); + _PyFrame_StackPointerInvalidate(frame); + if (PyStackRef_IsNull(v)) { + } + else { stack_pointer += -1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); _PyFrame_SetStackPointer(frame, stack_pointer); _PyFrame_StackPointerValidate(frame); PyStackRef_CLOSE(v); _PyFrame_StackPointerInvalidate(frame); - JUMP_TO_LABEL(error); - } - if (PyDict_CheckExact(ns)) { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyFrame_StackPointerValidate(frame); - err = PyDict_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); - _PyFrame_StackPointerInvalidate(frame); + stack_pointer += 1; } - else { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyFrame_StackPointerValidate(frame); - err = PyObject_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); - _PyFrame_StackPointerInvalidate(frame); + if (error) { + JUMP_TO_LABEL(pop_1_error); } stack_pointer += -1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyFrame_StackPointerValidate(frame); - PyStackRef_CLOSE(v); - _PyFrame_StackPointerInvalidate(frame); - if (err) { - JUMP_TO_LABEL(error); - } DISPATCH(); } diff --git a/Modules/_testinternalcapi/test_targets.h b/Modules/_testinternalcapi/test_targets.h index 1a7eb9169fc837c..bfad85bc472148b 100644 --- a/Modules/_testinternalcapi/test_targets.h +++ b/Modules/_testinternalcapi/test_targets.h @@ -63,7 +63,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, @@ -378,7 +378,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, @@ -605,7 +605,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); @@ -851,7 +850,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, @@ -1011,6 +1009,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, + [119] = _TAIL_CALL_UNKNOWN_OPCODE, [120] = _TAIL_CALL_UNKNOWN_OPCODE, [121] = _TAIL_CALL_UNKNOWN_OPCODE, [122] = _TAIL_CALL_UNKNOWN_OPCODE, @@ -1109,7 +1108,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, @@ -1269,6 +1267,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, + [119] = _TAIL_CALL_UNKNOWN_OPCODE, [120] = _TAIL_CALL_UNKNOWN_OPCODE, [121] = _TAIL_CALL_UNKNOWN_OPCODE, [122] = _TAIL_CALL_UNKNOWN_OPCODE, diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h index 1bcf98a7600851f..0915869f0730d76 100644 --- a/Programs/test_frozenmain.h +++ b/Programs/test_frozenmain.h @@ -1,19 +1,19 @@ // 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,188,0,0,0,128,0,0,0,93,0, - 80,7,72,0,115,0,93,0,80,7,72,4,115,1,92,2, - 31,0,81,1,50,1,0,0,0,0,0,0,29,0,92,2, - 31,0,81,2,92,0,79,6,0,0,0,0,0,0,0,0, + 0,0,0,0,0,243,188,0,0,0,128,0,0,0,92,0, + 79,7,71,0,114,0,92,0,79,7,71,4,114,1,91,2, + 31,0,80,1,50,1,0,0,0,0,0,0,29,0,91,2, + 31,0,80,2,91,0,78,6,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,50,2,0,0,0,0, - 0,0,29,0,92,1,79,8,0,0,0,0,0,0,0,0, + 0,0,29,0,91,1,78,8,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,31,0,50,0,0,0, - 0,0,0,0,81,3,42,26,0,0,0,0,0,0,0,0, - 0,0,115,5,81,6,70,0,0,0,68,24,0,0,115,6, - 92,2,31,0,81,4,92,6,12,0,81,5,92,5,92,6, + 0,0,0,0,80,3,42,26,0,0,0,0,0,0,0,0, + 0,0,114,5,80,6,69,0,0,0,67,24,0,0,114,6, + 91,2,31,0,80,4,91,6,12,0,80,5,91,5,91,6, 42,26,0,0,0,0,0,0,0,0,0,0,12,0,48,4, - 50,1,0,0,0,0,0,0,29,0,74,26,0,0,9,0, - 28,0,80,7,33,0,41,7,233,0,0,0,0,122,18,70, + 50,1,0,0,0,0,0,0,29,0,73,26,0,0,9,0, + 28,0,79,7,33,0,41,7,233,0,0,0,0,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,122,7,99,111,110,102,105,103,32,122,2,58,32, diff --git a/Python/bytecodes.c b/Python/bytecodes.c index 7fb48516e2eae73..fd910993327ae43 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -1997,40 +1997,14 @@ dummy_func( inst(STORE_NAME, (v -- )) { PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); PyObject *ns = LOCALS(); - int err; - if (ns == NULL) { - _PyErr_Format(tstate, PyExc_SystemError, - "no locals found when storing %R", name); - PyStackRef_CLOSE(v); - ERROR_IF(true); - } - if (PyDict_CheckExact(ns)) { - err = PyDict_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); + int error = _PyEval_StoreName(tstate, v, name, ns); + if (PyStackRef_IsNull(v)) { + DEAD(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(); - } - 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(); + PyStackRef_CLOSE(v); } + ERROR_IF(error); } family(UNPACK_SEQUENCE, INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE) = { diff --git a/Python/ceval.c b/Python/ceval.c index fbea1f67a36f442..f3f03b28112137a 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1147,6 +1147,36 @@ _PyEval_GetIter(_PyStackRef iterable, _PyStackRef *index_or_null, int yield_from return PyStackRef_FromPyObjectSteal(iter_o); } +int _PyEval_StoreName(PyThreadState *tstate, _PyStackRef v, PyObject *name, PyObject* ns) +{ + int deletion = PyStackRef_IsNull(v); + + if (ns == NULL) { + const char *msg = deletion + ? "no locals found when deleting %R" + : "no locals found when storing %R"; + _PyErr_Format(tstate, PyExc_SystemError, msg, name); + return 1; + } + + if (deletion) { + int error = PyObject_DelItem(ns, name); + if (error) { + _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, + NAME_ERROR_MSG, + name); + } + return error; + } + + PyObject *v_o = PyStackRef_AsPyObjectBorrow(v); + if (PyDict_CheckExact(ns)) { + return PyDict_SetItem(ns, name, v_o); + } + + return PyObject_SetItem(ns, name, v_o); +} + #if (defined(__GNUC__) && __GNUC__ >= 10 && !defined(__clang__)) && defined(__x86_64__) /* * gh-129987: The SLP autovectorizer can cause poor code generation for diff --git a/Python/codegen.c b/Python/codegen.c index e65c308617df5ee..95e4d648c5f4340 100644 --- a/Python/codegen.c +++ b/Python/codegen.c @@ -3381,7 +3381,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 943d4c557886822..5b77c338e6aac1e 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -9567,88 +9567,27 @@ 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); - _PyFrame_StackPointerValidate(frame); - _PyErr_Format(tstate, PyExc_SystemError, - "no locals found when storing %R", name); - _PyFrame_StackPointerInvalidate(frame); - stack_pointer += -1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyFrame_StackPointerValidate(frame); - PyStackRef_CLOSE(v); - _PyFrame_StackPointerInvalidate(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); - _PyFrame_StackPointerValidate(frame); - err = PyDict_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); - _PyFrame_StackPointerInvalidate(frame); - } - else { - stack_pointer[0] = v; - stack_pointer += 1; - ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyFrame_StackPointerValidate(frame); - err = PyObject_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); - _PyFrame_StackPointerInvalidate(frame); - } - stack_pointer += -1; + stack_pointer[0] = v; + stack_pointer += 1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); _PyFrame_SetStackPointer(frame, stack_pointer); _PyFrame_StackPointerValidate(frame); - PyStackRef_CLOSE(v); + int error = _PyEval_StoreName(tstate, v, name, ns); _PyFrame_StackPointerInvalidate(frame); - if (err) { - SET_CURRENT_CACHED_VALUES(0); - JUMP_TO_ERROR(); + if (PyStackRef_IsNull(v)) { } - _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(__FILE__, __LINE__); - break; - } - - case _DELETE_NAME_r00: { - CHECK_CURRENT_CACHED_VALUES(0); - ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__); - oparg = CURRENT_OPARG(); - PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); - PyObject *ns = LOCALS(); - int err; - if (ns == NULL) { + else { + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); _PyFrame_SetStackPointer(frame, stack_pointer); _PyFrame_StackPointerValidate(frame); - _PyErr_Format(tstate, PyExc_SystemError, - "no locals when deleting %R", name); + PyStackRef_CLOSE(v); _PyFrame_StackPointerInvalidate(frame); - SET_CURRENT_CACHED_VALUES(0); - JUMP_TO_ERROR(); + stack_pointer += 1; } - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyFrame_StackPointerValidate(frame); - err = PyObject_DelItem(ns, name); - _PyFrame_StackPointerInvalidate(frame); - if (err != 0) { - assert(stack_pointer == _PyFrame_GetStackPointer(frame)); - _PyFrame_StackPointerValidate(frame); - _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, - NAME_ERROR_MSG, - name); - _PyFrame_StackPointerInvalidate(frame); + if (error) { + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); SET_CURRENT_CACHED_VALUES(0); JUMP_TO_ERROR(); } @@ -9656,6 +9595,8 @@ _tos_cache1 = PyStackRef_ZERO_BITS; _tos_cache2 = PyStackRef_ZERO_BITS; SET_CURRENT_CACHED_VALUES(0); + stack_pointer += -1; + ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); ASSERT_WITHIN_STACK_BOUNDS_IGNORING_CACHE(__FILE__, __LINE__); break; } diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h index 4b472aecc5fc3aa..b54598636804fc1 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -5933,41 +5933,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); - _PyFrame_StackPointerValidate(frame); - _PyErr_Format(tstate, PyExc_SystemError, - "no locals when deleting %R", name); - _PyFrame_StackPointerInvalidate(frame); - JUMP_TO_LABEL(error); - } - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyFrame_StackPointerValidate(frame); - err = PyObject_DelItem(ns, name); - _PyFrame_StackPointerInvalidate(frame); - if (err != 0) { - assert(stack_pointer == _PyFrame_GetStackPointer(frame)); - _PyFrame_StackPointerValidate(frame); - _PyEval_FormatExcCheckArg(tstate, PyExc_NameError, - NAME_ERROR_MSG, - name); - _PyFrame_StackPointerInvalidate(frame); - JUMP_TO_LABEL(error); - } - DISPATCH(); - } - TARGET(DELETE_SUBSCR) { #if _Py_TAIL_CALL_INTERP int opcode = DELETE_SUBSCR; @@ -12594,42 +12559,26 @@ v = stack_pointer[-1]; PyObject *name = GETITEM(FRAME_CO_NAMES, oparg); PyObject *ns = LOCALS(); - int err; - if (ns == NULL) { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyFrame_StackPointerValidate(frame); - _PyErr_Format(tstate, PyExc_SystemError, - "no locals found when storing %R", name); - _PyFrame_StackPointerInvalidate(frame); + _PyFrame_SetStackPointer(frame, stack_pointer); + _PyFrame_StackPointerValidate(frame); + int error = _PyEval_StoreName(tstate, v, name, ns); + _PyFrame_StackPointerInvalidate(frame); + if (PyStackRef_IsNull(v)) { + } + else { stack_pointer += -1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); _PyFrame_SetStackPointer(frame, stack_pointer); _PyFrame_StackPointerValidate(frame); PyStackRef_CLOSE(v); _PyFrame_StackPointerInvalidate(frame); - JUMP_TO_LABEL(error); - } - if (PyDict_CheckExact(ns)) { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyFrame_StackPointerValidate(frame); - err = PyDict_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); - _PyFrame_StackPointerInvalidate(frame); + stack_pointer += 1; } - else { - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyFrame_StackPointerValidate(frame); - err = PyObject_SetItem(ns, name, PyStackRef_AsPyObjectBorrow(v)); - _PyFrame_StackPointerInvalidate(frame); + if (error) { + JUMP_TO_LABEL(pop_1_error); } stack_pointer += -1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); - _PyFrame_SetStackPointer(frame, stack_pointer); - _PyFrame_StackPointerValidate(frame); - PyStackRef_CLOSE(v); - _PyFrame_StackPointerInvalidate(frame); - if (err) { - JUMP_TO_LABEL(error); - } DISPATCH(); } diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h index 1a7eb9169fc837c..bfad85bc472148b 100644 --- a/Python/opcode_targets.h +++ b/Python/opcode_targets.h @@ -63,7 +63,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, @@ -378,7 +378,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, @@ -605,7 +605,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); @@ -851,7 +850,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, @@ -1011,6 +1009,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, + [119] = _TAIL_CALL_UNKNOWN_OPCODE, [120] = _TAIL_CALL_UNKNOWN_OPCODE, [121] = _TAIL_CALL_UNKNOWN_OPCODE, [122] = _TAIL_CALL_UNKNOWN_OPCODE, @@ -1109,7 +1108,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, @@ -1269,6 +1267,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, + [119] = _TAIL_CALL_UNKNOWN_OPCODE, [120] = _TAIL_CALL_UNKNOWN_OPCODE, [121] = _TAIL_CALL_UNKNOWN_OPCODE, [122] = _TAIL_CALL_UNKNOWN_OPCODE, diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index 8895e02d47b1693..e9e06d6e7230444 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -2020,10 +2020,6 @@ break; } - case _DELETE_NAME: { - break; - } - case _UNPACK_SEQUENCE: { JitOptRef *values; JitOptRef *top;