gh-91869: Fix tracing of specialized instructions with extended args (GH-91945)

1 files changed, 50 insertions, 49 deletions

diff --git a/Include/opcode.h b/Include/opcode.h
index 399847d4ba0..084d34b8c73 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -140,55 +140,56 @@ extern "C" {
 #define COMPARE_OP_FLOAT_JUMP                   27
 #define COMPARE_OP_INT_JUMP                     28
 #define COMPARE_OP_STR_JUMP                     29
-#define JUMP_BACKWARD_QUICK                     34
-#define LOAD_ATTR_ADAPTIVE                      38
-#define LOAD_ATTR_INSTANCE_VALUE                39
-#define LOAD_ATTR_MODULE                        40
-#define LOAD_ATTR_SLOT                          41
-#define LOAD_ATTR_WITH_HINT                     42
-#define LOAD_CONST__LOAD_FAST                   43
-#define LOAD_FAST__LOAD_CONST                   44
-#define LOAD_FAST__LOAD_FAST                    45
-#define LOAD_GLOBAL_ADAPTIVE                    46
-#define LOAD_GLOBAL_BUILTIN                     47
-#define LOAD_GLOBAL_MODULE                      48
-#define LOAD_METHOD_ADAPTIVE                    55
-#define LOAD_METHOD_CLASS                       56
-#define LOAD_METHOD_MODULE                      57
-#define LOAD_METHOD_NO_DICT                     58
-#define LOAD_METHOD_WITH_DICT                   59
-#define LOAD_METHOD_WITH_VALUES                 62
-#define PRECALL_ADAPTIVE                        63
-#define PRECALL_BOUND_METHOD                    64
-#define PRECALL_BUILTIN_CLASS                   65
-#define PRECALL_BUILTIN_FAST_WITH_KEYWORDS      66
-#define PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS  67
-#define PRECALL_NO_KW_BUILTIN_FAST              72
-#define PRECALL_NO_KW_BUILTIN_O                 73
-#define PRECALL_NO_KW_ISINSTANCE                76
-#define PRECALL_NO_KW_LEN                       77
-#define PRECALL_NO_KW_LIST_APPEND               78
-#define PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST    79
-#define PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS  80
-#define PRECALL_NO_KW_METHOD_DESCRIPTOR_O       81
-#define PRECALL_NO_KW_STR_1                    113
-#define PRECALL_NO_KW_TUPLE_1                  121
-#define PRECALL_NO_KW_TYPE_1                   127
-#define PRECALL_PYFUNC                         141
-#define RESUME_QUICK                           143
-#define STORE_ATTR_ADAPTIVE                    150
-#define STORE_ATTR_INSTANCE_VALUE              153
-#define STORE_ATTR_SLOT                        154
-#define STORE_ATTR_WITH_HINT                   158
-#define STORE_FAST__LOAD_FAST                  159
-#define STORE_FAST__STORE_FAST                 161
-#define STORE_SUBSCR_ADAPTIVE                  167
-#define STORE_SUBSCR_DICT                      168
-#define STORE_SUBSCR_LIST_INT                  169
-#define UNPACK_SEQUENCE_ADAPTIVE               170
-#define UNPACK_SEQUENCE_LIST                   177
-#define UNPACK_SEQUENCE_TUPLE                  178
-#define UNPACK_SEQUENCE_TWO_TUPLE              179
+#define EXTENDED_ARG_QUICK                      34
+#define JUMP_BACKWARD_QUICK                     38
+#define LOAD_ATTR_ADAPTIVE                      39
+#define LOAD_ATTR_INSTANCE_VALUE                40
+#define LOAD_ATTR_MODULE                        41
+#define LOAD_ATTR_SLOT                          42
+#define LOAD_ATTR_WITH_HINT                     43
+#define LOAD_CONST__LOAD_FAST                   44
+#define LOAD_FAST__LOAD_CONST                   45
+#define LOAD_FAST__LOAD_FAST                    46
+#define LOAD_GLOBAL_ADAPTIVE                    47
+#define LOAD_GLOBAL_BUILTIN                     48
+#define LOAD_GLOBAL_MODULE                      55
+#define LOAD_METHOD_ADAPTIVE                    56
+#define LOAD_METHOD_CLASS                       57
+#define LOAD_METHOD_MODULE                      58
+#define LOAD_METHOD_NO_DICT                     59
+#define LOAD_METHOD_WITH_DICT                   62
+#define LOAD_METHOD_WITH_VALUES                 63
+#define PRECALL_ADAPTIVE                        64
+#define PRECALL_BOUND_METHOD                    65
+#define PRECALL_BUILTIN_CLASS                   66
+#define PRECALL_BUILTIN_FAST_WITH_KEYWORDS      67
+#define PRECALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS  72
+#define PRECALL_NO_KW_BUILTIN_FAST              73
+#define PRECALL_NO_KW_BUILTIN_O                 76
+#define PRECALL_NO_KW_ISINSTANCE                77
+#define PRECALL_NO_KW_LEN                       78
+#define PRECALL_NO_KW_LIST_APPEND               79
+#define PRECALL_NO_KW_METHOD_DESCRIPTOR_FAST    80
+#define PRECALL_NO_KW_METHOD_DESCRIPTOR_NOARGS  81
+#define PRECALL_NO_KW_METHOD_DESCRIPTOR_O      113
+#define PRECALL_NO_KW_STR_1                    121
+#define PRECALL_NO_KW_TUPLE_1                  127
+#define PRECALL_NO_KW_TYPE_1                   141
+#define PRECALL_PYFUNC                         143
+#define RESUME_QUICK                           150
+#define STORE_ATTR_ADAPTIVE                    153
+#define STORE_ATTR_INSTANCE_VALUE              154
+#define STORE_ATTR_SLOT                        158
+#define STORE_ATTR_WITH_HINT                   159
+#define STORE_FAST__LOAD_FAST                  161
+#define STORE_FAST__STORE_FAST                 167
+#define STORE_SUBSCR_ADAPTIVE                  168
+#define STORE_SUBSCR_DICT                      169
+#define STORE_SUBSCR_LIST_INT                  170
+#define UNPACK_SEQUENCE_ADAPTIVE               177
+#define UNPACK_SEQUENCE_LIST                   178
+#define UNPACK_SEQUENCE_TUPLE                  179
+#define UNPACK_SEQUENCE_TWO_TUPLE              180
 #define DO_TRACING                             255
 
 #define HAS_CONST(op) (false\