35
35
#define _BINARY_OP_ADD_UNICODE 311
36
36
#define _LOAD_LOCALS 312
37
37
#define _LOAD_FROM_DICT_OR_GLOBALS 313
38
- #define _SKIP_CACHE 314
39
- #define _GUARD_GLOBALS_VERSION 315
40
- #define _GUARD_BUILTINS_VERSION 316
41
- #define _LOAD_GLOBAL_MODULE 317
42
- #define _LOAD_GLOBAL_BUILTINS 318
43
- #define _GUARD_TYPE_VERSION 319
44
- #define _CHECK_MANAGED_OBJECT_HAS_VALUES 320
45
- #define _LOAD_ATTR_INSTANCE_VALUE 321
46
- #define IS_NONE 322
47
- #define _ITER_CHECK_LIST 323
48
- #define _IS_ITER_EXHAUSTED_LIST 324
49
- #define _ITER_NEXT_LIST 325
50
- #define _ITER_CHECK_TUPLE 326
51
- #define _IS_ITER_EXHAUSTED_TUPLE 327
52
- #define _ITER_NEXT_TUPLE 328
53
- #define _ITER_CHECK_RANGE 329
54
- #define _IS_ITER_EXHAUSTED_RANGE 330
55
- #define _ITER_NEXT_RANGE 331
56
- #define _POP_JUMP_IF_FALSE 332
57
- #define _POP_JUMP_IF_TRUE 333
58
- #define JUMP_TO_TOP 334
38
+ #define _GUARD_GLOBALS_VERSION 314
39
+ #define _GUARD_BUILTINS_VERSION 315
40
+ #define _LOAD_GLOBAL_MODULE 316
41
+ #define _LOAD_GLOBAL_BUILTINS 317
42
+ #define _GUARD_TYPE_VERSION 318
43
+ #define _CHECK_MANAGED_OBJECT_HAS_VALUES 319
44
+ #define _LOAD_ATTR_INSTANCE_VALUE 320
45
+ #define IS_NONE 321
46
+ #define _ITER_CHECK_LIST 322
47
+ #define _IS_ITER_EXHAUSTED_LIST 323
48
+ #define _ITER_NEXT_LIST 324
49
+ #define _ITER_CHECK_TUPLE 325
50
+ #define _IS_ITER_EXHAUSTED_TUPLE 326
51
+ #define _ITER_NEXT_TUPLE 327
52
+ #define _ITER_CHECK_RANGE 328
53
+ #define _IS_ITER_EXHAUSTED_RANGE 329
54
+ #define _ITER_NEXT_RANGE 330
55
+ #define _POP_JUMP_IF_FALSE 331
56
+ #define _POP_JUMP_IF_TRUE 332
57
+ #define JUMP_TO_TOP 333
59
58
60
59
#ifndef NEED_OPCODE_METADATA
61
60
extern int _PyOpcode_num_popped (int opcode , int oparg , bool jump );
@@ -945,7 +944,7 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
945
944
}
946
945
#endif
947
946
948
- enum InstructionFormat { INSTR_FMT_IB , INSTR_FMT_IBC , INSTR_FMT_IBC00 , INSTR_FMT_IBC000 , INSTR_FMT_IBC00000 , INSTR_FMT_IBC00000000 , INSTR_FMT_IX , INSTR_FMT_IXC , INSTR_FMT_IXC0 , INSTR_FMT_IXC00 , INSTR_FMT_IXC000 };
947
+ enum InstructionFormat { INSTR_FMT_IB , INSTR_FMT_IBC , INSTR_FMT_IBC00 , INSTR_FMT_IBC000 , INSTR_FMT_IBC00000000 , INSTR_FMT_IX , INSTR_FMT_IXC , INSTR_FMT_IXC0 , INSTR_FMT_IXC00 , INSTR_FMT_IXC000 };
949
948
950
949
#define IS_VALID_OPCODE (OP ) \
951
950
(((OP) >= 0) && ((OP) < OPCODE_METADATA_SIZE) && \
@@ -1279,8 +1278,8 @@ const struct opcode_macro_expansion _PyOpcode_macro_expansion[OPCODE_MACRO_EXPAN
1279
1278
[LOAD_NAME ] = { .nuops = 2 , .uops = { { _LOAD_LOCALS , 0 , 0 }, { _LOAD_FROM_DICT_OR_GLOBALS , 0 , 0 } } },
1280
1279
[LOAD_FROM_DICT_OR_GLOBALS ] = { .nuops = 1 , .uops = { { _LOAD_FROM_DICT_OR_GLOBALS , 0 , 0 } } },
1281
1280
[LOAD_GLOBAL ] = { .nuops = 1 , .uops = { { LOAD_GLOBAL , 0 , 0 } } },
1282
- [LOAD_GLOBAL_MODULE ] = { .nuops = 4 , .uops = { { _SKIP_CACHE , 0 , 0 }, { _GUARD_GLOBALS_VERSION , 1 , 1 }, { _SKIP_CACHE , 0 , 0 }, { _LOAD_GLOBAL_MODULE , 1 , 3 } } },
1283
- [LOAD_GLOBAL_BUILTIN ] = { .nuops = 4 , .uops = { { _SKIP_CACHE , 0 , 0 }, { _GUARD_GLOBALS_VERSION , 1 , 1 }, { _GUARD_BUILTINS_VERSION , 1 , 2 }, { _LOAD_GLOBAL_BUILTINS , 1 , 3 } } },
1281
+ [LOAD_GLOBAL_MODULE ] = { .nuops = 2 , .uops = { { _GUARD_GLOBALS_VERSION , 1 , 1 }, { _LOAD_GLOBAL_MODULE , 1 , 3 } } },
1282
+ [LOAD_GLOBAL_BUILTIN ] = { .nuops = 3 , .uops = { { _GUARD_GLOBALS_VERSION , 1 , 1 }, { _GUARD_BUILTINS_VERSION , 1 , 2 }, { _LOAD_GLOBAL_BUILTINS , 1 , 3 } } },
1284
1283
[DELETE_FAST ] = { .nuops = 1 , .uops = { { DELETE_FAST , 0 , 0 } } },
1285
1284
[DELETE_DEREF ] = { .nuops = 1 , .uops = { { DELETE_DEREF , 0 , 0 } } },
1286
1285
[LOAD_FROM_DICT_OR_DEREF ] = { .nuops = 1 , .uops = { { LOAD_FROM_DICT_OR_DEREF , 0 , 0 } } },
@@ -1302,7 +1301,7 @@ const struct opcode_macro_expansion _PyOpcode_macro_expansion[OPCODE_MACRO_EXPAN
1302
1301
[LOAD_SUPER_ATTR_ATTR ] = { .nuops = 1 , .uops = { { LOAD_SUPER_ATTR_ATTR , 0 , 0 } } },
1303
1302
[LOAD_SUPER_ATTR_METHOD ] = { .nuops = 1 , .uops = { { LOAD_SUPER_ATTR_METHOD , 0 , 0 } } },
1304
1303
[LOAD_ATTR ] = { .nuops = 1 , .uops = { { LOAD_ATTR , 0 , 0 } } },
1305
- [LOAD_ATTR_INSTANCE_VALUE ] = { .nuops = 4 , .uops = { { _SKIP_CACHE , 0 , 0 }, { _GUARD_TYPE_VERSION , 2 , 1 }, { _CHECK_MANAGED_OBJECT_HAS_VALUES , 0 , 0 }, { _LOAD_ATTR_INSTANCE_VALUE , 1 , 3 } } },
1304
+ [LOAD_ATTR_INSTANCE_VALUE ] = { .nuops = 3 , .uops = { { _GUARD_TYPE_VERSION , 2 , 1 }, { _CHECK_MANAGED_OBJECT_HAS_VALUES , 0 , 0 }, { _LOAD_ATTR_INSTANCE_VALUE , 1 , 3 } } },
1306
1305
[COMPARE_OP ] = { .nuops = 1 , .uops = { { COMPARE_OP , 0 , 0 } } },
1307
1306
[COMPARE_OP_FLOAT ] = { .nuops = 1 , .uops = { { COMPARE_OP_FLOAT , 0 , 0 } } },
1308
1307
[COMPARE_OP_INT ] = { .nuops = 1 , .uops = { { COMPARE_OP_INT , 0 , 0 } } },
@@ -1356,7 +1355,6 @@ const char * const _PyOpcode_uop_name[OPCODE_UOP_NAME_SIZE] = {
1356
1355
[_BINARY_OP_ADD_UNICODE ] = "_BINARY_OP_ADD_UNICODE" ,
1357
1356
[_LOAD_LOCALS ] = "_LOAD_LOCALS" ,
1358
1357
[_LOAD_FROM_DICT_OR_GLOBALS ] = "_LOAD_FROM_DICT_OR_GLOBALS" ,
1359
- [_SKIP_CACHE ] = "_SKIP_CACHE" ,
1360
1358
[_GUARD_GLOBALS_VERSION ] = "_GUARD_GLOBALS_VERSION" ,
1361
1359
[_GUARD_BUILTINS_VERSION ] = "_GUARD_BUILTINS_VERSION" ,
1362
1360
[_LOAD_GLOBAL_MODULE ] = "_LOAD_GLOBAL_MODULE" ,
0 commit comments