mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-24 20:30:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

GH-131798: Remove JIT guards for dict, frozenset, list, set, and tuple (GH-132289)

Browse source
This commit is contained in:
Brandt Bucher 2025-04-09 14:32:21 -07:00 • committed by GitHub
parent d47584aae6
commit 20926c73b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 942 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Include/internal/pycore_opcode_metadata.h generated
View file

@ -1069,7 +1069,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[266] = {
[BINARY_OP_INPLACE_ADD_UNICODE] = { true, INSTR_FMT_IXC0000, HAS_LOCAL_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_INPLACE_ADD_UNICODE] = { true, INSTR_FMT_IXC0000, HAS_LOCAL_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[BINARY_OP_MULTIPLY_FLOAT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG }, [BINARY_OP_MULTIPLY_FLOAT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG },
[BINARY_OP_MULTIPLY_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_MULTIPLY_INT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[BINARY_OP_SUBSCR_DICT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_SUBSCR_DICT] = { true, INSTR_FMT_IXC0000, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[BINARY_OP_SUBSCR_GETITEM] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG }, [BINARY_OP_SUBSCR_GETITEM] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG },
[BINARY_OP_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
[BINARY_OP_SUBSCR_STR_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [BINARY_OP_SUBSCR_STR_INT] = { true, INSTR_FMT_IXC0000, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
@ -1120,7 +1120,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[266] = {
[COMPARE_OP_INT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG }, [COMPARE_OP_INT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG },
[COMPARE_OP_STR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_EXIT_FLAG }, [COMPARE_OP_STR] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_EXIT_FLAG },
[CONTAINS_OP] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [CONTAINS_OP] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[CONTAINS_OP_DICT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [CONTAINS_OP_DICT] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[CONTAINS_OP_SET] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [CONTAINS_OP_SET] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[CONVERT_VALUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [CONVERT_VALUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[COPY] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_PURE_FLAG }, [COPY] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_PURE_FLAG },
@ -1265,7 +1265,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[266] = {
[STORE_NAME] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [STORE_NAME] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[STORE_SLICE] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [STORE_SLICE] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[STORE_SUBSCR] = { true, INSTR_FMT_IXC, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [STORE_SUBSCR] = { true, INSTR_FMT_IXC, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[STORE_SUBSCR_DICT] = { true, INSTR_FMT_IXC, HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [STORE_SUBSCR_DICT] = { true, INSTR_FMT_IXC, HAS_EXIT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[STORE_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG }, [STORE_SUBSCR_LIST_INT] = { true, INSTR_FMT_IXC, HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
[SWAP] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_PURE_FLAG }, [SWAP] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_PURE_FLAG },
[TO_BOOL] = { true, INSTR_FMT_IXC00, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [TO_BOOL] = { true, INSTR_FMT_IXC00, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
@ -1280,9 +1280,9 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[266] = {
[UNARY_NOT] = { true, INSTR_FMT_IX, HAS_PURE_FLAG }, [UNARY_NOT] = { true, INSTR_FMT_IX, HAS_PURE_FLAG },
[UNPACK_EX] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [UNPACK_EX] = { true, INSTR_FMT_IB, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[UNPACK_SEQUENCE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [UNPACK_SEQUENCE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[UNPACK_SEQUENCE_LIST] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG }, [UNPACK_SEQUENCE_LIST] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG },
[UNPACK_SEQUENCE_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG }, [UNPACK_SEQUENCE_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG },
[UNPACK_SEQUENCE_TWO_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG }, [UNPACK_SEQUENCE_TWO_TUPLE] = { true, INSTR_FMT_IBC, HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_EXIT_FLAG | HAS_ESCAPES_FLAG },
[WITH_EXCEPT_START] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [WITH_EXCEPT_START] = { true, INSTR_FMT_IX, HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
[YIELD_VALUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG }, [YIELD_VALUE] = { true, INSTR_FMT_IB, HAS_ARG_FLAG },
[JUMP] = { true, -1, HAS_ARG_FLAG | HAS_JUMP_FLAG | HAS_EVAL_BREAK_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG }, [JUMP] = { true, -1, HAS_ARG_FLAG | HAS_JUMP_FLAG | HAS_EVAL_BREAK_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG },
@ -1316,11 +1316,11 @@ _PyOpcode_macro_expansion[256] = {
[BINARY_OP_INPLACE_ADD_UNICODE] = { .nuops = 3, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_INPLACE_ADD_UNICODE, OPARG_SIMPLE, 5 } } }, [BINARY_OP_INPLACE_ADD_UNICODE] = { .nuops = 3, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_INPLACE_ADD_UNICODE, OPARG_SIMPLE, 5 } } },
[BINARY_OP_MULTIPLY_FLOAT] = { .nuops = 3, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_MULTIPLY_FLOAT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_MULTIPLY_FLOAT] = { .nuops = 3, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_MULTIPLY_FLOAT, OPARG_SIMPLE, 5 } } },
[BINARY_OP_MULTIPLY_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_MULTIPLY_INT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_MULTIPLY_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_MULTIPLY_INT, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBSCR_DICT] = { .nuops = 1, .uops = { { _BINARY_OP_SUBSCR_DICT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_DICT] = { .nuops = 2, .uops = { { _GUARD_NOS_DICT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_DICT, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBSCR_GETITEM] = { .nuops = 4, .uops = { { _CHECK_PEP_523, OPARG_SIMPLE, 5 }, { _BINARY_OP_SUBSCR_CHECK_FUNC, OPARG_SIMPLE, 5 }, { _BINARY_OP_SUBSCR_INIT_CALL, OPARG_SIMPLE, 5 }, { _PUSH_FRAME, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_GETITEM] = { .nuops = 4, .uops = { { _CHECK_PEP_523, OPARG_SIMPLE, 5 }, { _BINARY_OP_SUBSCR_CHECK_FUNC, OPARG_SIMPLE, 5 }, { _BINARY_OP_SUBSCR_INIT_CALL, OPARG_SIMPLE, 5 }, { _PUSH_FRAME, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBSCR_LIST_INT] = { .nuops = 2, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_LIST_INT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_LIST_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_LIST, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_LIST_INT, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBSCR_STR_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_STR_INT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_STR_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_STR_INT, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBSCR_TUPLE_INT] = { .nuops = 2, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_TUPLE_INT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBSCR_TUPLE_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_TUPLE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_TUPLE_INT, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBTRACT_FLOAT] = { .nuops = 3, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_FLOAT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBTRACT_FLOAT] = { .nuops = 3, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_FLOAT, OPARG_SIMPLE, 5 } } },
[BINARY_OP_SUBTRACT_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_INT, OPARG_SIMPLE, 5 } } }, [BINARY_OP_SUBTRACT_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_INT, OPARG_SIMPLE, 5 } } },
[BINARY_SLICE] = { .nuops = 1, .uops = { { _BINARY_SLICE, OPARG_SIMPLE, 0 } } }, [BINARY_SLICE] = { .nuops = 1, .uops = { { _BINARY_SLICE, OPARG_SIMPLE, 0 } } },
@ -1362,8 +1362,8 @@ _PyOpcode_macro_expansion[256] = {
[COMPARE_OP_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _COMPARE_OP_INT, OPARG_SIMPLE, 1 } } }, [COMPARE_OP_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _COMPARE_OP_INT, OPARG_SIMPLE, 1 } } },
[COMPARE_OP_STR] = { .nuops = 3, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _COMPARE_OP_STR, OPARG_SIMPLE, 1 } } }, [COMPARE_OP_STR] = { .nuops = 3, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _COMPARE_OP_STR, OPARG_SIMPLE, 1 } } },
[CONTAINS_OP] = { .nuops = 1, .uops = { { _CONTAINS_OP, OPARG_SIMPLE, 0 } } }, [CONTAINS_OP] = { .nuops = 1, .uops = { { _CONTAINS_OP, OPARG_SIMPLE, 0 } } },
[CONTAINS_OP_DICT] = { .nuops = 1, .uops = { { _CONTAINS_OP_DICT, OPARG_SIMPLE, 1 } } }, [CONTAINS_OP_DICT] = { .nuops = 2, .uops = { { _GUARD_TOS_DICT, OPARG_SIMPLE, 0 }, { _CONTAINS_OP_DICT, OPARG_SIMPLE, 1 } } },
[CONTAINS_OP_SET] = { .nuops = 1, .uops = { { _CONTAINS_OP_SET, OPARG_SIMPLE, 1 } } }, [CONTAINS_OP_SET] = { .nuops = 2, .uops = { { _GUARD_TOS_ANY_SET, OPARG_SIMPLE, 0 }, { _CONTAINS_OP_SET, OPARG_SIMPLE, 1 } } },
[CONVERT_VALUE] = { .nuops = 1, .uops = { { _CONVERT_VALUE, OPARG_SIMPLE, 0 } } }, [CONVERT_VALUE] = { .nuops = 1, .uops = { { _CONVERT_VALUE, OPARG_SIMPLE, 0 } } },
[COPY] = { .nuops = 1, .uops = { { _COPY, OPARG_SIMPLE, 0 } } }, [COPY] = { .nuops = 1, .uops = { { _COPY, OPARG_SIMPLE, 0 } } },
[COPY_FREE_VARS] = { .nuops = 1, .uops = { { _COPY_FREE_VARS, OPARG_SIMPLE, 0 } } }, [COPY_FREE_VARS] = { .nuops = 1, .uops = { { _COPY_FREE_VARS, OPARG_SIMPLE, 0 } } },
@ -1468,14 +1468,14 @@ _PyOpcode_macro_expansion[256] = {
[STORE_NAME] = { .nuops = 1, .uops = { { _STORE_NAME, OPARG_SIMPLE, 0 } } }, [STORE_NAME] = { .nuops = 1, .uops = { { _STORE_NAME, OPARG_SIMPLE, 0 } } },
[STORE_SLICE] = { .nuops = 1, .uops = { { _STORE_SLICE, OPARG_SIMPLE, 0 } } }, [STORE_SLICE] = { .nuops = 1, .uops = { { _STORE_SLICE, OPARG_SIMPLE, 0 } } },
[STORE_SUBSCR] = { .nuops = 1, .uops = { { _STORE_SUBSCR, OPARG_SIMPLE, 0 } } }, [STORE_SUBSCR] = { .nuops = 1, .uops = { { _STORE_SUBSCR, OPARG_SIMPLE, 0 } } },
[STORE_SUBSCR_DICT] = { .nuops = 1, .uops = { { _STORE_SUBSCR_DICT, OPARG_SIMPLE, 1 } } }, [STORE_SUBSCR_DICT] = { .nuops = 2, .uops = { { _GUARD_NOS_DICT, OPARG_SIMPLE, 0 }, { _STORE_SUBSCR_DICT, OPARG_SIMPLE, 1 } } },
[STORE_SUBSCR_LIST_INT] = { .nuops = 2, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _STORE_SUBSCR_LIST_INT, OPARG_SIMPLE, 1 } } }, [STORE_SUBSCR_LIST_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_LIST, OPARG_SIMPLE, 0 }, { _STORE_SUBSCR_LIST_INT, OPARG_SIMPLE, 1 } } },
[SWAP] = { .nuops = 1, .uops = { { _SWAP, OPARG_SIMPLE, 0 } } }, [SWAP] = { .nuops = 1, .uops = { { _SWAP, OPARG_SIMPLE, 0 } } },
[TO_BOOL] = { .nuops = 1, .uops = { { _TO_BOOL, OPARG_SIMPLE, 2 } } }, [TO_BOOL] = { .nuops = 1, .uops = { { _TO_BOOL, OPARG_SIMPLE, 2 } } },
[TO_BOOL_ALWAYS_TRUE] = { .nuops = 2, .uops = { { _GUARD_TYPE_VERSION, 2, 1 }, { _REPLACE_WITH_TRUE, OPARG_SIMPLE, 3 } } }, [TO_BOOL_ALWAYS_TRUE] = { .nuops = 2, .uops = { { _GUARD_TYPE_VERSION, 2, 1 }, { _REPLACE_WITH_TRUE, OPARG_SIMPLE, 3 } } },
[TO_BOOL_BOOL] = { .nuops = 1, .uops = { { _TO_BOOL_BOOL, OPARG_SIMPLE, 3 } } }, [TO_BOOL_BOOL] = { .nuops = 1, .uops = { { _TO_BOOL_BOOL, OPARG_SIMPLE, 3 } } },
[TO_BOOL_INT] = { .nuops = 1, .uops = { { _TO_BOOL_INT, OPARG_SIMPLE, 3 } } }, [TO_BOOL_INT] = { .nuops = 1, .uops = { { _TO_BOOL_INT, OPARG_SIMPLE, 3 } } },
[TO_BOOL_LIST] = { .nuops = 1, .uops = { { _TO_BOOL_LIST, OPARG_SIMPLE, 3 } } }, [TO_BOOL_LIST] = { .nuops = 2, .uops = { { _GUARD_TOS_LIST, OPARG_SIMPLE, 0 }, { _TO_BOOL_LIST, OPARG_SIMPLE, 3 } } },
[TO_BOOL_NONE] = { .nuops = 1, .uops = { { _TO_BOOL_NONE, OPARG_SIMPLE, 3 } } }, [TO_BOOL_NONE] = { .nuops = 1, .uops = { { _TO_BOOL_NONE, OPARG_SIMPLE, 3 } } },
[TO_BOOL_STR] = { .nuops = 2, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _TO_BOOL_STR, OPARG_SIMPLE, 3 } } }, [TO_BOOL_STR] = { .nuops = 2, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _TO_BOOL_STR, OPARG_SIMPLE, 3 } } },
[UNARY_INVERT] = { .nuops = 1, .uops = { { _UNARY_INVERT, OPARG_SIMPLE, 0 } } }, [UNARY_INVERT] = { .nuops = 1, .uops = { { _UNARY_INVERT, OPARG_SIMPLE, 0 } } },
@ -1483,9 +1483,9 @@ _PyOpcode_macro_expansion[256] = {
[UNARY_NOT] = { .nuops = 1, .uops = { { _UNARY_NOT, OPARG_SIMPLE, 0 } } }, [UNARY_NOT] = { .nuops = 1, .uops = { { _UNARY_NOT, OPARG_SIMPLE, 0 } } },
[UNPACK_EX] = { .nuops = 1, .uops = { { _UNPACK_EX, OPARG_SIMPLE, 0 } } }, [UNPACK_EX] = { .nuops = 1, .uops = { { _UNPACK_EX, OPARG_SIMPLE, 0 } } },
[UNPACK_SEQUENCE] = { .nuops = 1, .uops = { { _UNPACK_SEQUENCE, OPARG_SIMPLE, 0 } } }, [UNPACK_SEQUENCE] = { .nuops = 1, .uops = { { _UNPACK_SEQUENCE, OPARG_SIMPLE, 0 } } },
[UNPACK_SEQUENCE_LIST] = { .nuops = 1, .uops = { { _UNPACK_SEQUENCE_LIST, OPARG_SIMPLE, 1 } } }, [UNPACK_SEQUENCE_LIST] = { .nuops = 2, .uops = { { _GUARD_TOS_LIST, OPARG_SIMPLE, 0 }, { _UNPACK_SEQUENCE_LIST, OPARG_SIMPLE, 1 } } },
[UNPACK_SEQUENCE_TUPLE] = { .nuops = 1, .uops = { { _UNPACK_SEQUENCE_TUPLE, OPARG_SIMPLE, 1 } } }, [UNPACK_SEQUENCE_TUPLE] = { .nuops = 2, .uops = { { _GUARD_TOS_TUPLE, OPARG_SIMPLE, 0 }, { _UNPACK_SEQUENCE_TUPLE, OPARG_SIMPLE, 1 } } },
[UNPACK_SEQUENCE_TWO_TUPLE] = { .nuops = 1, .uops = { { _UNPACK_SEQUENCE_TWO_TUPLE, OPARG_SIMPLE, 1 } } }, [UNPACK_SEQUENCE_TWO_TUPLE] = { .nuops = 2, .uops = { { _GUARD_TOS_TUPLE, OPARG_SIMPLE, 0 }, { _UNPACK_SEQUENCE_TWO_TUPLE, OPARG_SIMPLE, 1 } } },
[WITH_EXCEPT_START] = { .nuops = 1, .uops = { { _WITH_EXCEPT_START, OPARG_SIMPLE, 0 } } }, [WITH_EXCEPT_START] = { .nuops = 1, .uops = { { _WITH_EXCEPT_START, OPARG_SIMPLE, 0 } } },
[YIELD_VALUE] = { .nuops = 1, .uops = { { _YIELD_VALUE, OPARG_SIMPLE, 0 } } }, [YIELD_VALUE] = { .nuops = 1, .uops = { { _YIELD_VALUE, OPARG_SIMPLE, 0 } } },
}; };

383
Include/internal/pycore_uop_ids.h generated
View file

@ -20,130 +20,137 @@ extern "C" {
#define _BINARY_OP_MULTIPLY_FLOAT 308 #define _BINARY_OP_MULTIPLY_FLOAT 308
#define _BINARY_OP_MULTIPLY_INT 309 #define _BINARY_OP_MULTIPLY_INT 309
#define _BINARY_OP_SUBSCR_CHECK_FUNC 310 #define _BINARY_OP_SUBSCR_CHECK_FUNC 310
#define _BINARY_OP_SUBSCR_DICT BINARY_OP_SUBSCR_DICT #define _BINARY_OP_SUBSCR_DICT 311
#define _BINARY_OP_SUBSCR_INIT_CALL 311 #define _BINARY_OP_SUBSCR_INIT_CALL 312
#define _BINARY_OP_SUBSCR_LIST_INT 312 #define _BINARY_OP_SUBSCR_LIST_INT 313
#define _BINARY_OP_SUBSCR_STR_INT 313 #define _BINARY_OP_SUBSCR_STR_INT 314
#define _BINARY_OP_SUBSCR_TUPLE_INT 314 #define _BINARY_OP_SUBSCR_TUPLE_INT 315
#define _BINARY_OP_SUBTRACT_FLOAT 315 #define _BINARY_OP_SUBTRACT_FLOAT 316
#define _BINARY_OP_SUBTRACT_INT 316 #define _BINARY_OP_SUBTRACT_INT 317
#define _BINARY_SLICE 317 #define _BINARY_SLICE 318
#define _BUILD_LIST BUILD_LIST #define _BUILD_LIST BUILD_LIST
#define _BUILD_MAP BUILD_MAP #define _BUILD_MAP BUILD_MAP
#define _BUILD_SET BUILD_SET #define _BUILD_SET BUILD_SET
#define _BUILD_SLICE BUILD_SLICE #define _BUILD_SLICE BUILD_SLICE
#define _BUILD_STRING BUILD_STRING #define _BUILD_STRING BUILD_STRING
#define _BUILD_TUPLE BUILD_TUPLE #define _BUILD_TUPLE BUILD_TUPLE
#define _CALL_BUILTIN_CLASS 318 #define _CALL_BUILTIN_CLASS 319
#define _CALL_BUILTIN_FAST 319 #define _CALL_BUILTIN_FAST 320
#define _CALL_BUILTIN_FAST_WITH_KEYWORDS 320 #define _CALL_BUILTIN_FAST_WITH_KEYWORDS 321
#define _CALL_BUILTIN_O 321 #define _CALL_BUILTIN_O 322
#define _CALL_INTRINSIC_1 CALL_INTRINSIC_1 #define _CALL_INTRINSIC_1 CALL_INTRINSIC_1
#define _CALL_INTRINSIC_2 CALL_INTRINSIC_2 #define _CALL_INTRINSIC_2 CALL_INTRINSIC_2
#define _CALL_ISINSTANCE CALL_ISINSTANCE #define _CALL_ISINSTANCE CALL_ISINSTANCE
#define _CALL_KW_NON_PY 322 #define _CALL_KW_NON_PY 323
#define _CALL_LEN CALL_LEN #define _CALL_LEN CALL_LEN
#define _CALL_LIST_APPEND CALL_LIST_APPEND #define _CALL_LIST_APPEND CALL_LIST_APPEND
#define _CALL_METHOD_DESCRIPTOR_FAST 323 #define _CALL_METHOD_DESCRIPTOR_FAST 324
#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 324 #define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 325
#define _CALL_METHOD_DESCRIPTOR_NOARGS 325 #define _CALL_METHOD_DESCRIPTOR_NOARGS 326
#define _CALL_METHOD_DESCRIPTOR_O 326 #define _CALL_METHOD_DESCRIPTOR_O 327
#define _CALL_NON_PY_GENERAL 327 #define _CALL_NON_PY_GENERAL 328
#define _CALL_STR_1 328 #define _CALL_STR_1 329
#define _CALL_TUPLE_1 329 #define _CALL_TUPLE_1 330
#define _CALL_TYPE_1 CALL_TYPE_1 #define _CALL_TYPE_1 CALL_TYPE_1
#define _CHECK_AND_ALLOCATE_OBJECT 330 #define _CHECK_AND_ALLOCATE_OBJECT 331
#define _CHECK_ATTR_CLASS 331 #define _CHECK_ATTR_CLASS 332
#define _CHECK_ATTR_METHOD_LAZY_DICT 332 #define _CHECK_ATTR_METHOD_LAZY_DICT 333
#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 333 #define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS 334
#define _CHECK_EG_MATCH CHECK_EG_MATCH #define _CHECK_EG_MATCH CHECK_EG_MATCH
#define _CHECK_EXC_MATCH CHECK_EXC_MATCH #define _CHECK_EXC_MATCH CHECK_EXC_MATCH
#define _CHECK_FUNCTION 334 #define _CHECK_FUNCTION 335
#define _CHECK_FUNCTION_EXACT_ARGS 335 #define _CHECK_FUNCTION_EXACT_ARGS 336
#define _CHECK_FUNCTION_VERSION 336 #define _CHECK_FUNCTION_VERSION 337
#define _CHECK_FUNCTION_VERSION_INLINE 337 #define _CHECK_FUNCTION_VERSION_INLINE 338
#define _CHECK_FUNCTION_VERSION_KW 338 #define _CHECK_FUNCTION_VERSION_KW 339
#define _CHECK_IS_NOT_PY_CALLABLE 339 #define _CHECK_IS_NOT_PY_CALLABLE 340
#define _CHECK_IS_NOT_PY_CALLABLE_KW 340 #define _CHECK_IS_NOT_PY_CALLABLE_KW 341
#define _CHECK_MANAGED_OBJECT_HAS_VALUES 341 #define _CHECK_MANAGED_OBJECT_HAS_VALUES 342
#define _CHECK_METHOD_VERSION 342 #define _CHECK_METHOD_VERSION 343
#define _CHECK_METHOD_VERSION_KW 343 #define _CHECK_METHOD_VERSION_KW 344
#define _CHECK_PEP_523 344 #define _CHECK_PEP_523 345
#define _CHECK_PERIODIC 345 #define _CHECK_PERIODIC 346
#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 346 #define _CHECK_PERIODIC_IF_NOT_YIELD_FROM 347
#define _CHECK_STACK_SPACE 347 #define _CHECK_STACK_SPACE 348
#define _CHECK_STACK_SPACE_OPERAND 348 #define _CHECK_STACK_SPACE_OPERAND 349
#define _CHECK_VALIDITY 349 #define _CHECK_VALIDITY 350
#define _COMPARE_OP 350 #define _COMPARE_OP 351
#define _COMPARE_OP_FLOAT 351 #define _COMPARE_OP_FLOAT 352
#define _COMPARE_OP_INT 352 #define _COMPARE_OP_INT 353
#define _COMPARE_OP_STR 353 #define _COMPARE_OP_STR 354
#define _CONTAINS_OP 354 #define _CONTAINS_OP 355
#define _CONTAINS_OP_DICT CONTAINS_OP_DICT #define _CONTAINS_OP_DICT 356
#define _CONTAINS_OP_SET CONTAINS_OP_SET #define _CONTAINS_OP_SET 357
#define _CONVERT_VALUE CONVERT_VALUE #define _CONVERT_VALUE CONVERT_VALUE
#define _COPY COPY #define _COPY COPY
#define _COPY_FREE_VARS COPY_FREE_VARS #define _COPY_FREE_VARS COPY_FREE_VARS
#define _CREATE_INIT_FRAME 355 #define _CREATE_INIT_FRAME 358
#define _DELETE_ATTR DELETE_ATTR #define _DELETE_ATTR DELETE_ATTR
#define _DELETE_DEREF DELETE_DEREF #define _DELETE_DEREF DELETE_DEREF
#define _DELETE_FAST DELETE_FAST #define _DELETE_FAST DELETE_FAST
#define _DELETE_GLOBAL DELETE_GLOBAL #define _DELETE_GLOBAL DELETE_GLOBAL
#define _DELETE_NAME DELETE_NAME #define _DELETE_NAME DELETE_NAME
#define _DELETE_SUBSCR DELETE_SUBSCR #define _DELETE_SUBSCR DELETE_SUBSCR
#define _DEOPT 356 #define _DEOPT 359
#define _DICT_MERGE DICT_MERGE #define _DICT_MERGE DICT_MERGE
#define _DICT_UPDATE DICT_UPDATE #define _DICT_UPDATE DICT_UPDATE
#define _DO_CALL 357 #define _DO_CALL 360
#define _DO_CALL_FUNCTION_EX 358 #define _DO_CALL_FUNCTION_EX 361
#define _DO_CALL_KW 359 #define _DO_CALL_KW 362
#define _END_FOR END_FOR #define _END_FOR END_FOR
#define _END_SEND END_SEND #define _END_SEND END_SEND
#define _ERROR_POP_N 360 #define _ERROR_POP_N 363
#define _EXIT_INIT_CHECK EXIT_INIT_CHECK #define _EXIT_INIT_CHECK EXIT_INIT_CHECK
#define _EXPAND_METHOD 361 #define _EXPAND_METHOD 364
#define _EXPAND_METHOD_KW 362 #define _EXPAND_METHOD_KW 365
#define _FATAL_ERROR 363 #define _FATAL_ERROR 366
#define _FORMAT_SIMPLE FORMAT_SIMPLE #define _FORMAT_SIMPLE FORMAT_SIMPLE
#define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC #define _FORMAT_WITH_SPEC FORMAT_WITH_SPEC
#define _FOR_ITER 364 #define _FOR_ITER 367
#define _FOR_ITER_GEN_FRAME 365 #define _FOR_ITER_GEN_FRAME 368
#define _FOR_ITER_TIER_TWO 366 #define _FOR_ITER_TIER_TWO 369
#define _GET_AITER GET_AITER #define _GET_AITER GET_AITER
#define _GET_ANEXT GET_ANEXT #define _GET_ANEXT GET_ANEXT
#define _GET_AWAITABLE GET_AWAITABLE #define _GET_AWAITABLE GET_AWAITABLE
#define _GET_ITER GET_ITER #define _GET_ITER GET_ITER
#define _GET_LEN GET_LEN #define _GET_LEN GET_LEN
#define _GET_YIELD_FROM_ITER GET_YIELD_FROM_ITER #define _GET_YIELD_FROM_ITER GET_YIELD_FROM_ITER
#define _GUARD_BINARY_OP_EXTEND 367 #define _GUARD_BINARY_OP_EXTEND 370
#define _GUARD_DORV_NO_DICT 368 #define _GUARD_DORV_NO_DICT 371
#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 369 #define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT 372
#define _GUARD_GLOBALS_VERSION 370 #define _GUARD_GLOBALS_VERSION 373
#define _GUARD_IS_FALSE_POP 371 #define _GUARD_IS_FALSE_POP 374
#define _GUARD_IS_NONE_POP 372 #define _GUARD_IS_NONE_POP 375
#define _GUARD_IS_NOT_NONE_POP 373 #define _GUARD_IS_NOT_NONE_POP 376
#define _GUARD_IS_TRUE_POP 374 #define _GUARD_IS_TRUE_POP 377
#define _GUARD_KEYS_VERSION 375 #define _GUARD_KEYS_VERSION 378
#define _GUARD_NOS_FLOAT 376 #define _GUARD_NOS_DICT 379
#define _GUARD_NOS_INT 377 #define _GUARD_NOS_FLOAT 380
#define _GUARD_NOS_UNICODE 378 #define _GUARD_NOS_INT 381
#define _GUARD_NOT_EXHAUSTED_LIST 379 #define _GUARD_NOS_LIST 382
#define _GUARD_NOT_EXHAUSTED_RANGE 380 #define _GUARD_NOS_TUPLE 383
#define _GUARD_NOT_EXHAUSTED_TUPLE 381 #define _GUARD_NOS_UNICODE 384
#define _GUARD_TOS_FLOAT 382 #define _GUARD_NOT_EXHAUSTED_LIST 385
#define _GUARD_TOS_INT 383 #define _GUARD_NOT_EXHAUSTED_RANGE 386
#define _GUARD_TOS_UNICODE 384 #define _GUARD_NOT_EXHAUSTED_TUPLE 387
#define _GUARD_TYPE_VERSION 385 #define _GUARD_TOS_ANY_SET 388
#define _GUARD_TYPE_VERSION_AND_LOCK 386 #define _GUARD_TOS_DICT 389
#define _GUARD_TOS_FLOAT 390
#define _GUARD_TOS_INT 391
#define _GUARD_TOS_LIST 392
#define _GUARD_TOS_TUPLE 393
#define _GUARD_TOS_UNICODE 394
#define _GUARD_TYPE_VERSION 395
#define _GUARD_TYPE_VERSION_AND_LOCK 396
#define _IMPORT_FROM IMPORT_FROM #define _IMPORT_FROM IMPORT_FROM
#define _IMPORT_NAME IMPORT_NAME #define _IMPORT_NAME IMPORT_NAME
#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 387 #define _INIT_CALL_BOUND_METHOD_EXACT_ARGS 397
#define _INIT_CALL_PY_EXACT_ARGS 388 #define _INIT_CALL_PY_EXACT_ARGS 398
#define _INIT_CALL_PY_EXACT_ARGS_0 389 #define _INIT_CALL_PY_EXACT_ARGS_0 399
#define _INIT_CALL_PY_EXACT_ARGS_1 390 #define _INIT_CALL_PY_EXACT_ARGS_1 400
#define _INIT_CALL_PY_EXACT_ARGS_2 391 #define _INIT_CALL_PY_EXACT_ARGS_2 401
#define _INIT_CALL_PY_EXACT_ARGS_3 392 #define _INIT_CALL_PY_EXACT_ARGS_3 402
#define _INIT_CALL_PY_EXACT_ARGS_4 393 #define _INIT_CALL_PY_EXACT_ARGS_4 403
#define _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER #define _INSTRUMENTED_FOR_ITER INSTRUMENTED_FOR_ITER
#define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION #define _INSTRUMENTED_INSTRUCTION INSTRUMENTED_INSTRUCTION
#define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD #define _INSTRUMENTED_JUMP_FORWARD INSTRUMENTED_JUMP_FORWARD
@ -153,163 +160,163 @@ extern "C" {
#define _INSTRUMENTED_POP_JUMP_IF_NONE INSTRUMENTED_POP_JUMP_IF_NONE #define _INSTRUMENTED_POP_JUMP_IF_NONE INSTRUMENTED_POP_JUMP_IF_NONE
#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE INSTRUMENTED_POP_JUMP_IF_NOT_NONE #define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE INSTRUMENTED_POP_JUMP_IF_NOT_NONE
#define _INSTRUMENTED_POP_JUMP_IF_TRUE INSTRUMENTED_POP_JUMP_IF_TRUE #define _INSTRUMENTED_POP_JUMP_IF_TRUE INSTRUMENTED_POP_JUMP_IF_TRUE
#define _IS_NONE 394 #define _IS_NONE 404
#define _IS_OP IS_OP #define _IS_OP IS_OP
#define _ITER_CHECK_LIST 395 #define _ITER_CHECK_LIST 405
#define _ITER_CHECK_RANGE 396 #define _ITER_CHECK_RANGE 406
#define _ITER_CHECK_TUPLE 397 #define _ITER_CHECK_TUPLE 407
#define _ITER_JUMP_LIST 398 #define _ITER_JUMP_LIST 408
#define _ITER_JUMP_RANGE 399 #define _ITER_JUMP_RANGE 409
#define _ITER_JUMP_TUPLE 400 #define _ITER_JUMP_TUPLE 410
#define _ITER_NEXT_LIST 401 #define _ITER_NEXT_LIST 411
#define _ITER_NEXT_LIST_TIER_TWO 402 #define _ITER_NEXT_LIST_TIER_TWO 412
#define _ITER_NEXT_RANGE 403 #define _ITER_NEXT_RANGE 413
#define _ITER_NEXT_TUPLE 404 #define _ITER_NEXT_TUPLE 414
#define _JUMP_TO_TOP 405 #define _JUMP_TO_TOP 415
#define _LIST_APPEND LIST_APPEND #define _LIST_APPEND LIST_APPEND
#define _LIST_EXTEND LIST_EXTEND #define _LIST_EXTEND LIST_EXTEND
#define _LOAD_ATTR 406 #define _LOAD_ATTR 416
#define _LOAD_ATTR_CLASS 407 #define _LOAD_ATTR_CLASS 417
#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN #define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN
#define _LOAD_ATTR_INSTANCE_VALUE 408 #define _LOAD_ATTR_INSTANCE_VALUE 418
#define _LOAD_ATTR_METHOD_LAZY_DICT 409 #define _LOAD_ATTR_METHOD_LAZY_DICT 419
#define _LOAD_ATTR_METHOD_NO_DICT 410 #define _LOAD_ATTR_METHOD_NO_DICT 420
#define _LOAD_ATTR_METHOD_WITH_VALUES 411 #define _LOAD_ATTR_METHOD_WITH_VALUES 421
#define _LOAD_ATTR_MODULE 412 #define _LOAD_ATTR_MODULE 422
#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 413 #define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT 423
#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 414 #define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES 424
#define _LOAD_ATTR_PROPERTY_FRAME 415 #define _LOAD_ATTR_PROPERTY_FRAME 425
#define _LOAD_ATTR_SLOT 416 #define _LOAD_ATTR_SLOT 426
#define _LOAD_ATTR_WITH_HINT 417 #define _LOAD_ATTR_WITH_HINT 427
#define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS #define _LOAD_BUILD_CLASS LOAD_BUILD_CLASS
#define _LOAD_BYTECODE 418 #define _LOAD_BYTECODE 428
#define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT #define _LOAD_COMMON_CONSTANT LOAD_COMMON_CONSTANT
#define _LOAD_CONST LOAD_CONST #define _LOAD_CONST LOAD_CONST
#define _LOAD_CONST_IMMORTAL LOAD_CONST_IMMORTAL #define _LOAD_CONST_IMMORTAL LOAD_CONST_IMMORTAL
#define _LOAD_CONST_INLINE 419 #define _LOAD_CONST_INLINE 429
#define _LOAD_CONST_INLINE_BORROW 420 #define _LOAD_CONST_INLINE_BORROW 430
#define _LOAD_CONST_MORTAL LOAD_CONST_MORTAL #define _LOAD_CONST_MORTAL LOAD_CONST_MORTAL
#define _LOAD_DEREF LOAD_DEREF #define _LOAD_DEREF LOAD_DEREF
#define _LOAD_FAST 421 #define _LOAD_FAST 431
#define _LOAD_FAST_0 422 #define _LOAD_FAST_0 432
#define _LOAD_FAST_1 423 #define _LOAD_FAST_1 433
#define _LOAD_FAST_2 424 #define _LOAD_FAST_2 434
#define _LOAD_FAST_3 425 #define _LOAD_FAST_3 435
#define _LOAD_FAST_4 426 #define _LOAD_FAST_4 436
#define _LOAD_FAST_5 427 #define _LOAD_FAST_5 437
#define _LOAD_FAST_6 428 #define _LOAD_FAST_6 438
#define _LOAD_FAST_7 429 #define _LOAD_FAST_7 439
#define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR #define _LOAD_FAST_AND_CLEAR LOAD_FAST_AND_CLEAR
#define _LOAD_FAST_BORROW 430 #define _LOAD_FAST_BORROW 440
#define _LOAD_FAST_BORROW_0 431 #define _LOAD_FAST_BORROW_0 441
#define _LOAD_FAST_BORROW_1 432 #define _LOAD_FAST_BORROW_1 442
#define _LOAD_FAST_BORROW_2 433 #define _LOAD_FAST_BORROW_2 443
#define _LOAD_FAST_BORROW_3 434 #define _LOAD_FAST_BORROW_3 444
#define _LOAD_FAST_BORROW_4 435 #define _LOAD_FAST_BORROW_4 445
#define _LOAD_FAST_BORROW_5 436 #define _LOAD_FAST_BORROW_5 446
#define _LOAD_FAST_BORROW_6 437 #define _LOAD_FAST_BORROW_6 447
#define _LOAD_FAST_BORROW_7 438 #define _LOAD_FAST_BORROW_7 448
#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW LOAD_FAST_BORROW_LOAD_FAST_BORROW #define _LOAD_FAST_BORROW_LOAD_FAST_BORROW LOAD_FAST_BORROW_LOAD_FAST_BORROW
#define _LOAD_FAST_CHECK LOAD_FAST_CHECK #define _LOAD_FAST_CHECK LOAD_FAST_CHECK
#define _LOAD_FAST_LOAD_FAST LOAD_FAST_LOAD_FAST #define _LOAD_FAST_LOAD_FAST LOAD_FAST_LOAD_FAST
#define _LOAD_FROM_DICT_OR_DEREF LOAD_FROM_DICT_OR_DEREF #define _LOAD_FROM_DICT_OR_DEREF LOAD_FROM_DICT_OR_DEREF
#define _LOAD_FROM_DICT_OR_GLOBALS LOAD_FROM_DICT_OR_GLOBALS #define _LOAD_FROM_DICT_OR_GLOBALS LOAD_FROM_DICT_OR_GLOBALS
#define _LOAD_GLOBAL 439 #define _LOAD_GLOBAL 449
#define _LOAD_GLOBAL_BUILTINS 440 #define _LOAD_GLOBAL_BUILTINS 450
#define _LOAD_GLOBAL_MODULE 441 #define _LOAD_GLOBAL_MODULE 451
#define _LOAD_LOCALS LOAD_LOCALS #define _LOAD_LOCALS LOAD_LOCALS
#define _LOAD_NAME LOAD_NAME #define _LOAD_NAME LOAD_NAME
#define _LOAD_SMALL_INT 442 #define _LOAD_SMALL_INT 452
#define _LOAD_SMALL_INT_0 443 #define _LOAD_SMALL_INT_0 453
#define _LOAD_SMALL_INT_1 444 #define _LOAD_SMALL_INT_1 454
#define _LOAD_SMALL_INT_2 445 #define _LOAD_SMALL_INT_2 455
#define _LOAD_SMALL_INT_3 446 #define _LOAD_SMALL_INT_3 456
#define _LOAD_SPECIAL LOAD_SPECIAL #define _LOAD_SPECIAL LOAD_SPECIAL
#define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR #define _LOAD_SUPER_ATTR_ATTR LOAD_SUPER_ATTR_ATTR
#define _LOAD_SUPER_ATTR_METHOD LOAD_SUPER_ATTR_METHOD #define _LOAD_SUPER_ATTR_METHOD LOAD_SUPER_ATTR_METHOD
#define _MAKE_CALLARGS_A_TUPLE 447 #define _MAKE_CALLARGS_A_TUPLE 457
#define _MAKE_CELL MAKE_CELL #define _MAKE_CELL MAKE_CELL
#define _MAKE_FUNCTION MAKE_FUNCTION #define _MAKE_FUNCTION MAKE_FUNCTION
#define _MAKE_WARM 448 #define _MAKE_WARM 458
#define _MAP_ADD MAP_ADD #define _MAP_ADD MAP_ADD
#define _MATCH_CLASS MATCH_CLASS #define _MATCH_CLASS MATCH_CLASS
#define _MATCH_KEYS MATCH_KEYS #define _MATCH_KEYS MATCH_KEYS
#define _MATCH_MAPPING MATCH_MAPPING #define _MATCH_MAPPING MATCH_MAPPING
#define _MATCH_SEQUENCE MATCH_SEQUENCE #define _MATCH_SEQUENCE MATCH_SEQUENCE
#define _MAYBE_EXPAND_METHOD 449 #define _MAYBE_EXPAND_METHOD 459
#define _MAYBE_EXPAND_METHOD_KW 450 #define _MAYBE_EXPAND_METHOD_KW 460
#define _MONITOR_CALL 451 #define _MONITOR_CALL 461
#define _MONITOR_CALL_KW 452 #define _MONITOR_CALL_KW 462
#define _MONITOR_JUMP_BACKWARD 453 #define _MONITOR_JUMP_BACKWARD 463
#define _MONITOR_RESUME 454 #define _MONITOR_RESUME 464
#define _NOP NOP #define _NOP NOP
#define _POP_EXCEPT POP_EXCEPT #define _POP_EXCEPT POP_EXCEPT
#define _POP_JUMP_IF_FALSE 455 #define _POP_JUMP_IF_FALSE 465
#define _POP_JUMP_IF_TRUE 456 #define _POP_JUMP_IF_TRUE 466
#define _POP_TOP POP_TOP #define _POP_TOP POP_TOP
#define _POP_TOP_LOAD_CONST_INLINE 457 #define _POP_TOP_LOAD_CONST_INLINE 467
#define _POP_TOP_LOAD_CONST_INLINE_BORROW 458 #define _POP_TOP_LOAD_CONST_INLINE_BORROW 468
#define _POP_TWO_LOAD_CONST_INLINE_BORROW 459 #define _POP_TWO_LOAD_CONST_INLINE_BORROW 469
#define _PUSH_EXC_INFO PUSH_EXC_INFO #define _PUSH_EXC_INFO PUSH_EXC_INFO
#define _PUSH_FRAME 460 #define _PUSH_FRAME 470
#define _PUSH_NULL PUSH_NULL #define _PUSH_NULL PUSH_NULL
#define _PUSH_NULL_CONDITIONAL 461 #define _PUSH_NULL_CONDITIONAL 471
#define _PY_FRAME_GENERAL 462 #define _PY_FRAME_GENERAL 472
#define _PY_FRAME_KW 463 #define _PY_FRAME_KW 473
#define _QUICKEN_RESUME 464 #define _QUICKEN_RESUME 474
#define _REPLACE_WITH_TRUE 465 #define _REPLACE_WITH_TRUE 475
#define _RESUME_CHECK RESUME_CHECK #define _RESUME_CHECK RESUME_CHECK
#define _RETURN_GENERATOR RETURN_GENERATOR #define _RETURN_GENERATOR RETURN_GENERATOR
#define _RETURN_VALUE RETURN_VALUE #define _RETURN_VALUE RETURN_VALUE
#define _SAVE_RETURN_OFFSET 466 #define _SAVE_RETURN_OFFSET 476
#define _SEND 467 #define _SEND 477
#define _SEND_GEN_FRAME 468 #define _SEND_GEN_FRAME 478
#define _SETUP_ANNOTATIONS SETUP_ANNOTATIONS #define _SETUP_ANNOTATIONS SETUP_ANNOTATIONS
#define _SET_ADD SET_ADD #define _SET_ADD SET_ADD
#define _SET_FUNCTION_ATTRIBUTE SET_FUNCTION_ATTRIBUTE #define _SET_FUNCTION_ATTRIBUTE SET_FUNCTION_ATTRIBUTE
#define _SET_UPDATE SET_UPDATE #define _SET_UPDATE SET_UPDATE
#define _START_EXECUTOR 469 #define _START_EXECUTOR 479
#define _STORE_ATTR 470 #define _STORE_ATTR 480
#define _STORE_ATTR_INSTANCE_VALUE 471 #define _STORE_ATTR_INSTANCE_VALUE 481
#define _STORE_ATTR_SLOT 472 #define _STORE_ATTR_SLOT 482
#define _STORE_ATTR_WITH_HINT 473 #define _STORE_ATTR_WITH_HINT 483
#define _STORE_DEREF STORE_DEREF #define _STORE_DEREF STORE_DEREF
#define _STORE_FAST 474 #define _STORE_FAST 484
#define _STORE_FAST_0 475 #define _STORE_FAST_0 485
#define _STORE_FAST_1 476 #define _STORE_FAST_1 486
#define _STORE_FAST_2 477 #define _STORE_FAST_2 487
#define _STORE_FAST_3 478 #define _STORE_FAST_3 488
#define _STORE_FAST_4 479 #define _STORE_FAST_4 489
#define _STORE_FAST_5 480 #define _STORE_FAST_5 490
#define _STORE_FAST_6 481 #define _STORE_FAST_6 491
#define _STORE_FAST_7 482 #define _STORE_FAST_7 492
#define _STORE_FAST_LOAD_FAST STORE_FAST_LOAD_FAST #define _STORE_FAST_LOAD_FAST STORE_FAST_LOAD_FAST
#define _STORE_FAST_STORE_FAST STORE_FAST_STORE_FAST #define _STORE_FAST_STORE_FAST STORE_FAST_STORE_FAST
#define _STORE_GLOBAL STORE_GLOBAL #define _STORE_GLOBAL STORE_GLOBAL
#define _STORE_NAME STORE_NAME #define _STORE_NAME STORE_NAME
#define _STORE_SLICE 483 #define _STORE_SLICE 493
#define _STORE_SUBSCR 484 #define _STORE_SUBSCR 494
#define _STORE_SUBSCR_DICT STORE_SUBSCR_DICT #define _STORE_SUBSCR_DICT 495
#define _STORE_SUBSCR_LIST_INT 485 #define _STORE_SUBSCR_LIST_INT 496
#define _SWAP SWAP #define _SWAP SWAP
#define _TIER2_RESUME_CHECK 486 #define _TIER2_RESUME_CHECK 497
#define _TO_BOOL 487 #define _TO_BOOL 498
#define _TO_BOOL_BOOL TO_BOOL_BOOL #define _TO_BOOL_BOOL TO_BOOL_BOOL
#define _TO_BOOL_INT TO_BOOL_INT #define _TO_BOOL_INT TO_BOOL_INT
#define _TO_BOOL_LIST TO_BOOL_LIST #define _TO_BOOL_LIST 499
#define _TO_BOOL_NONE TO_BOOL_NONE #define _TO_BOOL_NONE TO_BOOL_NONE
#define _TO_BOOL_STR 488 #define _TO_BOOL_STR 500
#define _UNARY_INVERT UNARY_INVERT #define _UNARY_INVERT UNARY_INVERT
#define _UNARY_NEGATIVE UNARY_NEGATIVE #define _UNARY_NEGATIVE UNARY_NEGATIVE
#define _UNARY_NOT UNARY_NOT #define _UNARY_NOT UNARY_NOT
#define _UNPACK_EX UNPACK_EX #define _UNPACK_EX UNPACK_EX
#define _UNPACK_SEQUENCE 489 #define _UNPACK_SEQUENCE 501
#define _UNPACK_SEQUENCE_LIST UNPACK_SEQUENCE_LIST #define _UNPACK_SEQUENCE_LIST 502
#define _UNPACK_SEQUENCE_TUPLE UNPACK_SEQUENCE_TUPLE #define _UNPACK_SEQUENCE_TUPLE 503
#define _UNPACK_SEQUENCE_TWO_TUPLE UNPACK_SEQUENCE_TWO_TUPLE #define _UNPACK_SEQUENCE_TWO_TUPLE 504
#define _WITH_EXCEPT_START WITH_EXCEPT_START #define _WITH_EXCEPT_START WITH_EXCEPT_START
#define _YIELD_VALUE YIELD_VALUE #define _YIELD_VALUE YIELD_VALUE
#define MAX_UOP_ID 489 #define MAX_UOP_ID 504
#ifdef __cplusplus #ifdef __cplusplus
} }

38
Include/internal/pycore_uop_metadata.h generated
View file

@ -72,7 +72,9 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_TO_BOOL] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_TO_BOOL] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_TO_BOOL_BOOL] = HAS_EXIT_FLAG, [_TO_BOOL_BOOL] = HAS_EXIT_FLAG,
[_TO_BOOL_INT] = HAS_EXIT_FLAG | HAS_ESCAPES_FLAG, [_TO_BOOL_INT] = HAS_EXIT_FLAG | HAS_ESCAPES_FLAG,
[_TO_BOOL_LIST] = HAS_EXIT_FLAG, [_GUARD_NOS_LIST] = HAS_EXIT_FLAG,
[_GUARD_TOS_LIST] = HAS_EXIT_FLAG,
[_TO_BOOL_LIST] = 0,
[_TO_BOOL_NONE] = HAS_EXIT_FLAG, [_TO_BOOL_NONE] = HAS_EXIT_FLAG,
[_GUARD_NOS_UNICODE] = HAS_EXIT_FLAG, [_GUARD_NOS_UNICODE] = HAS_EXIT_FLAG,
[_GUARD_TOS_UNICODE] = HAS_EXIT_FLAG, [_GUARD_TOS_UNICODE] = HAS_EXIT_FLAG,
@ -97,15 +99,19 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_STORE_SLICE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_STORE_SLICE] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_BINARY_OP_SUBSCR_LIST_INT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, [_BINARY_OP_SUBSCR_LIST_INT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG,
[_BINARY_OP_SUBSCR_STR_INT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, [_BINARY_OP_SUBSCR_STR_INT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG,
[_GUARD_NOS_TUPLE] = HAS_EXIT_FLAG,
[_GUARD_TOS_TUPLE] = HAS_EXIT_FLAG,
[_BINARY_OP_SUBSCR_TUPLE_INT] = HAS_DEOPT_FLAG, [_BINARY_OP_SUBSCR_TUPLE_INT] = HAS_DEOPT_FLAG,
[_BINARY_OP_SUBSCR_DICT] = HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_GUARD_NOS_DICT] = HAS_EXIT_FLAG,
[_GUARD_TOS_DICT] = HAS_EXIT_FLAG,
[_BINARY_OP_SUBSCR_DICT] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_BINARY_OP_SUBSCR_CHECK_FUNC] = HAS_DEOPT_FLAG, [_BINARY_OP_SUBSCR_CHECK_FUNC] = HAS_DEOPT_FLAG,
[_BINARY_OP_SUBSCR_INIT_CALL] = 0, [_BINARY_OP_SUBSCR_INIT_CALL] = 0,
[_LIST_APPEND] = HAS_ARG_FLAG | HAS_ERROR_FLAG, [_LIST_APPEND] = HAS_ARG_FLAG | HAS_ERROR_FLAG,
[_SET_ADD] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_SET_ADD] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_STORE_SUBSCR] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_STORE_SUBSCR] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_STORE_SUBSCR_LIST_INT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG, [_STORE_SUBSCR_LIST_INT] = HAS_DEOPT_FLAG | HAS_ESCAPES_FLAG,
[_STORE_SUBSCR_DICT] = HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_STORE_SUBSCR_DICT] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_DELETE_SUBSCR] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_DELETE_SUBSCR] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CALL_INTRINSIC_1] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_CALL_INTRINSIC_1] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CALL_INTRINSIC_2] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_CALL_INTRINSIC_2] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
@ -177,8 +183,9 @@ const uint16_t _PyUop_Flags[MAX_UOP_ID+1] = {
[_COMPARE_OP_STR] = HAS_ARG_FLAG, [_COMPARE_OP_STR] = HAS_ARG_FLAG,
[_IS_OP] = HAS_ARG_FLAG, [_IS_OP] = HAS_ARG_FLAG,
[_CONTAINS_OP] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_CONTAINS_OP] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CONTAINS_OP_SET] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_GUARD_TOS_ANY_SET] = HAS_DEOPT_FLAG,
[_CONTAINS_OP_DICT] = HAS_ARG_FLAG | HAS_DEOPT_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_CONTAINS_OP_SET] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CONTAINS_OP_DICT] = HAS_ARG_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CHECK_EG_MATCH] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_CHECK_EG_MATCH] = HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
[_CHECK_EXC_MATCH] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG, [_CHECK_EXC_MATCH] = HAS_ERROR_FLAG | HAS_ERROR_NO_POP_FLAG | HAS_ESCAPES_FLAG,
[_IMPORT_NAME] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG, [_IMPORT_NAME] = HAS_ARG_FLAG | HAS_NAME_FLAG | HAS_ERROR_FLAG | HAS_ESCAPES_FLAG,
@ -411,14 +418,21 @@ const char *const _PyOpcode_uop_name[MAX_UOP_ID+1] = {
[_GUARD_IS_NOT_NONE_POP] = "_GUARD_IS_NOT_NONE_POP", [_GUARD_IS_NOT_NONE_POP] = "_GUARD_IS_NOT_NONE_POP",
[_GUARD_IS_TRUE_POP] = "_GUARD_IS_TRUE_POP", [_GUARD_IS_TRUE_POP] = "_GUARD_IS_TRUE_POP",
[_GUARD_KEYS_VERSION] = "_GUARD_KEYS_VERSION", [_GUARD_KEYS_VERSION] = "_GUARD_KEYS_VERSION",
[_GUARD_NOS_DICT] = "_GUARD_NOS_DICT",
[_GUARD_NOS_FLOAT] = "_GUARD_NOS_FLOAT", [_GUARD_NOS_FLOAT] = "_GUARD_NOS_FLOAT",
[_GUARD_NOS_INT] = "_GUARD_NOS_INT", [_GUARD_NOS_INT] = "_GUARD_NOS_INT",
[_GUARD_NOS_LIST] = "_GUARD_NOS_LIST",
[_GUARD_NOS_TUPLE] = "_GUARD_NOS_TUPLE",
[_GUARD_NOS_UNICODE] = "_GUARD_NOS_UNICODE", [_GUARD_NOS_UNICODE] = "_GUARD_NOS_UNICODE",
[_GUARD_NOT_EXHAUSTED_LIST] = "_GUARD_NOT_EXHAUSTED_LIST", [_GUARD_NOT_EXHAUSTED_LIST] = "_GUARD_NOT_EXHAUSTED_LIST",
[_GUARD_NOT_EXHAUSTED_RANGE] = "_GUARD_NOT_EXHAUSTED_RANGE", [_GUARD_NOT_EXHAUSTED_RANGE] = "_GUARD_NOT_EXHAUSTED_RANGE",
[_GUARD_NOT_EXHAUSTED_TUPLE] = "_GUARD_NOT_EXHAUSTED_TUPLE", [_GUARD_NOT_EXHAUSTED_TUPLE] = "_GUARD_NOT_EXHAUSTED_TUPLE",
[_GUARD_TOS_ANY_SET] = "_GUARD_TOS_ANY_SET",
[_GUARD_TOS_DICT] = "_GUARD_TOS_DICT",
[_GUARD_TOS_FLOAT] = "_GUARD_TOS_FLOAT", [_GUARD_TOS_FLOAT] = "_GUARD_TOS_FLOAT",
[_GUARD_TOS_INT] = "_GUARD_TOS_INT", [_GUARD_TOS_INT] = "_GUARD_TOS_INT",
[_GUARD_TOS_LIST] = "_GUARD_TOS_LIST",
[_GUARD_TOS_TUPLE] = "_GUARD_TOS_TUPLE",
[_GUARD_TOS_UNICODE] = "_GUARD_TOS_UNICODE", [_GUARD_TOS_UNICODE] = "_GUARD_TOS_UNICODE",
[_GUARD_TYPE_VERSION] = "_GUARD_TYPE_VERSION", [_GUARD_TYPE_VERSION] = "_GUARD_TYPE_VERSION",
[_GUARD_TYPE_VERSION_AND_LOCK] = "_GUARD_TYPE_VERSION_AND_LOCK", [_GUARD_TYPE_VERSION_AND_LOCK] = "_GUARD_TYPE_VERSION_AND_LOCK",
@ -682,6 +696,10 @@ int _PyUop_num_popped(int opcode, int oparg)
return 0; return 0;
case _TO_BOOL_INT: case _TO_BOOL_INT:
return 1; return 1;
case _GUARD_NOS_LIST:
return 0;
case _GUARD_TOS_LIST:
return 0;
case _TO_BOOL_LIST: case _TO_BOOL_LIST:
return 1; return 1;
case _TO_BOOL_NONE: case _TO_BOOL_NONE:
@ -732,8 +750,16 @@ int _PyUop_num_popped(int opcode, int oparg)
return 2; return 2;
case _BINARY_OP_SUBSCR_STR_INT: case _BINARY_OP_SUBSCR_STR_INT:
return 2; return 2;
case _GUARD_NOS_TUPLE:
return 0;
case _GUARD_TOS_TUPLE:
return 0;
case _BINARY_OP_SUBSCR_TUPLE_INT: case _BINARY_OP_SUBSCR_TUPLE_INT:
return 2; return 2;
case _GUARD_NOS_DICT:
return 0;
case _GUARD_TOS_DICT:
return 0;
case _BINARY_OP_SUBSCR_DICT: case _BINARY_OP_SUBSCR_DICT:
return 2; return 2;
case _BINARY_OP_SUBSCR_CHECK_FUNC: case _BINARY_OP_SUBSCR_CHECK_FUNC:
@ -892,6 +918,8 @@ int _PyUop_num_popped(int opcode, int oparg)
return 2; return 2;
case _CONTAINS_OP: case _CONTAINS_OP:
return 2; return 2;
case _GUARD_TOS_ANY_SET:
return 0;
case _CONTAINS_OP_SET: case _CONTAINS_OP_SET:
return 2; return 2;
case _CONTAINS_OP_DICT: case _CONTAINS_OP_DICT:

74
Lib/test/test_capi/test_opt.py
View file

@ -1673,6 +1673,80 @@ class TestUopsOptimization(unittest.TestCase):
self.assertIn("_TO_BOOL_STR", uops) self.assertIn("_TO_BOOL_STR", uops)
self.assertNotIn("_GUARD_TOS_UNICODE", uops) self.assertNotIn("_GUARD_TOS_UNICODE", uops)
def test_remove_guard_for_known_type_dict(self):
def f(n):
x = 0
for _ in range(n):
d = {}
d["Spam"] = 1 # Guarded...
x += d["Spam"] # ...unguarded!
return x
res, ex = self._run_with_optimizer(f, TIER2_THRESHOLD)
self.assertEqual(res, TIER2_THRESHOLD)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertEqual(uops.count("_GUARD_NOS_DICT"), 1)
self.assertEqual(uops.count("_STORE_SUBSCR_DICT"), 1)
self.assertEqual(uops.count("_BINARY_OP_SUBSCR_DICT"), 1)
def test_remove_guard_for_known_type_list(self):
def f(n):
x = 0
for _ in range(n):
l = [0]
l[0] = 1 # Guarded...
[a] = l # ...unguarded!
b = l[0] # ...unguarded!
if l: # ...unguarded!
x += a + b
return x
res, ex = self._run_with_optimizer(f, TIER2_THRESHOLD)
self.assertEqual(res, 2 * TIER2_THRESHOLD)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertEqual(uops.count("_GUARD_NOS_LIST"), 1)
self.assertEqual(uops.count("_STORE_SUBSCR_LIST_INT"), 1)
self.assertEqual(uops.count("_GUARD_TOS_LIST"), 0)
self.assertEqual(uops.count("_UNPACK_SEQUENCE_LIST"), 1)
self.assertEqual(uops.count("_BINARY_OP_SUBSCR_LIST_INT"), 1)
self.assertEqual(uops.count("_TO_BOOL_LIST"), 1)
def test_remove_guard_for_known_type_set(self):
def f(n):
x = 0
for _ in range(n):
x += "Spam" in {"Spam"} # Unguarded!
return x
res, ex = self._run_with_optimizer(f, TIER2_THRESHOLD)
self.assertEqual(res, TIER2_THRESHOLD)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertNotIn("_GUARD_TOS_ANY_SET", uops)
self.assertIn("_CONTAINS_OP_SET", uops)
def test_remove_guard_for_known_type_tuple(self):
def f(n):
x = 0
for _ in range(n):
t = (1, 2, (3, (4,)))
t_0, t_1, (t_2_0, t_2_1) = t # Unguarded!
t_2_1_0 = t_2_1[0] # Unguarded!
x += t_0 + t_1 + t_2_0 + t_2_1_0
return x
res, ex = self._run_with_optimizer(f, TIER2_THRESHOLD)
self.assertEqual(res, 10 * TIER2_THRESHOLD)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
self.assertNotIn("_GUARD_TOS_TUPLE", uops)
self.assertIn("_UNPACK_SEQUENCE_TUPLE", uops)
self.assertIn("_UNPACK_SEQUENCE_TWO_TUPLE", uops)
self.assertNotIn("_GUARD_NOS_TUPLE", uops)
self.assertIn("_BINARY_OP_SUBSCR_TUPLE_INT", uops)
def test_binary_subcsr_str_int_narrows_to_str(self): def test_binary_subcsr_str_int_narrows_to_str(self):
def testfunc(n): def testfunc(n):
x = [] x = []

2
Misc/NEWS.d/next/Core_and_Builtins/2025-04-08-09-20-18.gh-issue-131798.Xp1mvN.rst Normal file
View file

@ -0,0 +1,2 @@
Allow the JIT compiler to remove some type checks for operations on lists,
tuples, dictionaries, and sets.

109
Python/bytecodes.c
View file

@ -508,9 +508,21 @@ dummy_func(
} }
} }
inst(TO_BOOL_LIST, (unused/1, unused/2, value -- res)) { op(_GUARD_NOS_LIST, (nos, unused -- nos, unused)) {
PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
EXIT_IF(!PyList_CheckExact(o));
}
op(_GUARD_TOS_LIST, (tos -- tos)) {
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
EXIT_IF(!PyList_CheckExact(o));
}
macro(TO_BOOL_LIST) = _GUARD_TOS_LIST + unused/1 + unused/2 + _TO_BOOL_LIST;
op(_TO_BOOL_LIST, (value -- res)) {
PyObject *value_o = PyStackRef_AsPyObjectBorrow(value); PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
EXIT_IF(!PyList_CheckExact(value_o)); assert(PyList_CheckExact(value_o));
STAT_INC(TO_BOOL, hit); STAT_INC(TO_BOOL, hit);
res = PyList_GET_SIZE(value_o) ? PyStackRef_True : PyStackRef_False; res = PyList_GET_SIZE(value_o) ? PyStackRef_True : PyStackRef_False;
DECREF_INPUTS(); DECREF_INPUTS();
@ -524,8 +536,7 @@ dummy_func(
res = PyStackRef_False; res = PyStackRef_False;
} }
op(_GUARD_NOS_UNICODE, (nos, tos -- nos, tos)) { op(_GUARD_NOS_UNICODE, (nos, unused -- nos, unused)) {
(void)tos;
PyObject *o = PyStackRef_AsPyObjectBorrow(nos); PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
EXIT_IF(!PyUnicode_CheckExact(o)); EXIT_IF(!PyUnicode_CheckExact(o));
} }
@ -587,8 +598,7 @@ dummy_func(
BINARY_OP_EXTEND, BINARY_OP_EXTEND,
}; };
op(_GUARD_NOS_INT, (left, right -- left, right)) { op(_GUARD_NOS_INT, (left, unused -- left, unused)) {
(void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
EXIT_IF(!PyLong_CheckExact(left_o)); EXIT_IF(!PyLong_CheckExact(left_o));
} }
@ -650,8 +660,7 @@ dummy_func(
macro(BINARY_OP_SUBTRACT_INT) = macro(BINARY_OP_SUBTRACT_INT) =
_GUARD_TOS_INT + _GUARD_NOS_INT + unused/5 + _BINARY_OP_SUBTRACT_INT; _GUARD_TOS_INT + _GUARD_NOS_INT + unused/5 + _BINARY_OP_SUBTRACT_INT;
op(_GUARD_NOS_FLOAT, (left, right -- left, right)) { op(_GUARD_NOS_FLOAT, (left, unused -- left, unused)) {
(void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
EXIT_IF(!PyFloat_CheckExact(left_o)); EXIT_IF(!PyFloat_CheckExact(left_o));
} }
@ -862,14 +871,14 @@ dummy_func(
macro(STORE_SLICE) = _SPECIALIZE_STORE_SLICE + _STORE_SLICE; macro(STORE_SLICE) = _SPECIALIZE_STORE_SLICE + _STORE_SLICE;
macro(BINARY_OP_SUBSCR_LIST_INT) = macro(BINARY_OP_SUBSCR_LIST_INT) =
_GUARD_TOS_INT + unused/5 + _BINARY_OP_SUBSCR_LIST_INT; _GUARD_TOS_INT + _GUARD_NOS_LIST + unused/5 + _BINARY_OP_SUBSCR_LIST_INT;
op(_BINARY_OP_SUBSCR_LIST_INT, (list_st, sub_st -- res)) { op(_BINARY_OP_SUBSCR_LIST_INT, (list_st, sub_st -- res)) {
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st); PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
assert(PyLong_CheckExact(sub)); assert(PyLong_CheckExact(sub));
DEOPT_IF(!PyList_CheckExact(list)); assert(PyList_CheckExact(list));
// Deopt unless 0 <= sub < PyList_Size(list) // Deopt unless 0 <= sub < PyList_Size(list)
DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub));
@ -913,15 +922,25 @@ dummy_func(
res = PyStackRef_FromPyObjectImmortal(res_o); res = PyStackRef_FromPyObjectImmortal(res_o);
} }
op(_GUARD_NOS_TUPLE, (nos, unused -- nos, unused)) {
PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
EXIT_IF(!PyTuple_CheckExact(o));
}
op(_GUARD_TOS_TUPLE, (tos -- tos)) {
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
EXIT_IF(!PyTuple_CheckExact(o));
}
macro(BINARY_OP_SUBSCR_TUPLE_INT) = macro(BINARY_OP_SUBSCR_TUPLE_INT) =
_GUARD_TOS_INT + unused/5 + _BINARY_OP_SUBSCR_TUPLE_INT; _GUARD_TOS_INT + _GUARD_NOS_TUPLE + unused/5 + _BINARY_OP_SUBSCR_TUPLE_INT;
op(_BINARY_OP_SUBSCR_TUPLE_INT, (tuple_st, sub_st -- res)) { op(_BINARY_OP_SUBSCR_TUPLE_INT, (tuple_st, sub_st -- res)) {
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st); PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st);
assert(PyLong_CheckExact(sub)); assert(PyLong_CheckExact(sub));
DEOPT_IF(!PyTuple_CheckExact(tuple)); assert(PyTuple_CheckExact(tuple));
// Deopt unless 0 <= sub < PyTuple_Size(list) // Deopt unless 0 <= sub < PyTuple_Size(list)
DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub));
@ -935,11 +954,24 @@ dummy_func(
DECREF_INPUTS(); DECREF_INPUTS();
} }
inst(BINARY_OP_SUBSCR_DICT, (unused/5, dict_st, sub_st -- res)) { op(_GUARD_NOS_DICT, (nos, unused -- nos, unused)) {
PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
EXIT_IF(!PyDict_CheckExact(o));
}
op(_GUARD_TOS_DICT, (tos -- tos)) {
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
EXIT_IF(!PyDict_CheckExact(o));
}
macro(BINARY_OP_SUBSCR_DICT) =
_GUARD_NOS_DICT + unused/5 + _BINARY_OP_SUBSCR_DICT;
op(_BINARY_OP_SUBSCR_DICT, (dict_st, sub_st -- res)) {
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st); PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st);
DEOPT_IF(!PyDict_CheckExact(dict)); assert(PyDict_CheckExact(dict));
STAT_INC(BINARY_OP, hit); STAT_INC(BINARY_OP, hit);
PyObject *res_o; PyObject *res_o;
int rc = PyDict_GetItemRef(dict, sub, &res_o); int rc = PyDict_GetItemRef(dict, sub, &res_o);
@ -1021,14 +1053,14 @@ dummy_func(
macro(STORE_SUBSCR) = _SPECIALIZE_STORE_SUBSCR + _STORE_SUBSCR; macro(STORE_SUBSCR) = _SPECIALIZE_STORE_SUBSCR + _STORE_SUBSCR;
macro(STORE_SUBSCR_LIST_INT) = macro(STORE_SUBSCR_LIST_INT) =
_GUARD_TOS_INT + unused/1 + _STORE_SUBSCR_LIST_INT; _GUARD_TOS_INT + _GUARD_NOS_LIST + unused/1 + _STORE_SUBSCR_LIST_INT;
op(_STORE_SUBSCR_LIST_INT, (value, list_st, sub_st -- )) { op(_STORE_SUBSCR_LIST_INT, (value, list_st, sub_st -- )) {
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st); PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
assert(PyLong_CheckExact(sub)); assert(PyLong_CheckExact(sub));
DEOPT_IF(!PyList_CheckExact(list)); assert(PyList_CheckExact(list));
// Ensure nonnegative, zero-or-one-digit ints. // Ensure nonnegative, zero-or-one-digit ints.
DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)); DEOPT_IF(!_PyLong_IsNonNegativeCompact((PyLongObject *)sub));
@ -1052,10 +1084,13 @@ dummy_func(
Py_DECREF(old_value); Py_DECREF(old_value);
} }
inst(STORE_SUBSCR_DICT, (unused/1, value, dict_st, sub -- )) { macro(STORE_SUBSCR_DICT) =
_GUARD_NOS_DICT + unused/1 + _STORE_SUBSCR_DICT;
op(_STORE_SUBSCR_DICT, (value, dict_st, sub -- )) {
PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st); PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st);
DEOPT_IF(!PyDict_CheckExact(dict)); assert(PyDict_CheckExact(dict));
STAT_INC(STORE_SUBSCR, hit); STAT_INC(STORE_SUBSCR, hit);
int err = _PyDict_SetItem_Take2((PyDictObject *)dict, int err = _PyDict_SetItem_Take2((PyDictObject *)dict,
PyStackRef_AsPyObjectSteal(sub), PyStackRef_AsPyObjectSteal(sub),
@ -1502,10 +1537,13 @@ dummy_func(
macro(UNPACK_SEQUENCE) = _SPECIALIZE_UNPACK_SEQUENCE + _UNPACK_SEQUENCE; macro(UNPACK_SEQUENCE) = _SPECIALIZE_UNPACK_SEQUENCE + _UNPACK_SEQUENCE;
inst(UNPACK_SEQUENCE_TWO_TUPLE, (unused/1, seq -- val1, val0)) { macro(UNPACK_SEQUENCE_TWO_TUPLE) =
_GUARD_TOS_TUPLE + unused/1 + _UNPACK_SEQUENCE_TWO_TUPLE;
op(_UNPACK_SEQUENCE_TWO_TUPLE, (seq -- val1, val0)) {
assert(oparg == 2); assert(oparg == 2);
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq); PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
DEOPT_IF(!PyTuple_CheckExact(seq_o)); assert(PyTuple_CheckExact(seq_o));
DEOPT_IF(PyTuple_GET_SIZE(seq_o) != 2); DEOPT_IF(PyTuple_GET_SIZE(seq_o) != 2);
STAT_INC(UNPACK_SEQUENCE, hit); STAT_INC(UNPACK_SEQUENCE, hit);
val0 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 0)); val0 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 0));
@ -1513,9 +1551,12 @@ dummy_func(
PyStackRef_CLOSE(seq); PyStackRef_CLOSE(seq);
} }
inst(UNPACK_SEQUENCE_TUPLE, (unused/1, seq -- values[oparg])) { macro(UNPACK_SEQUENCE_TUPLE) =
_GUARD_TOS_TUPLE + unused/1 + _UNPACK_SEQUENCE_TUPLE;
op(_UNPACK_SEQUENCE_TUPLE, (seq -- values[oparg])) {
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq); PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
DEOPT_IF(!PyTuple_CheckExact(seq_o)); assert(PyTuple_CheckExact(seq_o));
DEOPT_IF(PyTuple_GET_SIZE(seq_o) != oparg); DEOPT_IF(PyTuple_GET_SIZE(seq_o) != oparg);
STAT_INC(UNPACK_SEQUENCE, hit); STAT_INC(UNPACK_SEQUENCE, hit);
PyObject **items = _PyTuple_ITEMS(seq_o); PyObject **items = _PyTuple_ITEMS(seq_o);
@ -1525,9 +1566,12 @@ dummy_func(
DECREF_INPUTS(); DECREF_INPUTS();
} }
inst(UNPACK_SEQUENCE_LIST, (unused/1, seq -- values[oparg])) { macro(UNPACK_SEQUENCE_LIST) =
_GUARD_TOS_LIST + unused/1 + _UNPACK_SEQUENCE_LIST;
op(_UNPACK_SEQUENCE_LIST, (seq -- values[oparg])) {
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq); PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
DEOPT_IF(!PyList_CheckExact(seq_o)); assert(PyList_CheckExact(seq_o));
DEOPT_IF(!LOCK_OBJECT(seq_o)); DEOPT_IF(!LOCK_OBJECT(seq_o));
if (PyList_GET_SIZE(seq_o) != oparg) { if (PyList_GET_SIZE(seq_o) != oparg) {
UNLOCK_OBJECT(seq_o); UNLOCK_OBJECT(seq_o);
@ -2686,11 +2730,18 @@ dummy_func(
macro(CONTAINS_OP) = _SPECIALIZE_CONTAINS_OP + _CONTAINS_OP; macro(CONTAINS_OP) = _SPECIALIZE_CONTAINS_OP + _CONTAINS_OP;
inst(CONTAINS_OP_SET, (unused/1, left, right -- b)) { op(_GUARD_TOS_ANY_SET, (tos -- tos)) {
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
DEOPT_IF(!PyAnySet_CheckExact(o));
}
macro(CONTAINS_OP_SET) = _GUARD_TOS_ANY_SET + unused/1 + _CONTAINS_OP_SET;
op(_CONTAINS_OP_SET, (left, right -- b)) {
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
DEOPT_IF(!(PySet_CheckExact(right_o) || PyFrozenSet_CheckExact(right_o))); assert(PyAnySet_CheckExact(right_o));
STAT_INC(CONTAINS_OP, hit); STAT_INC(CONTAINS_OP, hit);
// Note: both set and frozenset use the same seq_contains method! // Note: both set and frozenset use the same seq_contains method!
int res = _PySet_Contains((PySetObject *)right_o, left_o); int res = _PySet_Contains((PySetObject *)right_o, left_o);
@ -2699,11 +2750,13 @@ dummy_func(
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False; b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
} }
inst(CONTAINS_OP_DICT, (unused/1, left, right -- b)) { macro(CONTAINS_OP_DICT) = _GUARD_TOS_DICT + unused/1 + _CONTAINS_OP_DICT;
op(_CONTAINS_OP_DICT, (left, right -- b)) {
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
DEOPT_IF(!PyDict_CheckExact(right_o)); assert(PyDict_CheckExact(right_o));
STAT_INC(CONTAINS_OP, hit); STAT_INC(CONTAINS_OP, hit);
int res = PyDict_Contains(right_o, left_o); int res = PyDict_Contains(right_o, left_o);
DECREF_INPUTS(); DECREF_INPUTS();

141
Python/executor_cases.c.h generated
View file

@ -719,15 +719,34 @@
break; break;
} }
case _GUARD_NOS_LIST: {
_PyStackRef nos;
nos = stack_pointer[-2];
PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
if (!PyList_CheckExact(o)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
break;
}
case _GUARD_TOS_LIST: {
_PyStackRef tos;
tos = stack_pointer[-1];
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
if (!PyList_CheckExact(o)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
break;
}
case _TO_BOOL_LIST: { case _TO_BOOL_LIST: {
_PyStackRef value; _PyStackRef value;
_PyStackRef res; _PyStackRef res;
value = stack_pointer[-1]; value = stack_pointer[-1];
PyObject *value_o = PyStackRef_AsPyObjectBorrow(value); PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
if (!PyList_CheckExact(value_o)) { assert(PyList_CheckExact(value_o));
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
STAT_INC(TO_BOOL, hit); STAT_INC(TO_BOOL, hit);
res = PyList_GET_SIZE(value_o) ? PyStackRef_True : PyStackRef_False; res = PyList_GET_SIZE(value_o) ? PyStackRef_True : PyStackRef_False;
_PyFrame_SetStackPointer(frame, stack_pointer); _PyFrame_SetStackPointer(frame, stack_pointer);
@ -754,11 +773,8 @@
} }
case _GUARD_NOS_UNICODE: { case _GUARD_NOS_UNICODE: {
_PyStackRef tos;
_PyStackRef nos; _PyStackRef nos;
tos = stack_pointer[-1];
nos = stack_pointer[-2]; nos = stack_pointer[-2];
(void)tos;
PyObject *o = PyStackRef_AsPyObjectBorrow(nos); PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
if (!PyUnicode_CheckExact(o)) { if (!PyUnicode_CheckExact(o)) {
UOP_STAT_INC(uopcode, miss); UOP_STAT_INC(uopcode, miss);
@ -841,11 +857,8 @@
} }
case _GUARD_NOS_INT: { case _GUARD_NOS_INT: {
_PyStackRef right;
_PyStackRef left; _PyStackRef left;
right = stack_pointer[-1];
left = stack_pointer[-2]; left = stack_pointer[-2];
(void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
if (!PyLong_CheckExact(left_o)) { if (!PyLong_CheckExact(left_o)) {
UOP_STAT_INC(uopcode, miss); UOP_STAT_INC(uopcode, miss);
@ -950,11 +963,8 @@
} }
case _GUARD_NOS_FLOAT: { case _GUARD_NOS_FLOAT: {
_PyStackRef right;
_PyStackRef left; _PyStackRef left;
right = stack_pointer[-1];
left = stack_pointer[-2]; left = stack_pointer[-2];
(void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
if (!PyFloat_CheckExact(left_o)) { if (!PyFloat_CheckExact(left_o)) {
UOP_STAT_INC(uopcode, miss); UOP_STAT_INC(uopcode, miss);
@ -1273,10 +1283,7 @@
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st); PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
assert(PyLong_CheckExact(sub)); assert(PyLong_CheckExact(sub));
if (!PyList_CheckExact(list)) { assert(PyList_CheckExact(list));
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
UOP_STAT_INC(uopcode, miss); UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET(); JUMP_TO_JUMP_TARGET();
@ -1357,6 +1364,28 @@
break; break;
} }
case _GUARD_NOS_TUPLE: {
_PyStackRef nos;
nos = stack_pointer[-2];
PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
if (!PyTuple_CheckExact(o)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
break;
}
case _GUARD_TOS_TUPLE: {
_PyStackRef tos;
tos = stack_pointer[-1];
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
if (!PyTuple_CheckExact(o)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
break;
}
case _BINARY_OP_SUBSCR_TUPLE_INT: { case _BINARY_OP_SUBSCR_TUPLE_INT: {
_PyStackRef sub_st; _PyStackRef sub_st;
_PyStackRef tuple_st; _PyStackRef tuple_st;
@ -1366,10 +1395,7 @@
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st); PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st);
assert(PyLong_CheckExact(sub)); assert(PyLong_CheckExact(sub));
if (!PyTuple_CheckExact(tuple)) { assert(PyTuple_CheckExact(tuple));
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
UOP_STAT_INC(uopcode, miss); UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET(); JUMP_TO_JUMP_TARGET();
@ -1395,6 +1421,28 @@
break; break;
} }
case _GUARD_NOS_DICT: {
_PyStackRef nos;
nos = stack_pointer[-2];
PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
if (!PyDict_CheckExact(o)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
break;
}
case _GUARD_TOS_DICT: {
_PyStackRef tos;
tos = stack_pointer[-1];
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
if (!PyDict_CheckExact(o)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
break;
}
case _BINARY_OP_SUBSCR_DICT: { case _BINARY_OP_SUBSCR_DICT: {
_PyStackRef sub_st; _PyStackRef sub_st;
_PyStackRef dict_st; _PyStackRef dict_st;
@ -1403,10 +1451,7 @@
dict_st = stack_pointer[-2]; dict_st = stack_pointer[-2];
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st); PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st);
if (!PyDict_CheckExact(dict)) { assert(PyDict_CheckExact(dict));
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
STAT_INC(BINARY_OP, hit); STAT_INC(BINARY_OP, hit);
PyObject *res_o; PyObject *res_o;
_PyFrame_SetStackPointer(frame, stack_pointer); _PyFrame_SetStackPointer(frame, stack_pointer);
@ -1570,10 +1615,7 @@
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st); PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
assert(PyLong_CheckExact(sub)); assert(PyLong_CheckExact(sub));
if (!PyList_CheckExact(list)) { assert(PyList_CheckExact(list));
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
UOP_STAT_INC(uopcode, miss); UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET(); JUMP_TO_JUMP_TARGET();
@ -1614,10 +1656,7 @@
dict_st = stack_pointer[-2]; dict_st = stack_pointer[-2];
value = stack_pointer[-3]; value = stack_pointer[-3];
PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st); PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st);
if (!PyDict_CheckExact(dict)) { assert(PyDict_CheckExact(dict));
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
STAT_INC(STORE_SUBSCR, hit); STAT_INC(STORE_SUBSCR, hit);
_PyFrame_SetStackPointer(frame, stack_pointer); _PyFrame_SetStackPointer(frame, stack_pointer);
int err = _PyDict_SetItem_Take2((PyDictObject *)dict, int err = _PyDict_SetItem_Take2((PyDictObject *)dict,
@ -2049,10 +2088,7 @@
seq = stack_pointer[-1]; seq = stack_pointer[-1];
assert(oparg == 2); assert(oparg == 2);
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq); PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
if (!PyTuple_CheckExact(seq_o)) { assert(PyTuple_CheckExact(seq_o));
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
if (PyTuple_GET_SIZE(seq_o) != 2) { if (PyTuple_GET_SIZE(seq_o) != 2) {
UOP_STAT_INC(uopcode, miss); UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET(); JUMP_TO_JUMP_TARGET();
@ -2077,10 +2113,7 @@
seq = stack_pointer[-1]; seq = stack_pointer[-1];
values = &stack_pointer[-1]; values = &stack_pointer[-1];
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq); PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
if (!PyTuple_CheckExact(seq_o)) { assert(PyTuple_CheckExact(seq_o));
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
if (PyTuple_GET_SIZE(seq_o) != oparg) { if (PyTuple_GET_SIZE(seq_o) != oparg) {
UOP_STAT_INC(uopcode, miss); UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET(); JUMP_TO_JUMP_TARGET();
@ -2105,10 +2138,7 @@
seq = stack_pointer[-1]; seq = stack_pointer[-1];
values = &stack_pointer[-1]; values = &stack_pointer[-1];
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq); PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
if (!PyList_CheckExact(seq_o)) { assert(PyList_CheckExact(seq_o));
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
if (!LOCK_OBJECT(seq_o)) { if (!LOCK_OBJECT(seq_o)) {
UOP_STAT_INC(uopcode, miss); UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET(); JUMP_TO_JUMP_TARGET();
@ -3682,6 +3712,17 @@
break; break;
} }
case _GUARD_TOS_ANY_SET: {
_PyStackRef tos;
tos = stack_pointer[-1];
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
if (!PyAnySet_CheckExact(o)) {
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
break;
}
case _CONTAINS_OP_SET: { case _CONTAINS_OP_SET: {
_PyStackRef right; _PyStackRef right;
_PyStackRef left; _PyStackRef left;
@ -3691,10 +3732,7 @@
left = stack_pointer[-2]; left = stack_pointer[-2];
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
if (!(PySet_CheckExact(right_o) || PyFrozenSet_CheckExact(right_o))) { assert(PyAnySet_CheckExact(right_o));
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
STAT_INC(CONTAINS_OP, hit); STAT_INC(CONTAINS_OP, hit);
_PyFrame_SetStackPointer(frame, stack_pointer); _PyFrame_SetStackPointer(frame, stack_pointer);
int res = _PySet_Contains((PySetObject *)right_o, left_o); int res = _PySet_Contains((PySetObject *)right_o, left_o);
@ -3728,10 +3766,7 @@
left = stack_pointer[-2]; left = stack_pointer[-2];
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
if (!PyDict_CheckExact(right_o)) { assert(PyDict_CheckExact(right_o));
UOP_STAT_INC(uopcode, miss);
JUMP_TO_JUMP_TARGET();
}
STAT_INC(CONTAINS_OP, hit); STAT_INC(CONTAINS_OP, hit);
_PyFrame_SetStackPointer(frame, stack_pointer); _PyFrame_SetStackPointer(frame, stack_pointer);
int res = PyDict_Contains(right_o, left_o); int res = PyDict_Contains(right_o, left_o);

577
Python/generated_cases.c.h generated
View file

@ -108,9 +108,7 @@
} }
// _GUARD_NOS_FLOAT // _GUARD_NOS_FLOAT
{ {
right = value;
left = stack_pointer[-2]; left = stack_pointer[-2];
(void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
if (!PyFloat_CheckExact(left_o)) { if (!PyFloat_CheckExact(left_o)) {
UPDATE_MISS_STATS(BINARY_OP); UPDATE_MISS_STATS(BINARY_OP);
@ -121,6 +119,7 @@
/* Skip 5 cache entries */ /* Skip 5 cache entries */
// _BINARY_OP_ADD_FLOAT // _BINARY_OP_ADD_FLOAT
{ {
right = value;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
assert(PyFloat_CheckExact(left_o)); assert(PyFloat_CheckExact(left_o));
@ -167,9 +166,7 @@
} }
// _GUARD_NOS_INT // _GUARD_NOS_INT
{ {
right = value;
left = stack_pointer[-2]; left = stack_pointer[-2];
(void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
if (!PyLong_CheckExact(left_o)) { if (!PyLong_CheckExact(left_o)) {
UPDATE_MISS_STATS(BINARY_OP); UPDATE_MISS_STATS(BINARY_OP);
@ -180,6 +177,7 @@
/* Skip 5 cache entries */ /* Skip 5 cache entries */
// _BINARY_OP_ADD_INT // _BINARY_OP_ADD_INT
{ {
right = value;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
assert(PyLong_CheckExact(left_o)); assert(PyLong_CheckExact(left_o));
@ -214,7 +212,6 @@
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size");
_PyStackRef value; _PyStackRef value;
_PyStackRef nos; _PyStackRef nos;
_PyStackRef tos;
_PyStackRef left; _PyStackRef left;
_PyStackRef right; _PyStackRef right;
_PyStackRef res; _PyStackRef res;
@ -230,9 +227,7 @@
} }
// _GUARD_NOS_UNICODE // _GUARD_NOS_UNICODE
{ {
tos = value;
nos = stack_pointer[-2]; nos = stack_pointer[-2];
(void)tos;
PyObject *o = PyStackRef_AsPyObjectBorrow(nos); PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
if (!PyUnicode_CheckExact(o)) { if (!PyUnicode_CheckExact(o)) {
UPDATE_MISS_STATS(BINARY_OP); UPDATE_MISS_STATS(BINARY_OP);
@ -243,7 +238,7 @@
/* Skip 5 cache entries */ /* Skip 5 cache entries */
// _BINARY_OP_ADD_UNICODE // _BINARY_OP_ADD_UNICODE
{ {
right = tos; right = value;
left = nos; left = nos;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
@ -341,7 +336,6 @@
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size");
_PyStackRef value; _PyStackRef value;
_PyStackRef nos; _PyStackRef nos;
_PyStackRef tos;
_PyStackRef left; _PyStackRef left;
_PyStackRef right; _PyStackRef right;
// _GUARD_TOS_UNICODE // _GUARD_TOS_UNICODE
@ -356,9 +350,7 @@
} }
// _GUARD_NOS_UNICODE // _GUARD_NOS_UNICODE
{ {
tos = value;
nos = stack_pointer[-2]; nos = stack_pointer[-2];
(void)tos;
PyObject *o = PyStackRef_AsPyObjectBorrow(nos); PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
if (!PyUnicode_CheckExact(o)) { if (!PyUnicode_CheckExact(o)) {
UPDATE_MISS_STATS(BINARY_OP); UPDATE_MISS_STATS(BINARY_OP);
@ -369,7 +361,7 @@
/* Skip 5 cache entries */ /* Skip 5 cache entries */
// _BINARY_OP_INPLACE_ADD_UNICODE // _BINARY_OP_INPLACE_ADD_UNICODE
{ {
right = tos; right = value;
left = nos; left = nos;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
assert(PyUnicode_CheckExact(left_o)); assert(PyUnicode_CheckExact(left_o));
@ -441,9 +433,7 @@
} }
// _GUARD_NOS_FLOAT // _GUARD_NOS_FLOAT
{ {
right = value;
left = stack_pointer[-2]; left = stack_pointer[-2];
(void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
if (!PyFloat_CheckExact(left_o)) { if (!PyFloat_CheckExact(left_o)) {
UPDATE_MISS_STATS(BINARY_OP); UPDATE_MISS_STATS(BINARY_OP);
@ -454,6 +444,7 @@
/* Skip 5 cache entries */ /* Skip 5 cache entries */
// _BINARY_OP_MULTIPLY_FLOAT // _BINARY_OP_MULTIPLY_FLOAT
{ {
right = value;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
assert(PyFloat_CheckExact(left_o)); assert(PyFloat_CheckExact(left_o));
@ -500,9 +491,7 @@
} }
// _GUARD_NOS_INT // _GUARD_NOS_INT
{ {
right = value;
left = stack_pointer[-2]; left = stack_pointer[-2];
(void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
if (!PyLong_CheckExact(left_o)) { if (!PyLong_CheckExact(left_o)) {
UPDATE_MISS_STATS(BINARY_OP); UPDATE_MISS_STATS(BINARY_OP);
@ -513,6 +502,7 @@
/* Skip 5 cache entries */ /* Skip 5 cache entries */
// _BINARY_OP_MULTIPLY_INT // _BINARY_OP_MULTIPLY_INT
{ {
right = value;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
assert(PyLong_CheckExact(left_o)); assert(PyLong_CheckExact(left_o));
@ -545,45 +535,55 @@
next_instr += 6; next_instr += 6;
INSTRUCTION_STATS(BINARY_OP_SUBSCR_DICT); INSTRUCTION_STATS(BINARY_OP_SUBSCR_DICT);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size");
_PyStackRef nos;
_PyStackRef dict_st; _PyStackRef dict_st;
_PyStackRef sub_st; _PyStackRef sub_st;
_PyStackRef res; _PyStackRef res;
// _GUARD_NOS_DICT
{
nos = stack_pointer[-2];
PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
if (!PyDict_CheckExact(o)) {
UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP);
}
}
/* Skip 5 cache entries */ /* Skip 5 cache entries */
sub_st = stack_pointer[-1]; // _BINARY_OP_SUBSCR_DICT
dict_st = stack_pointer[-2]; {
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); sub_st = stack_pointer[-1];
PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st); dict_st = nos;
if (!PyDict_CheckExact(dict)) { PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
UPDATE_MISS_STATS(BINARY_OP); PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); assert(PyDict_CheckExact(dict));
JUMP_TO_PREDICTED(BINARY_OP); STAT_INC(BINARY_OP, hit);
} PyObject *res_o;
STAT_INC(BINARY_OP, hit);
PyObject *res_o;
_PyFrame_SetStackPointer(frame, stack_pointer);
int rc = PyDict_GetItemRef(dict, sub, &res_o);
stack_pointer = _PyFrame_GetStackPointer(frame);
if (rc == 0) {
_PyFrame_SetStackPointer(frame, stack_pointer); _PyFrame_SetStackPointer(frame, stack_pointer);
_PyErr_SetKeyError(sub); int rc = PyDict_GetItemRef(dict, sub, &res_o);
stack_pointer = _PyFrame_GetStackPointer(frame); stack_pointer = _PyFrame_GetStackPointer(frame);
if (rc == 0) {
_PyFrame_SetStackPointer(frame, stack_pointer);
_PyErr_SetKeyError(sub);
stack_pointer = _PyFrame_GetStackPointer(frame);
}
_PyFrame_SetStackPointer(frame, stack_pointer);
_PyStackRef tmp = sub_st;
sub_st = PyStackRef_NULL;
stack_pointer[-1] = sub_st;
PyStackRef_CLOSE(tmp);
tmp = dict_st;
dict_st = PyStackRef_NULL;
stack_pointer[-2] = dict_st;
PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -2;
assert(WITHIN_STACK_BOUNDS());
if (rc <= 0) {
JUMP_TO_LABEL(error);
}
res = PyStackRef_FromPyObjectSteal(res_o);
} }
_PyFrame_SetStackPointer(frame, stack_pointer);
_PyStackRef tmp = sub_st;
sub_st = PyStackRef_NULL;
stack_pointer[-1] = sub_st;
PyStackRef_CLOSE(tmp);
tmp = dict_st;
dict_st = PyStackRef_NULL;
stack_pointer[-2] = dict_st;
PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -2;
assert(WITHIN_STACK_BOUNDS());
if (rc <= 0) {
JUMP_TO_LABEL(error);
}
res = PyStackRef_FromPyObjectSteal(res_o);
stack_pointer[0] = res; stack_pointer[0] = res;
stack_pointer += 1; stack_pointer += 1;
assert(WITHIN_STACK_BOUNDS()); assert(WITHIN_STACK_BOUNDS());
@ -685,6 +685,7 @@
INSTRUCTION_STATS(BINARY_OP_SUBSCR_LIST_INT); INSTRUCTION_STATS(BINARY_OP_SUBSCR_LIST_INT);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size");
_PyStackRef value; _PyStackRef value;
_PyStackRef nos;
_PyStackRef list_st; _PyStackRef list_st;
_PyStackRef sub_st; _PyStackRef sub_st;
_PyStackRef res; _PyStackRef res;
@ -698,19 +699,25 @@
JUMP_TO_PREDICTED(BINARY_OP); JUMP_TO_PREDICTED(BINARY_OP);
} }
} }
/* Skip 5 cache entries */ // _GUARD_NOS_LIST
// _BINARY_OP_SUBSCR_LIST_INT
{ {
sub_st = value; nos = stack_pointer[-2];
list_st = stack_pointer[-2]; PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); if (!PyList_CheckExact(o)) {
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
assert(PyLong_CheckExact(sub));
if (!PyList_CheckExact(list)) {
UPDATE_MISS_STATS(BINARY_OP); UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP); JUMP_TO_PREDICTED(BINARY_OP);
} }
}
/* Skip 5 cache entries */
// _BINARY_OP_SUBSCR_LIST_INT
{
sub_st = value;
list_st = nos;
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
assert(PyLong_CheckExact(sub));
assert(PyList_CheckExact(list));
if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
UPDATE_MISS_STATS(BINARY_OP); UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
@ -769,7 +776,6 @@
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size");
_PyStackRef value; _PyStackRef value;
_PyStackRef nos; _PyStackRef nos;
_PyStackRef tos;
_PyStackRef str_st; _PyStackRef str_st;
_PyStackRef sub_st; _PyStackRef sub_st;
_PyStackRef res; _PyStackRef res;
@ -785,9 +791,7 @@
} }
// _GUARD_NOS_UNICODE // _GUARD_NOS_UNICODE
{ {
tos = value;
nos = stack_pointer[-2]; nos = stack_pointer[-2];
(void)tos;
PyObject *o = PyStackRef_AsPyObjectBorrow(nos); PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
if (!PyUnicode_CheckExact(o)) { if (!PyUnicode_CheckExact(o)) {
UPDATE_MISS_STATS(BINARY_OP); UPDATE_MISS_STATS(BINARY_OP);
@ -798,7 +802,7 @@
/* Skip 5 cache entries */ /* Skip 5 cache entries */
// _BINARY_OP_SUBSCR_STR_INT // _BINARY_OP_SUBSCR_STR_INT
{ {
sub_st = tos; sub_st = value;
str_st = nos; str_st = nos;
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *str = PyStackRef_AsPyObjectBorrow(str_st); PyObject *str = PyStackRef_AsPyObjectBorrow(str_st);
@ -849,6 +853,7 @@
INSTRUCTION_STATS(BINARY_OP_SUBSCR_TUPLE_INT); INSTRUCTION_STATS(BINARY_OP_SUBSCR_TUPLE_INT);
static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_BINARY_OP == 5, "incorrect cache size");
_PyStackRef value; _PyStackRef value;
_PyStackRef nos;
_PyStackRef tuple_st; _PyStackRef tuple_st;
_PyStackRef sub_st; _PyStackRef sub_st;
_PyStackRef res; _PyStackRef res;
@ -862,19 +867,25 @@
JUMP_TO_PREDICTED(BINARY_OP); JUMP_TO_PREDICTED(BINARY_OP);
} }
} }
/* Skip 5 cache entries */ // _GUARD_NOS_TUPLE
// _BINARY_OP_SUBSCR_TUPLE_INT
{ {
sub_st = value; nos = stack_pointer[-2];
tuple_st = stack_pointer[-2]; PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); if (!PyTuple_CheckExact(o)) {
PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st);
assert(PyLong_CheckExact(sub));
if (!PyTuple_CheckExact(tuple)) {
UPDATE_MISS_STATS(BINARY_OP); UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
JUMP_TO_PREDICTED(BINARY_OP); JUMP_TO_PREDICTED(BINARY_OP);
} }
}
/* Skip 5 cache entries */
// _BINARY_OP_SUBSCR_TUPLE_INT
{
sub_st = value;
tuple_st = nos;
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *tuple = PyStackRef_AsPyObjectBorrow(tuple_st);
assert(PyLong_CheckExact(sub));
assert(PyTuple_CheckExact(tuple));
if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
UPDATE_MISS_STATS(BINARY_OP); UPDATE_MISS_STATS(BINARY_OP);
assert(_PyOpcode_Deopt[opcode] == (BINARY_OP)); assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
@ -930,9 +941,7 @@
} }
// _GUARD_NOS_FLOAT // _GUARD_NOS_FLOAT
{ {
right = value;
left = stack_pointer[-2]; left = stack_pointer[-2];
(void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
if (!PyFloat_CheckExact(left_o)) { if (!PyFloat_CheckExact(left_o)) {
UPDATE_MISS_STATS(BINARY_OP); UPDATE_MISS_STATS(BINARY_OP);
@ -943,6 +952,7 @@
/* Skip 5 cache entries */ /* Skip 5 cache entries */
// _BINARY_OP_SUBTRACT_FLOAT // _BINARY_OP_SUBTRACT_FLOAT
{ {
right = value;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
assert(PyFloat_CheckExact(left_o)); assert(PyFloat_CheckExact(left_o));
@ -989,9 +999,7 @@
} }
// _GUARD_NOS_INT // _GUARD_NOS_INT
{ {
right = value;
left = stack_pointer[-2]; left = stack_pointer[-2];
(void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
if (!PyLong_CheckExact(left_o)) { if (!PyLong_CheckExact(left_o)) {
UPDATE_MISS_STATS(BINARY_OP); UPDATE_MISS_STATS(BINARY_OP);
@ -1002,6 +1010,7 @@
/* Skip 5 cache entries */ /* Skip 5 cache entries */
// _BINARY_OP_SUBTRACT_INT // _BINARY_OP_SUBTRACT_INT
{ {
right = value;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
assert(PyLong_CheckExact(left_o)); assert(PyLong_CheckExact(left_o));
@ -4546,9 +4555,7 @@
} }
// _GUARD_NOS_FLOAT // _GUARD_NOS_FLOAT
{ {
right = value;
left = stack_pointer[-2]; left = stack_pointer[-2];
(void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
if (!PyFloat_CheckExact(left_o)) { if (!PyFloat_CheckExact(left_o)) {
UPDATE_MISS_STATS(COMPARE_OP); UPDATE_MISS_STATS(COMPARE_OP);
@ -4559,6 +4566,7 @@
/* Skip 1 cache entry */ /* Skip 1 cache entry */
// _COMPARE_OP_FLOAT // _COMPARE_OP_FLOAT
{ {
right = value;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
STAT_INC(COMPARE_OP, hit); STAT_INC(COMPARE_OP, hit);
@ -4602,9 +4610,7 @@
} }
// _GUARD_NOS_INT // _GUARD_NOS_INT
{ {
right = value;
left = stack_pointer[-2]; left = stack_pointer[-2];
(void)right;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
if (!PyLong_CheckExact(left_o)) { if (!PyLong_CheckExact(left_o)) {
UPDATE_MISS_STATS(COMPARE_OP); UPDATE_MISS_STATS(COMPARE_OP);
@ -4615,6 +4621,7 @@
/* Skip 1 cache entry */ /* Skip 1 cache entry */
// _COMPARE_OP_INT // _COMPARE_OP_INT
{ {
right = value;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
if (!_PyLong_IsCompact((PyLongObject *)left_o)) { if (!_PyLong_IsCompact((PyLongObject *)left_o)) {
@ -4656,7 +4663,6 @@
static_assert(INLINE_CACHE_ENTRIES_COMPARE_OP == 1, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_COMPARE_OP == 1, "incorrect cache size");
_PyStackRef value; _PyStackRef value;
_PyStackRef nos; _PyStackRef nos;
_PyStackRef tos;
_PyStackRef left; _PyStackRef left;
_PyStackRef right; _PyStackRef right;
_PyStackRef res; _PyStackRef res;
@ -4672,9 +4678,7 @@
} }
// _GUARD_NOS_UNICODE // _GUARD_NOS_UNICODE
{ {
tos = value;
nos = stack_pointer[-2]; nos = stack_pointer[-2];
(void)tos;
PyObject *o = PyStackRef_AsPyObjectBorrow(nos); PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
if (!PyUnicode_CheckExact(o)) { if (!PyUnicode_CheckExact(o)) {
UPDATE_MISS_STATS(COMPARE_OP); UPDATE_MISS_STATS(COMPARE_OP);
@ -4685,7 +4689,7 @@
/* Skip 1 cache entry */ /* Skip 1 cache entry */
// _COMPARE_OP_STR // _COMPARE_OP_STR
{ {
right = tos; right = value;
left = nos; left = nos;
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
@ -4776,37 +4780,47 @@
next_instr += 2; next_instr += 2;
INSTRUCTION_STATS(CONTAINS_OP_DICT); INSTRUCTION_STATS(CONTAINS_OP_DICT);
static_assert(INLINE_CACHE_ENTRIES_CONTAINS_OP == 1, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_CONTAINS_OP == 1, "incorrect cache size");
_PyStackRef tos;
_PyStackRef left; _PyStackRef left;
_PyStackRef right; _PyStackRef right;
_PyStackRef b; _PyStackRef b;
// _GUARD_TOS_DICT
{
tos = stack_pointer[-1];
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
if (!PyDict_CheckExact(o)) {
UPDATE_MISS_STATS(CONTAINS_OP);
assert(_PyOpcode_Deopt[opcode] == (CONTAINS_OP));
JUMP_TO_PREDICTED(CONTAINS_OP);
}
}
/* Skip 1 cache entry */ /* Skip 1 cache entry */
right = stack_pointer[-1]; // _CONTAINS_OP_DICT
left = stack_pointer[-2]; {
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); right = tos;
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); left = stack_pointer[-2];
if (!PyDict_CheckExact(right_o)) { PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
UPDATE_MISS_STATS(CONTAINS_OP); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
assert(_PyOpcode_Deopt[opcode] == (CONTAINS_OP)); assert(PyDict_CheckExact(right_o));
JUMP_TO_PREDICTED(CONTAINS_OP); STAT_INC(CONTAINS_OP, hit);
_PyFrame_SetStackPointer(frame, stack_pointer);
int res = PyDict_Contains(right_o, left_o);
_PyStackRef tmp = right;
right = PyStackRef_NULL;
stack_pointer[-1] = right;
PyStackRef_CLOSE(tmp);
tmp = left;
left = PyStackRef_NULL;
stack_pointer[-2] = left;
PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -2;
assert(WITHIN_STACK_BOUNDS());
if (res < 0) {
JUMP_TO_LABEL(error);
}
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
} }
STAT_INC(CONTAINS_OP, hit);
_PyFrame_SetStackPointer(frame, stack_pointer);
int res = PyDict_Contains(right_o, left_o);
_PyStackRef tmp = right;
right = PyStackRef_NULL;
stack_pointer[-1] = right;
PyStackRef_CLOSE(tmp);
tmp = left;
left = PyStackRef_NULL;
stack_pointer[-2] = left;
PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -2;
assert(WITHIN_STACK_BOUNDS());
if (res < 0) {
JUMP_TO_LABEL(error);
}
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
stack_pointer[0] = b; stack_pointer[0] = b;
stack_pointer += 1; stack_pointer += 1;
assert(WITHIN_STACK_BOUNDS()); assert(WITHIN_STACK_BOUNDS());
@ -4824,37 +4838,47 @@
next_instr += 2; next_instr += 2;
INSTRUCTION_STATS(CONTAINS_OP_SET); INSTRUCTION_STATS(CONTAINS_OP_SET);
static_assert(INLINE_CACHE_ENTRIES_CONTAINS_OP == 1, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_CONTAINS_OP == 1, "incorrect cache size");
_PyStackRef tos;
_PyStackRef left; _PyStackRef left;
_PyStackRef right; _PyStackRef right;
_PyStackRef b; _PyStackRef b;
// _GUARD_TOS_ANY_SET
{
tos = stack_pointer[-1];
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
if (!PyAnySet_CheckExact(o)) {
UPDATE_MISS_STATS(CONTAINS_OP);
assert(_PyOpcode_Deopt[opcode] == (CONTAINS_OP));
JUMP_TO_PREDICTED(CONTAINS_OP);
}
}
/* Skip 1 cache entry */ /* Skip 1 cache entry */
right = stack_pointer[-1]; // _CONTAINS_OP_SET
left = stack_pointer[-2]; {
PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); right = tos;
PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); left = stack_pointer[-2];
if (!(PySet_CheckExact(right_o) || PyFrozenSet_CheckExact(right_o))) { PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
UPDATE_MISS_STATS(CONTAINS_OP); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
assert(_PyOpcode_Deopt[opcode] == (CONTAINS_OP)); assert(PyAnySet_CheckExact(right_o));
JUMP_TO_PREDICTED(CONTAINS_OP); STAT_INC(CONTAINS_OP, hit);
_PyFrame_SetStackPointer(frame, stack_pointer);
int res = _PySet_Contains((PySetObject *)right_o, left_o);
_PyStackRef tmp = right;
right = PyStackRef_NULL;
stack_pointer[-1] = right;
PyStackRef_CLOSE(tmp);
tmp = left;
left = PyStackRef_NULL;
stack_pointer[-2] = left;
PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -2;
assert(WITHIN_STACK_BOUNDS());
if (res < 0) {
JUMP_TO_LABEL(error);
}
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
} }
STAT_INC(CONTAINS_OP, hit);
_PyFrame_SetStackPointer(frame, stack_pointer);
int res = _PySet_Contains((PySetObject *)right_o, left_o);
_PyStackRef tmp = right;
right = PyStackRef_NULL;
stack_pointer[-1] = right;
PyStackRef_CLOSE(tmp);
tmp = left;
left = PyStackRef_NULL;
stack_pointer[-2] = left;
PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -2;
assert(WITHIN_STACK_BOUNDS());
if (res < 0) {
JUMP_TO_LABEL(error);
}
b = (res ^ oparg) ? PyStackRef_True : PyStackRef_False;
stack_pointer[0] = b; stack_pointer[0] = b;
stack_pointer += 1; stack_pointer += 1;
assert(WITHIN_STACK_BOUNDS()); assert(WITHIN_STACK_BOUNDS());
@ -11205,32 +11229,42 @@
next_instr += 2; next_instr += 2;
INSTRUCTION_STATS(STORE_SUBSCR_DICT); INSTRUCTION_STATS(STORE_SUBSCR_DICT);
static_assert(INLINE_CACHE_ENTRIES_STORE_SUBSCR == 1, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_STORE_SUBSCR == 1, "incorrect cache size");
_PyStackRef nos;
_PyStackRef value; _PyStackRef value;
_PyStackRef dict_st; _PyStackRef dict_st;
_PyStackRef sub; _PyStackRef sub;
/* Skip 1 cache entry */ // _GUARD_NOS_DICT
sub = stack_pointer[-1]; {
dict_st = stack_pointer[-2]; nos = stack_pointer[-2];
value = stack_pointer[-3]; PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st); if (!PyDict_CheckExact(o)) {
if (!PyDict_CheckExact(dict)) { UPDATE_MISS_STATS(STORE_SUBSCR);
UPDATE_MISS_STATS(STORE_SUBSCR); assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR));
assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR)); JUMP_TO_PREDICTED(STORE_SUBSCR);
JUMP_TO_PREDICTED(STORE_SUBSCR); }
} }
STAT_INC(STORE_SUBSCR, hit); /* Skip 1 cache entry */
_PyFrame_SetStackPointer(frame, stack_pointer); // _STORE_SUBSCR_DICT
int err = _PyDict_SetItem_Take2((PyDictObject *)dict, {
PyStackRef_AsPyObjectSteal(sub), sub = stack_pointer[-1];
PyStackRef_AsPyObjectSteal(value)); dict_st = nos;
stack_pointer = _PyFrame_GetStackPointer(frame); value = stack_pointer[-3];
stack_pointer += -3; PyObject *dict = PyStackRef_AsPyObjectBorrow(dict_st);
assert(WITHIN_STACK_BOUNDS()); assert(PyDict_CheckExact(dict));
_PyFrame_SetStackPointer(frame, stack_pointer); STAT_INC(STORE_SUBSCR, hit);
PyStackRef_CLOSE(dict_st); _PyFrame_SetStackPointer(frame, stack_pointer);
stack_pointer = _PyFrame_GetStackPointer(frame); int err = _PyDict_SetItem_Take2((PyDictObject *)dict,
if (err) { PyStackRef_AsPyObjectSteal(sub),
JUMP_TO_LABEL(error); PyStackRef_AsPyObjectSteal(value));
stack_pointer = _PyFrame_GetStackPointer(frame);
stack_pointer += -3;
assert(WITHIN_STACK_BOUNDS());
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(dict_st);
stack_pointer = _PyFrame_GetStackPointer(frame);
if (err) {
JUMP_TO_LABEL(error);
}
} }
DISPATCH(); DISPATCH();
} }
@ -11247,6 +11281,7 @@
INSTRUCTION_STATS(STORE_SUBSCR_LIST_INT); INSTRUCTION_STATS(STORE_SUBSCR_LIST_INT);
static_assert(INLINE_CACHE_ENTRIES_STORE_SUBSCR == 1, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_STORE_SUBSCR == 1, "incorrect cache size");
_PyStackRef value; _PyStackRef value;
_PyStackRef nos;
_PyStackRef list_st; _PyStackRef list_st;
_PyStackRef sub_st; _PyStackRef sub_st;
// _GUARD_TOS_INT // _GUARD_TOS_INT
@ -11259,20 +11294,26 @@
JUMP_TO_PREDICTED(STORE_SUBSCR); JUMP_TO_PREDICTED(STORE_SUBSCR);
} }
} }
/* Skip 1 cache entry */ // _GUARD_NOS_LIST
// _STORE_SUBSCR_LIST_INT
{ {
sub_st = value; nos = stack_pointer[-2];
list_st = stack_pointer[-2]; PyObject *o = PyStackRef_AsPyObjectBorrow(nos);
value = stack_pointer[-3]; if (!PyList_CheckExact(o)) {
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
assert(PyLong_CheckExact(sub));
if (!PyList_CheckExact(list)) {
UPDATE_MISS_STATS(STORE_SUBSCR); UPDATE_MISS_STATS(STORE_SUBSCR);
assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR)); assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR));
JUMP_TO_PREDICTED(STORE_SUBSCR); JUMP_TO_PREDICTED(STORE_SUBSCR);
} }
}
/* Skip 1 cache entry */
// _STORE_SUBSCR_LIST_INT
{
sub_st = value;
list_st = nos;
value = stack_pointer[-3];
PyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
PyObject *list = PyStackRef_AsPyObjectBorrow(list_st);
assert(PyLong_CheckExact(sub));
assert(PyList_CheckExact(list));
if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) { if (!_PyLong_IsNonNegativeCompact((PyLongObject *)sub)) {
UPDATE_MISS_STATS(STORE_SUBSCR); UPDATE_MISS_STATS(STORE_SUBSCR);
assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR)); assert(_PyOpcode_Deopt[opcode] == (STORE_SUBSCR));
@ -11498,25 +11539,35 @@
next_instr += 4; next_instr += 4;
INSTRUCTION_STATS(TO_BOOL_LIST); INSTRUCTION_STATS(TO_BOOL_LIST);
static_assert(INLINE_CACHE_ENTRIES_TO_BOOL == 3, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_TO_BOOL == 3, "incorrect cache size");
_PyStackRef tos;
_PyStackRef value; _PyStackRef value;
_PyStackRef res; _PyStackRef res;
// _GUARD_TOS_LIST
{
tos = stack_pointer[-1];
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
if (!PyList_CheckExact(o)) {
UPDATE_MISS_STATS(TO_BOOL);
assert(_PyOpcode_Deopt[opcode] == (TO_BOOL));
JUMP_TO_PREDICTED(TO_BOOL);
}
}
/* Skip 1 cache entry */ /* Skip 1 cache entry */
/* Skip 2 cache entries */ /* Skip 2 cache entries */
value = stack_pointer[-1]; // _TO_BOOL_LIST
PyObject *value_o = PyStackRef_AsPyObjectBorrow(value); {
if (!PyList_CheckExact(value_o)) { value = tos;
UPDATE_MISS_STATS(TO_BOOL); PyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
assert(_PyOpcode_Deopt[opcode] == (TO_BOOL)); assert(PyList_CheckExact(value_o));
JUMP_TO_PREDICTED(TO_BOOL); STAT_INC(TO_BOOL, hit);
res = PyList_GET_SIZE(value_o) ? PyStackRef_True : PyStackRef_False;
_PyFrame_SetStackPointer(frame, stack_pointer);
_PyStackRef tmp = value;
value = res;
stack_pointer[-1] = value;
PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
} }
STAT_INC(TO_BOOL, hit);
res = PyList_GET_SIZE(value_o) ? PyStackRef_True : PyStackRef_False;
_PyFrame_SetStackPointer(frame, stack_pointer);
_PyStackRef tmp = value;
value = res;
stack_pointer[-1] = value;
PyStackRef_CLOSE(tmp);
stack_pointer = _PyFrame_GetStackPointer(frame);
DISPATCH(); DISPATCH();
} }
@ -11760,41 +11811,51 @@
next_instr += 2; next_instr += 2;
INSTRUCTION_STATS(UNPACK_SEQUENCE_LIST); INSTRUCTION_STATS(UNPACK_SEQUENCE_LIST);
static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size");
_PyStackRef tos;
_PyStackRef seq; _PyStackRef seq;
_PyStackRef *values; _PyStackRef *values;
/* Skip 1 cache entry */ // _GUARD_TOS_LIST
seq = stack_pointer[-1]; {
values = &stack_pointer[-1]; tos = stack_pointer[-1];
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq); PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
if (!PyList_CheckExact(seq_o)) { if (!PyList_CheckExact(o)) {
UPDATE_MISS_STATS(UNPACK_SEQUENCE);
assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE));
JUMP_TO_PREDICTED(UNPACK_SEQUENCE);
}
if (!LOCK_OBJECT(seq_o)) {
UPDATE_MISS_STATS(UNPACK_SEQUENCE);
assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE));
JUMP_TO_PREDICTED(UNPACK_SEQUENCE);
}
if (PyList_GET_SIZE(seq_o) != oparg) {
UNLOCK_OBJECT(seq_o);
if (true) {
UPDATE_MISS_STATS(UNPACK_SEQUENCE); UPDATE_MISS_STATS(UNPACK_SEQUENCE);
assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE)); assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE));
JUMP_TO_PREDICTED(UNPACK_SEQUENCE); JUMP_TO_PREDICTED(UNPACK_SEQUENCE);
} }
} }
STAT_INC(UNPACK_SEQUENCE, hit); /* Skip 1 cache entry */
PyObject **items = _PyList_ITEMS(seq_o); // _UNPACK_SEQUENCE_LIST
for (int i = oparg; --i >= 0; ) { {
*values++ = PyStackRef_FromPyObjectNew(items[i]); seq = tos;
values = &stack_pointer[-1];
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
assert(PyList_CheckExact(seq_o));
if (!LOCK_OBJECT(seq_o)) {
UPDATE_MISS_STATS(UNPACK_SEQUENCE);
assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE));
JUMP_TO_PREDICTED(UNPACK_SEQUENCE);
}
if (PyList_GET_SIZE(seq_o) != oparg) {
UNLOCK_OBJECT(seq_o);
if (true) {
UPDATE_MISS_STATS(UNPACK_SEQUENCE);
assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE));
JUMP_TO_PREDICTED(UNPACK_SEQUENCE);
}
}
STAT_INC(UNPACK_SEQUENCE, hit);
PyObject **items = _PyList_ITEMS(seq_o);
for (int i = oparg; --i >= 0; ) {
*values++ = PyStackRef_FromPyObjectNew(items[i]);
}
UNLOCK_OBJECT(seq_o);
stack_pointer += -1 + oparg;
assert(WITHIN_STACK_BOUNDS());
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(seq);
stack_pointer = _PyFrame_GetStackPointer(frame);
} }
UNLOCK_OBJECT(seq_o);
stack_pointer += -1 + oparg;
assert(WITHIN_STACK_BOUNDS());
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(seq);
stack_pointer = _PyFrame_GetStackPointer(frame);
DISPATCH(); DISPATCH();
} }
@ -11809,32 +11870,42 @@
next_instr += 2; next_instr += 2;
INSTRUCTION_STATS(UNPACK_SEQUENCE_TUPLE); INSTRUCTION_STATS(UNPACK_SEQUENCE_TUPLE);
static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size");
_PyStackRef tos;
_PyStackRef seq; _PyStackRef seq;
_PyStackRef *values; _PyStackRef *values;
// _GUARD_TOS_TUPLE
{
tos = stack_pointer[-1];
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
if (!PyTuple_CheckExact(o)) {
UPDATE_MISS_STATS(UNPACK_SEQUENCE);
assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE));
JUMP_TO_PREDICTED(UNPACK_SEQUENCE);
}
}
/* Skip 1 cache entry */ /* Skip 1 cache entry */
seq = stack_pointer[-1]; // _UNPACK_SEQUENCE_TUPLE
values = &stack_pointer[-1]; {
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq); seq = tos;
if (!PyTuple_CheckExact(seq_o)) { values = &stack_pointer[-1];
UPDATE_MISS_STATS(UNPACK_SEQUENCE); PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE)); assert(PyTuple_CheckExact(seq_o));
JUMP_TO_PREDICTED(UNPACK_SEQUENCE); if (PyTuple_GET_SIZE(seq_o) != oparg) {
UPDATE_MISS_STATS(UNPACK_SEQUENCE);
assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE));
JUMP_TO_PREDICTED(UNPACK_SEQUENCE);
}
STAT_INC(UNPACK_SEQUENCE, hit);
PyObject **items = _PyTuple_ITEMS(seq_o);
for (int i = oparg; --i >= 0; ) {
*values++ = PyStackRef_FromPyObjectNew(items[i]);
}
stack_pointer += -1 + oparg;
assert(WITHIN_STACK_BOUNDS());
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(seq);
stack_pointer = _PyFrame_GetStackPointer(frame);
} }
if (PyTuple_GET_SIZE(seq_o) != oparg) {
UPDATE_MISS_STATS(UNPACK_SEQUENCE);
assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE));
JUMP_TO_PREDICTED(UNPACK_SEQUENCE);
}
STAT_INC(UNPACK_SEQUENCE, hit);
PyObject **items = _PyTuple_ITEMS(seq_o);
for (int i = oparg; --i >= 0; ) {
*values++ = PyStackRef_FromPyObjectNew(items[i]);
}
stack_pointer += -1 + oparg;
assert(WITHIN_STACK_BOUNDS());
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(seq);
stack_pointer = _PyFrame_GetStackPointer(frame);
DISPATCH(); DISPATCH();
} }
@ -11849,33 +11920,43 @@
next_instr += 2; next_instr += 2;
INSTRUCTION_STATS(UNPACK_SEQUENCE_TWO_TUPLE); INSTRUCTION_STATS(UNPACK_SEQUENCE_TWO_TUPLE);
static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size"); static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size");
_PyStackRef tos;
_PyStackRef seq; _PyStackRef seq;
_PyStackRef val1; _PyStackRef val1;
_PyStackRef val0; _PyStackRef val0;
// _GUARD_TOS_TUPLE
{
tos = stack_pointer[-1];
PyObject *o = PyStackRef_AsPyObjectBorrow(tos);
if (!PyTuple_CheckExact(o)) {
UPDATE_MISS_STATS(UNPACK_SEQUENCE);
assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE));
JUMP_TO_PREDICTED(UNPACK_SEQUENCE);
}
}
/* Skip 1 cache entry */ /* Skip 1 cache entry */
seq = stack_pointer[-1]; // _UNPACK_SEQUENCE_TWO_TUPLE
assert(oparg == 2); {
PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq); seq = tos;
if (!PyTuple_CheckExact(seq_o)) { assert(oparg == 2);
UPDATE_MISS_STATS(UNPACK_SEQUENCE); PyObject *seq_o = PyStackRef_AsPyObjectBorrow(seq);
assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE)); assert(PyTuple_CheckExact(seq_o));
JUMP_TO_PREDICTED(UNPACK_SEQUENCE); if (PyTuple_GET_SIZE(seq_o) != 2) {
UPDATE_MISS_STATS(UNPACK_SEQUENCE);
assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE));
JUMP_TO_PREDICTED(UNPACK_SEQUENCE);
}
STAT_INC(UNPACK_SEQUENCE, hit);
val0 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 0));
val1 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 1));
stack_pointer[-1] = val1;
stack_pointer[0] = val0;
stack_pointer += 1;
assert(WITHIN_STACK_BOUNDS());
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(seq);
stack_pointer = _PyFrame_GetStackPointer(frame);
} }
if (PyTuple_GET_SIZE(seq_o) != 2) {
UPDATE_MISS_STATS(UNPACK_SEQUENCE);
assert(_PyOpcode_Deopt[opcode] == (UNPACK_SEQUENCE));
JUMP_TO_PREDICTED(UNPACK_SEQUENCE);
}
STAT_INC(UNPACK_SEQUENCE, hit);
val0 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 0));
val1 = PyStackRef_FromPyObjectNew(PyTuple_GET_ITEM(seq_o, 1));
stack_pointer[-1] = val1;
stack_pointer[0] = val0;
stack_pointer += 1;
assert(WITHIN_STACK_BOUNDS());
_PyFrame_SetStackPointer(frame, stack_pointer);
PyStackRef_CLOSE(seq);
stack_pointer = _PyFrame_GetStackPointer(frame);
DISPATCH(); DISPATCH();
} }

53
Python/optimizer_bytecodes.c
View file

@ -396,7 +396,6 @@ dummy_func(void) {
op(_TO_BOOL_LIST, (value -- res)) { op(_TO_BOOL_LIST, (value -- res)) {
int already_bool = optimize_to_bool(this_instr, ctx, value, &res); int already_bool = optimize_to_bool(this_instr, ctx, value, &res);
if (!already_bool) { if (!already_bool) {
sym_set_type(value, &PyList_Type);
res = sym_new_type(ctx, &PyBool_Type); res = sym_new_type(ctx, &PyBool_Type);
} }
} }
@ -927,7 +926,57 @@ dummy_func(void) {
op(_UNPACK_SEQUENCE_TUPLE, (seq -- values[oparg])) { op(_UNPACK_SEQUENCE_TUPLE, (seq -- values[oparg])) {
for (int i = 0; i < oparg; i++) { for (int i = 0; i < oparg; i++) {
values[i] = sym_tuple_getitem(ctx, seq, i); values[i] = sym_tuple_getitem(ctx, seq, oparg - i - 1);
}
}
op(_GUARD_TOS_LIST, (tos -- tos)) {
if (sym_matches_type(tos, &PyList_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(tos, &PyList_Type);
}
op(_GUARD_NOS_LIST, (nos, unused -- nos, unused)) {
if (sym_matches_type(nos, &PyList_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(nos, &PyList_Type);
}
op(_GUARD_TOS_TUPLE, (tos -- tos)) {
if (sym_matches_type(tos, &PyTuple_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(tos, &PyTuple_Type);
}
op(_GUARD_NOS_TUPLE, (nos, unused -- nos, unused)) {
if (sym_matches_type(nos, &PyTuple_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(nos, &PyTuple_Type);
}
op(_GUARD_TOS_DICT, (tos -- tos)) {
if (sym_matches_type(tos, &PyDict_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(tos, &PyDict_Type);
}
op(_GUARD_NOS_DICT, (nos, unused -- nos, unused)) {
if (sym_matches_type(nos, &PyDict_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(nos, &PyDict_Type);
}
op(_GUARD_TOS_ANY_SET, (tos -- tos)) {
if (sym_matches_type(tos, &PySet_Type) ||
sym_matches_type(tos, &PyFrozenSet_Type))
{
REPLACE_OP(this_instr, _NOP, 0, 0);
} }
} }

74
Python/optimizer_cases.c.h generated
View file

@ -195,13 +195,32 @@
break; break;
} }
case _GUARD_NOS_LIST: {
JitOptSymbol *nos;
nos = stack_pointer[-2];
if (sym_matches_type(nos, &PyList_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(nos, &PyList_Type);
break;
}
case _GUARD_TOS_LIST: {
JitOptSymbol *tos;
tos = stack_pointer[-1];
if (sym_matches_type(tos, &PyList_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(tos, &PyList_Type);
break;
}
case _TO_BOOL_LIST: { case _TO_BOOL_LIST: {
JitOptSymbol *value; JitOptSymbol *value;
JitOptSymbol *res; JitOptSymbol *res;
value = stack_pointer[-1]; value = stack_pointer[-1];
int already_bool = optimize_to_bool(this_instr, ctx, value, &res); int already_bool = optimize_to_bool(this_instr, ctx, value, &res);
if (!already_bool) { if (!already_bool) {
sym_set_type(value, &PyList_Type);
res = sym_new_type(ctx, &PyBool_Type); res = sym_new_type(ctx, &PyBool_Type);
} }
stack_pointer[-1] = res; stack_pointer[-1] = res;
@ -576,6 +595,26 @@
break; break;
} }
case _GUARD_NOS_TUPLE: {
JitOptSymbol *nos;
nos = stack_pointer[-2];
if (sym_matches_type(nos, &PyTuple_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(nos, &PyTuple_Type);
break;
}
case _GUARD_TOS_TUPLE: {
JitOptSymbol *tos;
tos = stack_pointer[-1];
if (sym_matches_type(tos, &PyTuple_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(tos, &PyTuple_Type);
break;
}
case _BINARY_OP_SUBSCR_TUPLE_INT: { case _BINARY_OP_SUBSCR_TUPLE_INT: {
JitOptSymbol *res; JitOptSymbol *res;
res = sym_new_not_null(ctx); res = sym_new_not_null(ctx);
@ -585,6 +624,26 @@
break; break;
} }
case _GUARD_NOS_DICT: {
JitOptSymbol *nos;
nos = stack_pointer[-2];
if (sym_matches_type(nos, &PyDict_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(nos, &PyDict_Type);
break;
}
case _GUARD_TOS_DICT: {
JitOptSymbol *tos;
tos = stack_pointer[-1];
if (sym_matches_type(tos, &PyDict_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(tos, &PyDict_Type);
break;
}
case _BINARY_OP_SUBSCR_DICT: { case _BINARY_OP_SUBSCR_DICT: {
JitOptSymbol *res; JitOptSymbol *res;
res = sym_new_not_null(ctx); res = sym_new_not_null(ctx);
@ -794,7 +853,7 @@
seq = stack_pointer[-1]; seq = stack_pointer[-1];
values = &stack_pointer[-1]; values = &stack_pointer[-1];
for (int i = 0; i < oparg; i++) { for (int i = 0; i < oparg; i++) {
values[i] = sym_tuple_getitem(ctx, seq, i); values[i] = sym_tuple_getitem(ctx, seq, oparg - i - 1);
} }
stack_pointer += -1 + oparg; stack_pointer += -1 + oparg;
assert(WITHIN_STACK_BOUNDS()); assert(WITHIN_STACK_BOUNDS());
@ -1282,6 +1341,17 @@
break; break;
} }
case _GUARD_TOS_ANY_SET: {
JitOptSymbol *tos;
tos = stack_pointer[-1];
if (sym_matches_type(tos, &PySet_Type) ||
sym_matches_type(tos, &PyFrozenSet_Type))
{
REPLACE_OP(this_instr, _NOP, 0, 0);
}
break;
}
case _CONTAINS_OP_SET: { case _CONTAINS_OP_SET: {
JitOptSymbol *res; JitOptSymbol *res;
res = sym_new_type(ctx, &PyBool_Type); res = sym_new_type(ctx, &PyBool_Type);