[Python-checkins] GH-106008: Make implicit boolean conversions explicit (GH-106003)
brandtbucher
webhook-mailer at python.org
Thu Jun 29 16:49:59 EDT 2023
https://github.com/python/cpython/commit/7b2d94d87513967b357c658c6e7e1b8c8d02487d
commit: 7b2d94d87513967b357c658c6e7e1b8c8d02487d
branch: main
author: Brandt Bucher <brandtbucher at microsoft.com>
committer: brandtbucher <brandtbucher at gmail.com>
date: 2023-06-29T13:49:54-07:00
summary:
GH-106008: Make implicit boolean conversions explicit (GH-106003)
files:
A Misc/NEWS.d/next/Core and Builtins/2023-06-22-17-37-35.gh-issue-106003.2Vc_Tw.rst
M .gitattributes
M Doc/library/dis.rst
M Include/internal/pycore_code.h
M Include/internal/pycore_opcode.h
M Include/opcode.h
M Lib/_opcode_metadata.py
M Lib/dis.py
M Lib/importlib/_bootstrap_external.py
M Lib/opcode.py
M Lib/test/test_compiler_codegen.py
M Lib/test/test_dis.py
M Python/bytecodes.c
M Python/compile.c
M Python/executor_cases.c.h
M Python/flowgraph.c
M Python/generated_cases.c.h
M Python/opcode_metadata.h
M Python/opcode_targets.h
M Python/specialize.c
diff --git a/.gitattributes b/.gitattributes
index a2ff14c66323e..5e4ce963b63e5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -85,8 +85,9 @@ Parser/parser.c generated
Parser/token.c generated
Programs/test_frozenmain.h generated
Python/Python-ast.c generated
-Python/generated_cases.c.h generated
Python/executor_cases.c.h generated
+Python/generated_cases.c.h generated
+Python/opcode_metadata.h generated
Python/opcode_targets.h generated
Python/stdlib_module_names.h generated
Tools/peg_generator/pegen/grammar_parser.py generated
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 63336bb9e08ea..099b6410f165e 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -529,6 +529,9 @@ result back on the stack.
Implements ``STACK[-1] = not STACK[-1]``.
+ .. versionchanged:: 3.13
+ This instruction now requires an exact :class:`bool` operand.
+
.. opcode:: UNARY_INVERT
@@ -548,6 +551,13 @@ result back on the stack.
.. versionadded:: 3.5
+.. opcode:: TO_BOOL
+
+ Implements ``STACK[-1] = bool(STACK[-1])``.
+
+ .. versionadded:: 3.13
+
+
**Binary and in-place operations**
Binary operations remove the top two items from the stack (``STACK[-1]`` and
@@ -1127,7 +1137,12 @@ iterations of the loop.
.. opcode:: COMPARE_OP (opname)
Performs a Boolean operation. The operation name can be found in
- ``cmp_op[opname]``.
+ ``cmp_op[opname >> 5]``. If the fifth-lowest bit of ``opname`` is set
+ (``opname & 16``), the result should be coerced to ``bool``.
+
+ .. versionchanged:: 3.13
+ The fifth-lowest bit of the oparg now indicates a forced conversion to
+ :class:`bool`.
.. opcode:: IS_OP (invert)
@@ -1191,6 +1206,9 @@ iterations of the loop.
.. versionchanged:: 3.12
This is no longer a pseudo-instruction.
+ .. versionchanged:: 3.13
+ This instruction now requires an exact :class:`bool` operand.
+
.. opcode:: POP_JUMP_IF_FALSE (delta)
If ``STACK[-1]`` is false, increments the bytecode counter by *delta*.
@@ -1204,6 +1222,9 @@ iterations of the loop.
.. versionchanged:: 3.12
This is no longer a pseudo-instruction.
+ .. versionchanged:: 3.13
+ This instruction now requires an exact :class:`bool` operand.
+
.. opcode:: POP_JUMP_IF_NOT_NONE (delta)
If ``STACK[-1]`` is not ``None``, increments the bytecode counter by *delta*.
diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
index 8755cb371a87c..d1829eb3245d2 100644
--- a/Include/internal/pycore_code.h
+++ b/Include/internal/pycore_code.h
@@ -101,6 +101,13 @@ typedef struct {
#define INLINE_CACHE_ENTRIES_SEND CACHE_ENTRIES(_PySendCache)
+typedef struct {
+ uint16_t counter;
+ uint16_t version[2];
+} _PyToBoolCache;
+
+#define INLINE_CACHE_ENTRIES_TO_BOOL CACHE_ENTRIES(_PyToBoolCache)
+
// Borrowed references to common callables:
struct callable_cache {
PyObject *isinstance;
@@ -246,6 +253,7 @@ extern void _Py_Specialize_UnpackSequence(PyObject *seq, _Py_CODEUNIT *instr,
int oparg);
extern void _Py_Specialize_ForIter(PyObject *iter, _Py_CODEUNIT *instr, int oparg);
extern void _Py_Specialize_Send(PyObject *receiver, _Py_CODEUNIT *instr);
+extern void _Py_Specialize_ToBool(PyObject *value, _Py_CODEUNIT *instr);
/* Finalizer function for static codeobjects used in deepfreeze.py */
extern void _PyStaticCode_Fini(PyCodeObject *co);
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
index bebdedc962403..428df4ccadbc1 100644
--- a/Include/internal/pycore_opcode.h
+++ b/Include/internal/pycore_opcode.h
@@ -19,6 +19,7 @@ extern const uint8_t _PyOpcode_Deopt[256];
#ifdef NEED_OPCODE_TABLES
const uint8_t _PyOpcode_Caches[256] = {
+ [TO_BOOL] = 3,
[BINARY_SUBSCR] = 1,
[STORE_SUBSCR] = 1,
[UNPACK_SEQUENCE] = 1,
@@ -221,6 +222,13 @@ const uint8_t _PyOpcode_Deopt[256] = {
[STORE_SUBSCR_DICT] = STORE_SUBSCR,
[STORE_SUBSCR_LIST_INT] = STORE_SUBSCR,
[SWAP] = SWAP,
+ [TO_BOOL] = TO_BOOL,
+ [TO_BOOL_ALWAYS_TRUE] = TO_BOOL,
+ [TO_BOOL_BOOL] = TO_BOOL,
+ [TO_BOOL_INT] = TO_BOOL,
+ [TO_BOOL_LIST] = TO_BOOL,
+ [TO_BOOL_NONE] = TO_BOOL,
+ [TO_BOOL_STR] = TO_BOOL,
[UNARY_INVERT] = UNARY_INVERT,
[UNARY_NEGATIVE] = UNARY_NEGATIVE,
[UNARY_NOT] = UNARY_NOT,
@@ -242,49 +250,49 @@ static const char *const _PyOpcode_OpName[268] = {
[INTERPRETER_EXIT] = "INTERPRETER_EXIT",
[END_FOR] = "END_FOR",
[END_SEND] = "END_SEND",
- [BINARY_OP_MULTIPLY_INT] = "BINARY_OP_MULTIPLY_INT",
- [BINARY_OP_ADD_INT] = "BINARY_OP_ADD_INT",
- [BINARY_OP_SUBTRACT_INT] = "BINARY_OP_SUBTRACT_INT",
+ [TO_BOOL] = "TO_BOOL",
+ [TO_BOOL_ALWAYS_TRUE] = "TO_BOOL_ALWAYS_TRUE",
+ [TO_BOOL_BOOL] = "TO_BOOL_BOOL",
[NOP] = "NOP",
- [BINARY_OP_MULTIPLY_FLOAT] = "BINARY_OP_MULTIPLY_FLOAT",
+ [TO_BOOL_INT] = "TO_BOOL_INT",
[UNARY_NEGATIVE] = "UNARY_NEGATIVE",
[UNARY_NOT] = "UNARY_NOT",
- [BINARY_OP_ADD_FLOAT] = "BINARY_OP_ADD_FLOAT",
- [BINARY_OP_SUBTRACT_FLOAT] = "BINARY_OP_SUBTRACT_FLOAT",
+ [TO_BOOL_LIST] = "TO_BOOL_LIST",
+ [TO_BOOL_NONE] = "TO_BOOL_NONE",
[UNARY_INVERT] = "UNARY_INVERT",
[EXIT_INIT_CHECK] = "EXIT_INIT_CHECK",
[RESERVED] = "RESERVED",
- [BINARY_OP_ADD_UNICODE] = "BINARY_OP_ADD_UNICODE",
- [BINARY_OP_INPLACE_ADD_UNICODE] = "BINARY_OP_INPLACE_ADD_UNICODE",
- [BINARY_SUBSCR_DICT] = "BINARY_SUBSCR_DICT",
- [BINARY_SUBSCR_GETITEM] = "BINARY_SUBSCR_GETITEM",
- [BINARY_SUBSCR_LIST_INT] = "BINARY_SUBSCR_LIST_INT",
- [BINARY_SUBSCR_TUPLE_INT] = "BINARY_SUBSCR_TUPLE_INT",
+ [TO_BOOL_STR] = "TO_BOOL_STR",
+ [BINARY_OP_MULTIPLY_INT] = "BINARY_OP_MULTIPLY_INT",
+ [BINARY_OP_ADD_INT] = "BINARY_OP_ADD_INT",
+ [BINARY_OP_SUBTRACT_INT] = "BINARY_OP_SUBTRACT_INT",
+ [BINARY_OP_MULTIPLY_FLOAT] = "BINARY_OP_MULTIPLY_FLOAT",
+ [BINARY_OP_ADD_FLOAT] = "BINARY_OP_ADD_FLOAT",
[MAKE_FUNCTION] = "MAKE_FUNCTION",
[BINARY_SUBSCR] = "BINARY_SUBSCR",
[BINARY_SLICE] = "BINARY_SLICE",
[STORE_SLICE] = "STORE_SLICE",
- [STORE_SUBSCR_DICT] = "STORE_SUBSCR_DICT",
- [STORE_SUBSCR_LIST_INT] = "STORE_SUBSCR_LIST_INT",
+ [BINARY_OP_SUBTRACT_FLOAT] = "BINARY_OP_SUBTRACT_FLOAT",
+ [BINARY_OP_ADD_UNICODE] = "BINARY_OP_ADD_UNICODE",
[GET_LEN] = "GET_LEN",
[MATCH_MAPPING] = "MATCH_MAPPING",
[MATCH_SEQUENCE] = "MATCH_SEQUENCE",
[MATCH_KEYS] = "MATCH_KEYS",
- [SEND_GEN] = "SEND_GEN",
+ [BINARY_OP_INPLACE_ADD_UNICODE] = "BINARY_OP_INPLACE_ADD_UNICODE",
[PUSH_EXC_INFO] = "PUSH_EXC_INFO",
[CHECK_EXC_MATCH] = "CHECK_EXC_MATCH",
[CHECK_EG_MATCH] = "CHECK_EG_MATCH",
- [UNPACK_SEQUENCE_TWO_TUPLE] = "UNPACK_SEQUENCE_TWO_TUPLE",
- [UNPACK_SEQUENCE_TUPLE] = "UNPACK_SEQUENCE_TUPLE",
+ [BINARY_SUBSCR_DICT] = "BINARY_SUBSCR_DICT",
+ [BINARY_SUBSCR_GETITEM] = "BINARY_SUBSCR_GETITEM",
[FORMAT_SIMPLE] = "FORMAT_SIMPLE",
[FORMAT_WITH_SPEC] = "FORMAT_WITH_SPEC",
- [UNPACK_SEQUENCE_LIST] = "UNPACK_SEQUENCE_LIST",
- [STORE_ATTR_INSTANCE_VALUE] = "STORE_ATTR_INSTANCE_VALUE",
- [STORE_ATTR_SLOT] = "STORE_ATTR_SLOT",
- [STORE_ATTR_WITH_HINT] = "STORE_ATTR_WITH_HINT",
- [LOAD_GLOBAL_MODULE] = "LOAD_GLOBAL_MODULE",
- [LOAD_GLOBAL_BUILTIN] = "LOAD_GLOBAL_BUILTIN",
- [LOAD_SUPER_ATTR_ATTR] = "LOAD_SUPER_ATTR_ATTR",
+ [BINARY_SUBSCR_LIST_INT] = "BINARY_SUBSCR_LIST_INT",
+ [BINARY_SUBSCR_TUPLE_INT] = "BINARY_SUBSCR_TUPLE_INT",
+ [STORE_SUBSCR_DICT] = "STORE_SUBSCR_DICT",
+ [STORE_SUBSCR_LIST_INT] = "STORE_SUBSCR_LIST_INT",
+ [SEND_GEN] = "SEND_GEN",
+ [UNPACK_SEQUENCE_TWO_TUPLE] = "UNPACK_SEQUENCE_TWO_TUPLE",
+ [UNPACK_SEQUENCE_TUPLE] = "UNPACK_SEQUENCE_TUPLE",
[WITH_EXCEPT_START] = "WITH_EXCEPT_START",
[GET_AITER] = "GET_AITER",
[GET_ANEXT] = "GET_ANEXT",
@@ -292,39 +300,39 @@ static const char *const _PyOpcode_OpName[268] = {
[BEFORE_WITH] = "BEFORE_WITH",
[END_ASYNC_FOR] = "END_ASYNC_FOR",
[CLEANUP_THROW] = "CLEANUP_THROW",
+ [UNPACK_SEQUENCE_LIST] = "UNPACK_SEQUENCE_LIST",
+ [STORE_ATTR_INSTANCE_VALUE] = "STORE_ATTR_INSTANCE_VALUE",
+ [STORE_ATTR_SLOT] = "STORE_ATTR_SLOT",
+ [STORE_ATTR_WITH_HINT] = "STORE_ATTR_WITH_HINT",
+ [STORE_SUBSCR] = "STORE_SUBSCR",
+ [DELETE_SUBSCR] = "DELETE_SUBSCR",
+ [LOAD_GLOBAL_MODULE] = "LOAD_GLOBAL_MODULE",
+ [LOAD_GLOBAL_BUILTIN] = "LOAD_GLOBAL_BUILTIN",
+ [LOAD_SUPER_ATTR_ATTR] = "LOAD_SUPER_ATTR_ATTR",
[LOAD_SUPER_ATTR_METHOD] = "LOAD_SUPER_ATTR_METHOD",
[LOAD_ATTR_INSTANCE_VALUE] = "LOAD_ATTR_INSTANCE_VALUE",
[LOAD_ATTR_MODULE] = "LOAD_ATTR_MODULE",
+ [GET_ITER] = "GET_ITER",
+ [GET_YIELD_FROM_ITER] = "GET_YIELD_FROM_ITER",
[LOAD_ATTR_WITH_HINT] = "LOAD_ATTR_WITH_HINT",
- [STORE_SUBSCR] = "STORE_SUBSCR",
- [DELETE_SUBSCR] = "DELETE_SUBSCR",
+ [LOAD_BUILD_CLASS] = "LOAD_BUILD_CLASS",
[LOAD_ATTR_SLOT] = "LOAD_ATTR_SLOT",
[LOAD_ATTR_CLASS] = "LOAD_ATTR_CLASS",
+ [LOAD_ASSERTION_ERROR] = "LOAD_ASSERTION_ERROR",
+ [RETURN_GENERATOR] = "RETURN_GENERATOR",
[LOAD_ATTR_PROPERTY] = "LOAD_ATTR_PROPERTY",
[LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN] = "LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN",
[LOAD_ATTR_METHOD_WITH_VALUES] = "LOAD_ATTR_METHOD_WITH_VALUES",
[LOAD_ATTR_METHOD_NO_DICT] = "LOAD_ATTR_METHOD_NO_DICT",
- [GET_ITER] = "GET_ITER",
- [GET_YIELD_FROM_ITER] = "GET_YIELD_FROM_ITER",
[LOAD_ATTR_METHOD_LAZY_DICT] = "LOAD_ATTR_METHOD_LAZY_DICT",
- [LOAD_BUILD_CLASS] = "LOAD_BUILD_CLASS",
[COMPARE_OP_FLOAT] = "COMPARE_OP_FLOAT",
[COMPARE_OP_INT] = "COMPARE_OP_INT",
- [LOAD_ASSERTION_ERROR] = "LOAD_ASSERTION_ERROR",
- [RETURN_GENERATOR] = "RETURN_GENERATOR",
- [COMPARE_OP_STR] = "COMPARE_OP_STR",
- [FOR_ITER_LIST] = "FOR_ITER_LIST",
- [FOR_ITER_TUPLE] = "FOR_ITER_TUPLE",
- [FOR_ITER_RANGE] = "FOR_ITER_RANGE",
- [FOR_ITER_GEN] = "FOR_ITER_GEN",
- [CALL_BOUND_METHOD_EXACT_ARGS] = "CALL_BOUND_METHOD_EXACT_ARGS",
- [CALL_PY_EXACT_ARGS] = "CALL_PY_EXACT_ARGS",
[RETURN_VALUE] = "RETURN_VALUE",
- [CALL_PY_WITH_DEFAULTS] = "CALL_PY_WITH_DEFAULTS",
+ [COMPARE_OP_STR] = "COMPARE_OP_STR",
[SETUP_ANNOTATIONS] = "SETUP_ANNOTATIONS",
- [CALL_NO_KW_TYPE_1] = "CALL_NO_KW_TYPE_1",
+ [FOR_ITER_LIST] = "FOR_ITER_LIST",
[LOAD_LOCALS] = "LOAD_LOCALS",
- [CALL_NO_KW_STR_1] = "CALL_NO_KW_STR_1",
+ [FOR_ITER_TUPLE] = "FOR_ITER_TUPLE",
[POP_EXCEPT] = "POP_EXCEPT",
[STORE_NAME] = "STORE_NAME",
[DELETE_NAME] = "DELETE_NAME",
@@ -347,9 +355,9 @@ static const char *const _PyOpcode_OpName[268] = {
[IMPORT_NAME] = "IMPORT_NAME",
[IMPORT_FROM] = "IMPORT_FROM",
[JUMP_FORWARD] = "JUMP_FORWARD",
- [CALL_NO_KW_TUPLE_1] = "CALL_NO_KW_TUPLE_1",
- [CALL_BUILTIN_CLASS] = "CALL_BUILTIN_CLASS",
- [CALL_NO_KW_BUILTIN_O] = "CALL_NO_KW_BUILTIN_O",
+ [FOR_ITER_RANGE] = "FOR_ITER_RANGE",
+ [FOR_ITER_GEN] = "FOR_ITER_GEN",
+ [CALL_BOUND_METHOD_EXACT_ARGS] = "CALL_BOUND_METHOD_EXACT_ARGS",
[POP_JUMP_IF_FALSE] = "POP_JUMP_IF_FALSE",
[POP_JUMP_IF_TRUE] = "POP_JUMP_IF_TRUE",
[LOAD_GLOBAL] = "LOAD_GLOBAL",
@@ -368,11 +376,11 @@ static const char *const _PyOpcode_OpName[268] = {
[POP_JUMP_IF_NONE] = "POP_JUMP_IF_NONE",
[RAISE_VARARGS] = "RAISE_VARARGS",
[GET_AWAITABLE] = "GET_AWAITABLE",
- [CALL_NO_KW_BUILTIN_FAST] = "CALL_NO_KW_BUILTIN_FAST",
+ [CALL_PY_EXACT_ARGS] = "CALL_PY_EXACT_ARGS",
[BUILD_SLICE] = "BUILD_SLICE",
[JUMP_BACKWARD_NO_INTERRUPT] = "JUMP_BACKWARD_NO_INTERRUPT",
[MAKE_CELL] = "MAKE_CELL",
- [CALL_BUILTIN_FAST_WITH_KEYWORDS] = "CALL_BUILTIN_FAST_WITH_KEYWORDS",
+ [CALL_PY_WITH_DEFAULTS] = "CALL_PY_WITH_DEFAULTS",
[LOAD_DEREF] = "LOAD_DEREF",
[STORE_DEREF] = "STORE_DEREF",
[DELETE_DEREF] = "DELETE_DEREF",
@@ -384,26 +392,26 @@ static const char *const _PyOpcode_OpName[268] = {
[LIST_APPEND] = "LIST_APPEND",
[SET_ADD] = "SET_ADD",
[MAP_ADD] = "MAP_ADD",
- [CALL_NO_KW_LEN] = "CALL_NO_KW_LEN",
+ [CALL_NO_KW_TYPE_1] = "CALL_NO_KW_TYPE_1",
[COPY_FREE_VARS] = "COPY_FREE_VARS",
[YIELD_VALUE] = "YIELD_VALUE",
[RESUME] = "RESUME",
[MATCH_CLASS] = "MATCH_CLASS",
- [CALL_NO_KW_ISINSTANCE] = "CALL_NO_KW_ISINSTANCE",
- [CALL_NO_KW_LIST_APPEND] = "CALL_NO_KW_LIST_APPEND",
- [CALL_NO_KW_METHOD_DESCRIPTOR_O] = "CALL_NO_KW_METHOD_DESCRIPTOR_O",
+ [CALL_NO_KW_STR_1] = "CALL_NO_KW_STR_1",
+ [CALL_NO_KW_TUPLE_1] = "CALL_NO_KW_TUPLE_1",
+ [CALL_BUILTIN_CLASS] = "CALL_BUILTIN_CLASS",
[BUILD_CONST_KEY_MAP] = "BUILD_CONST_KEY_MAP",
[BUILD_STRING] = "BUILD_STRING",
[CONVERT_VALUE] = "CONVERT_VALUE",
- [CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = "CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS",
- [CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = "CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS",
- [CALL_NO_KW_METHOD_DESCRIPTOR_FAST] = "CALL_NO_KW_METHOD_DESCRIPTOR_FAST",
+ [CALL_NO_KW_BUILTIN_O] = "CALL_NO_KW_BUILTIN_O",
+ [CALL_NO_KW_BUILTIN_FAST] = "CALL_NO_KW_BUILTIN_FAST",
+ [CALL_BUILTIN_FAST_WITH_KEYWORDS] = "CALL_BUILTIN_FAST_WITH_KEYWORDS",
[LIST_EXTEND] = "LIST_EXTEND",
[SET_UPDATE] = "SET_UPDATE",
[DICT_MERGE] = "DICT_MERGE",
[DICT_UPDATE] = "DICT_UPDATE",
- [CALL_NO_KW_ALLOC_AND_ENTER_INIT] = "CALL_NO_KW_ALLOC_AND_ENTER_INIT",
- [167] = "<167>",
+ [CALL_NO_KW_LEN] = "CALL_NO_KW_LEN",
+ [CALL_NO_KW_ISINSTANCE] = "CALL_NO_KW_ISINSTANCE",
[LOAD_FAST_LOAD_FAST] = "LOAD_FAST_LOAD_FAST",
[STORE_FAST_LOAD_FAST] = "STORE_FAST_LOAD_FAST",
[STORE_FAST_STORE_FAST] = "STORE_FAST_STORE_FAST",
@@ -414,12 +422,12 @@ static const char *const _PyOpcode_OpName[268] = {
[LOAD_FROM_DICT_OR_GLOBALS] = "LOAD_FROM_DICT_OR_GLOBALS",
[LOAD_FROM_DICT_OR_DEREF] = "LOAD_FROM_DICT_OR_DEREF",
[SET_FUNCTION_ATTRIBUTE] = "SET_FUNCTION_ATTRIBUTE",
- [178] = "<178>",
- [179] = "<179>",
- [180] = "<180>",
- [181] = "<181>",
- [182] = "<182>",
- [183] = "<183>",
+ [CALL_NO_KW_LIST_APPEND] = "CALL_NO_KW_LIST_APPEND",
+ [CALL_NO_KW_METHOD_DESCRIPTOR_O] = "CALL_NO_KW_METHOD_DESCRIPTOR_O",
+ [CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS] = "CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS",
+ [CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS] = "CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS",
+ [CALL_NO_KW_METHOD_DESCRIPTOR_FAST] = "CALL_NO_KW_METHOD_DESCRIPTOR_FAST",
+ [CALL_NO_KW_ALLOC_AND_ENTER_INIT] = "CALL_NO_KW_ALLOC_AND_ENTER_INIT",
[184] = "<184>",
[185] = "<185>",
[186] = "<186>",
@@ -508,13 +516,6 @@ static const char *const _PyOpcode_OpName[268] = {
#endif
#define EXTRA_CASES \
- case 167: \
- case 178: \
- case 179: \
- case 180: \
- case 181: \
- case 182: \
- case 183: \
case 184: \
case 185: \
case 186: \
diff --git a/Include/opcode.h b/Include/opcode.h
index 0533ae9668870..6b855bdd99dfa 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -14,6 +14,7 @@ extern "C" {
#define INTERPRETER_EXIT 3
#define END_FOR 4
#define END_SEND 5
+#define TO_BOOL 6
#define NOP 9
#define UNARY_NEGATIVE 11
#define UNARY_NOT 12
@@ -159,66 +160,72 @@ extern "C" {
#define STORE_FAST_MAYBE_NULL 266
#define LOAD_CLOSURE 267
#define MAX_PSEUDO_OPCODE 267
-#define BINARY_OP_MULTIPLY_INT 6
-#define BINARY_OP_ADD_INT 7
-#define BINARY_OP_SUBTRACT_INT 8
-#define BINARY_OP_MULTIPLY_FLOAT 10
-#define BINARY_OP_ADD_FLOAT 13
-#define BINARY_OP_SUBTRACT_FLOAT 14
-#define BINARY_OP_ADD_UNICODE 18
-#define BINARY_OP_INPLACE_ADD_UNICODE 19
-#define BINARY_SUBSCR_DICT 20
-#define BINARY_SUBSCR_GETITEM 21
-#define BINARY_SUBSCR_LIST_INT 22
-#define BINARY_SUBSCR_TUPLE_INT 23
-#define STORE_SUBSCR_DICT 28
-#define STORE_SUBSCR_LIST_INT 29
-#define SEND_GEN 34
-#define UNPACK_SEQUENCE_TWO_TUPLE 38
-#define UNPACK_SEQUENCE_TUPLE 39
-#define UNPACK_SEQUENCE_LIST 42
-#define STORE_ATTR_INSTANCE_VALUE 43
-#define STORE_ATTR_SLOT 44
-#define STORE_ATTR_WITH_HINT 45
-#define LOAD_GLOBAL_MODULE 46
-#define LOAD_GLOBAL_BUILTIN 47
-#define LOAD_SUPER_ATTR_ATTR 48
-#define LOAD_SUPER_ATTR_METHOD 56
-#define LOAD_ATTR_INSTANCE_VALUE 57
-#define LOAD_ATTR_MODULE 58
-#define LOAD_ATTR_WITH_HINT 59
-#define LOAD_ATTR_SLOT 62
-#define LOAD_ATTR_CLASS 63
-#define LOAD_ATTR_PROPERTY 64
-#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN 65
-#define LOAD_ATTR_METHOD_WITH_VALUES 66
-#define LOAD_ATTR_METHOD_NO_DICT 67
-#define LOAD_ATTR_METHOD_LAZY_DICT 70
-#define COMPARE_OP_FLOAT 72
-#define COMPARE_OP_INT 73
-#define COMPARE_OP_STR 76
-#define FOR_ITER_LIST 77
-#define FOR_ITER_TUPLE 78
-#define FOR_ITER_RANGE 79
-#define FOR_ITER_GEN 80
-#define CALL_BOUND_METHOD_EXACT_ARGS 81
-#define CALL_PY_EXACT_ARGS 82
-#define CALL_PY_WITH_DEFAULTS 84
-#define CALL_NO_KW_TYPE_1 86
-#define CALL_NO_KW_STR_1 88
-#define CALL_NO_KW_TUPLE_1 111
-#define CALL_BUILTIN_CLASS 112
-#define CALL_NO_KW_BUILTIN_O 113
-#define CALL_NO_KW_BUILTIN_FAST 132
-#define CALL_BUILTIN_FAST_WITH_KEYWORDS 136
-#define CALL_NO_KW_LEN 148
-#define CALL_NO_KW_ISINSTANCE 153
-#define CALL_NO_KW_LIST_APPEND 154
-#define CALL_NO_KW_METHOD_DESCRIPTOR_O 155
-#define CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 159
-#define CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS 160
-#define CALL_NO_KW_METHOD_DESCRIPTOR_FAST 161
-#define CALL_NO_KW_ALLOC_AND_ENTER_INIT 166
+#define TO_BOOL_ALWAYS_TRUE 7
+#define TO_BOOL_BOOL 8
+#define TO_BOOL_INT 10
+#define TO_BOOL_LIST 13
+#define TO_BOOL_NONE 14
+#define TO_BOOL_STR 18
+#define BINARY_OP_MULTIPLY_INT 19
+#define BINARY_OP_ADD_INT 20
+#define BINARY_OP_SUBTRACT_INT 21
+#define BINARY_OP_MULTIPLY_FLOAT 22
+#define BINARY_OP_ADD_FLOAT 23
+#define BINARY_OP_SUBTRACT_FLOAT 28
+#define BINARY_OP_ADD_UNICODE 29
+#define BINARY_OP_INPLACE_ADD_UNICODE 34
+#define BINARY_SUBSCR_DICT 38
+#define BINARY_SUBSCR_GETITEM 39
+#define BINARY_SUBSCR_LIST_INT 42
+#define BINARY_SUBSCR_TUPLE_INT 43
+#define STORE_SUBSCR_DICT 44
+#define STORE_SUBSCR_LIST_INT 45
+#define SEND_GEN 46
+#define UNPACK_SEQUENCE_TWO_TUPLE 47
+#define UNPACK_SEQUENCE_TUPLE 48
+#define UNPACK_SEQUENCE_LIST 56
+#define STORE_ATTR_INSTANCE_VALUE 57
+#define STORE_ATTR_SLOT 58
+#define STORE_ATTR_WITH_HINT 59
+#define LOAD_GLOBAL_MODULE 62
+#define LOAD_GLOBAL_BUILTIN 63
+#define LOAD_SUPER_ATTR_ATTR 64
+#define LOAD_SUPER_ATTR_METHOD 65
+#define LOAD_ATTR_INSTANCE_VALUE 66
+#define LOAD_ATTR_MODULE 67
+#define LOAD_ATTR_WITH_HINT 70
+#define LOAD_ATTR_SLOT 72
+#define LOAD_ATTR_CLASS 73
+#define LOAD_ATTR_PROPERTY 76
+#define LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN 77
+#define LOAD_ATTR_METHOD_WITH_VALUES 78
+#define LOAD_ATTR_METHOD_NO_DICT 79
+#define LOAD_ATTR_METHOD_LAZY_DICT 80
+#define COMPARE_OP_FLOAT 81
+#define COMPARE_OP_INT 82
+#define COMPARE_OP_STR 84
+#define FOR_ITER_LIST 86
+#define FOR_ITER_TUPLE 88
+#define FOR_ITER_RANGE 111
+#define FOR_ITER_GEN 112
+#define CALL_BOUND_METHOD_EXACT_ARGS 113
+#define CALL_PY_EXACT_ARGS 132
+#define CALL_PY_WITH_DEFAULTS 136
+#define CALL_NO_KW_TYPE_1 148
+#define CALL_NO_KW_STR_1 153
+#define CALL_NO_KW_TUPLE_1 154
+#define CALL_BUILTIN_CLASS 155
+#define CALL_NO_KW_BUILTIN_O 159
+#define CALL_NO_KW_BUILTIN_FAST 160
+#define CALL_BUILTIN_FAST_WITH_KEYWORDS 161
+#define CALL_NO_KW_LEN 166
+#define CALL_NO_KW_ISINSTANCE 167
+#define CALL_NO_KW_LIST_APPEND 178
+#define CALL_NO_KW_METHOD_DESCRIPTOR_O 179
+#define CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 180
+#define CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS 181
+#define CALL_NO_KW_METHOD_DESCRIPTOR_FAST 182
+#define CALL_NO_KW_ALLOC_AND_ENTER_INIT 183
#define NB_ADD 0
#define NB_AND 1
diff --git a/Lib/_opcode_metadata.py b/Lib/_opcode_metadata.py
index c0a68256802c3..b0fcd1a6b920f 100644
--- a/Lib/_opcode_metadata.py
+++ b/Lib/_opcode_metadata.py
@@ -4,6 +4,14 @@
# Do not edit!
_specializations = {
+ "TO_BOOL": [
+ "TO_BOOL_ALWAYS_TRUE",
+ "TO_BOOL_BOOL",
+ "TO_BOOL_INT",
+ "TO_BOOL_LIST",
+ "TO_BOOL_NONE",
+ "TO_BOOL_STR",
+ ],
"BINARY_OP": [
"BINARY_OP_MULTIPLY_INT",
"BINARY_OP_ADD_INT",
diff --git a/Lib/dis.py b/Lib/dis.py
index f135a0bc9b4d9..f7a31f2f96b99 100644
--- a/Lib/dis.py
+++ b/Lib/dis.py
@@ -572,8 +572,10 @@ def _get_instructions_bytes(code, varname_from_oparg=None,
elif deop in haslocal or deop in hasfree:
argval, argrepr = _get_name_info(arg, varname_from_oparg)
elif deop in hascompare:
- argval = cmp_op[arg>>4]
+ argval = cmp_op[arg >> 5]
argrepr = argval
+ if arg & 16:
+ argrepr = f"bool({argrepr})"
elif deop == CONVERT_VALUE:
argval = (None, str, repr, ascii)[arg]
argrepr = ('', 'str', 'repr', 'ascii')[arg]
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index 8b4ac6ca01204..16a82bef2ba71 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@ -452,6 +452,7 @@ def _write_atomic(path, data, mode=0o666):
# Python 3.13a1 3554 (more efficient bytecodes for f-strings)
# Python 3.13a1 3555 (generate specialized opcodes metadata from bytecodes.c)
# Python 3.13a1 3556 (Convert LOAD_CLOSURE to a pseudo-op)
+# Python 3.13a1 3557 (Make the conversion to boolean in jumps explicit)
# Python 3.14 will start with 3600
@@ -468,7 +469,7 @@ def _write_atomic(path, data, mode=0o666):
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
# in PC/launcher.c must also be updated.
-MAGIC_NUMBER = (3556).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3557).to_bytes(2, 'little') + b'\r\n'
_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c
diff --git a/Lib/opcode.py b/Lib/opcode.py
index 52c566cd0cabc..bc885051c6454 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -87,9 +87,9 @@ def pseudo_op(name, op, real_ops):
def_op('POP_TOP', 1)
def_op('PUSH_NULL', 2)
def_op('INTERPRETER_EXIT', 3)
-
def_op('END_FOR', 4)
def_op('END_SEND', 5)
+def_op('TO_BOOL', 6)
def_op('NOP', 9)
@@ -142,6 +142,7 @@ def pseudo_op(name, op, real_ops):
def_op('RETURN_VALUE', 83)
def_op('SETUP_ANNOTATIONS', 85)
+
def_op('LOAD_LOCALS', 87)
def_op('POP_EXCEPT', 89)
@@ -171,6 +172,7 @@ def pseudo_op(name, op, real_ops):
name_op('IMPORT_NAME', 108) # Index in name list
name_op('IMPORT_FROM', 109) # Index in name list
jrel_op('JUMP_FORWARD', 110) # Number of words to skip
+
jrel_op('POP_JUMP_IF_FALSE', 114)
jrel_op('POP_JUMP_IF_TRUE', 115)
name_op('LOAD_GLOBAL', 116) # Index in name list
@@ -209,7 +211,6 @@ def pseudo_op(name, op, real_ops):
def_op('CALL_FUNCTION_EX', 142) # Flags
def_op('LOAD_FAST_AND_CLEAR', 143) # Local variable number
haslocal.append(143)
-
def_op('EXTENDED_ARG', 144)
EXTENDED_ARG = 144
def_op('LIST_APPEND', 145)
@@ -238,7 +239,6 @@ def pseudo_op(name, op, real_ops):
hasconst.append(172)
def_op('CALL_INTRINSIC_1', 173)
def_op('CALL_INTRINSIC_2', 174)
-
name_op('LOAD_FROM_DICT_OR_GLOBALS', 175)
def_op('LOAD_FROM_DICT_OR_DEREF', 176)
hasfree.append(176)
@@ -404,6 +404,10 @@ def pseudo_op(name, op, real_ops):
"JUMP_BACKWARD": {
"counter": 1,
},
+ "TO_BOOL": {
+ "counter": 1,
+ "version": 2,
+ },
}
_inline_cache_entries = [
diff --git a/Lib/test/test_compiler_codegen.py b/Lib/test/test_compiler_codegen.py
index ea57df9cd2400..d99bb8c6cd472 100644
--- a/Lib/test/test_compiler_codegen.py
+++ b/Lib/test/test_compiler_codegen.py
@@ -18,6 +18,7 @@ def test_if_expression(self):
expected = [
('RESUME', 0, 0),
('LOAD_CONST', 0, 1),
+ ('TO_BOOL', 0, 1),
('POP_JUMP_IF_FALSE', false_lbl := self.Label(), 1),
('LOAD_CONST', 1, 1),
('JUMP', exit_lbl := self.Label()),
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index ab8026b81fd3d..8597b8f14ac05 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -46,7 +46,7 @@ def cm(cls, x):
%3d LOAD_FAST 1 (x)
LOAD_CONST 1 (1)
- COMPARE_OP 40 (==)
+ COMPARE_OP 72 (==)
LOAD_FAST 0 (self)
STORE_ATTR 0 (x)
RETURN_CONST 0 (None)
@@ -56,7 +56,7 @@ def cm(cls, x):
RESUME 0
LOAD_FAST 1
LOAD_CONST 1
- COMPARE_OP 40 (==)
+ COMPARE_OP 72 (==)
LOAD_FAST 0
STORE_ATTR 0
RETURN_CONST 0
@@ -67,7 +67,7 @@ def cm(cls, x):
%3d LOAD_FAST 1 (x)
LOAD_CONST 1 (1)
- COMPARE_OP 40 (==)
+ COMPARE_OP 72 (==)
LOAD_FAST 0 (cls)
STORE_ATTR 0 (x)
RETURN_CONST 0 (None)
@@ -78,7 +78,7 @@ def cm(cls, x):
%3d LOAD_FAST 0 (x)
LOAD_CONST 1 (1)
- COMPARE_OP 40 (==)
+ COMPARE_OP 72 (==)
STORE_FAST 0 (x)
RETURN_CONST 0 (None)
""" % (_C.sm.__code__.co_firstlineno, _C.sm.__code__.co_firstlineno + 2,)
@@ -488,7 +488,8 @@ def _with(c):
%3d >> PUSH_EXC_INFO
WITH_EXCEPT_START
- POP_JUMP_IF_TRUE 1 (to 42)
+ TO_BOOL
+ POP_JUMP_IF_TRUE 1 (to 50)
RERAISE 2
>> POP_TOP
POP_EXCEPT
@@ -567,7 +568,8 @@ async def _asyncwith(c):
JUMP_BACKWARD_NO_INTERRUPT 5 (to 90)
>> CLEANUP_THROW
>> END_SEND
- POP_JUMP_IF_TRUE 1 (to 108)
+ TO_BOOL
+ POP_JUMP_IF_TRUE 1 (to 116)
RERAISE 2
>> POP_TOP
POP_EXCEPT
@@ -1570,24 +1572,43 @@ def jumpy():
def _stringify_instruction(instr):
# Since line numbers and other offsets change a lot for these
# test cases, ignore them.
- return repr(instr._replace(positions=None))
+ return f" {instr._replace(positions=None)!r},"
def _prepare_test_cases():
- _instructions = dis.get_instructions(outer, first_line=expected_outer_line)
- print('expected_opinfo_outer = [\n ',
- ',\n '.join(map(_stringify_instruction, _instructions)), ',\n]', sep='')
- _instructions = dis.get_instructions(outer(), first_line=expected_f_line)
- print('expected_opinfo_f = [\n ',
- ',\n '.join(map(_stringify_instruction, _instructions)), ',\n]', sep='')
- _instructions = dis.get_instructions(outer()(), first_line=expected_inner_line)
- print('expected_opinfo_inner = [\n ',
- ',\n '.join(map(_stringify_instruction, _instructions)), ',\n]', sep='')
- _instructions = dis.get_instructions(jumpy, first_line=expected_jumpy_line)
- print('expected_opinfo_jumpy = [\n ',
- ',\n '.join(map(_stringify_instruction, _instructions)), ',\n]', sep='')
- dis.dis(outer)
-
-#_prepare_test_cases()
+ ignore = io.StringIO()
+ with contextlib.redirect_stdout(ignore):
+ f = outer()
+ inner = f()
+ _instructions_outer = dis.get_instructions(outer, first_line=expected_outer_line)
+ _instructions_f = dis.get_instructions(f, first_line=expected_f_line)
+ _instructions_inner = dis.get_instructions(inner, first_line=expected_inner_line)
+ _instructions_jumpy = dis.get_instructions(jumpy, first_line=expected_jumpy_line)
+ result = "\n".join(
+ [
+ "expected_opinfo_outer = [",
+ *map(_stringify_instruction, _instructions_outer),
+ "]",
+ "",
+ "expected_opinfo_f = [",
+ *map(_stringify_instruction, _instructions_f),
+ "]",
+ "",
+ "expected_opinfo_inner = [",
+ *map(_stringify_instruction, _instructions_inner),
+ "]",
+ "",
+ "expected_opinfo_jumpy = [",
+ *map(_stringify_instruction, _instructions_jumpy),
+ "]",
+ ]
+ )
+ result = result.replace(repr(repr(code_object_f)), "repr(code_object_f)")
+ result = result.replace(repr(code_object_f), "code_object_f")
+ result = result.replace(repr(repr(code_object_inner)), "repr(code_object_inner)")
+ result = result.replace(repr(code_object_inner), "code_object_inner")
+ print(result)
+
+# _prepare_test_cases()
Instruction = dis.Instruction
@@ -1659,7 +1680,6 @@ def _prepare_test_cases():
Instruction(opname='RETURN_CONST', opcode=121, arg=0, argval=None, argrepr='None', offset=34, start_offset=34, starts_line=None, is_jump_target=False, positions=None),
]
-
expected_opinfo_jumpy = [
Instruction(opname='RESUME', opcode=151, arg=0, argval=0, argrepr='', offset=0, start_offset=0, starts_line=1, is_jump_target=False, positions=None),
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='range', argrepr='NULL + range', offset=2, start_offset=2, starts_line=3, is_jump_target=False, positions=None),
@@ -1674,12 +1694,12 @@ def _prepare_test_cases():
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=50, start_offset=50, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=52, start_offset=52, starts_line=5, is_jump_target=False, positions=None),
Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=54, start_offset=54, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COMPARE_OP', opcode=107, arg=2, argval='<', argrepr='<', offset=56, start_offset=56, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COMPARE_OP', opcode=107, arg=18, argval='<', argrepr='bool(<)', offset=56, start_offset=56, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=2, argval=66, argrepr='to 66', offset=60, start_offset=60, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=21, argval=24, argrepr='to 24', offset=62, start_offset=62, starts_line=6, is_jump_target=False, positions=None),
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=66, start_offset=66, starts_line=7, is_jump_target=True, positions=None),
Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=68, start_offset=68, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COMPARE_OP', opcode=107, arg=68, argval='>', argrepr='>', offset=70, start_offset=70, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COMPARE_OP', opcode=107, arg=148, argval='>', argrepr='bool(>)', offset=70, start_offset=70, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=2, argval=80, argrepr='to 80', offset=74, start_offset=74, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=28, argval=24, argrepr='to 24', offset=76, start_offset=76, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=80, start_offset=80, starts_line=8, is_jump_target=True, positions=None),
@@ -1690,90 +1710,93 @@ def _prepare_test_cases():
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=98, start_offset=98, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=106, start_offset=106, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='LOAD_FAST_CHECK', opcode=127, arg=0, argval='i', argrepr='i', offset=108, start_offset=108, starts_line=11, is_jump_target=True, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=33, argval=178, argrepr='to 178', offset=110, start_offset=110, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=112, start_offset=112, starts_line=12, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=122, start_offset=122, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=124, start_offset=124, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=132, start_offset=132, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=134, start_offset=134, starts_line=13, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=136, start_offset=136, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='BINARY_OP', opcode=122, arg=23, argval=23, argrepr='-=', offset=138, start_offset=138, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=142, start_offset=142, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=144, start_offset=144, starts_line=14, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=146, start_offset=146, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COMPARE_OP', opcode=107, arg=68, argval='>', argrepr='>', offset=148, start_offset=148, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=2, argval=158, argrepr='to 158', offset=152, start_offset=152, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_BACKWARD', opcode=140, arg=25, argval=108, argrepr='to 108', offset=154, start_offset=154, starts_line=15, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=158, start_offset=158, starts_line=16, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=160, start_offset=160, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COMPARE_OP', opcode=107, arg=2, argval='<', argrepr='<', offset=162, start_offset=162, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=1, argval=170, argrepr='to 170', offset=166, start_offset=166, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_FORWARD', opcode=110, arg=15, argval=200, argrepr='to 200', offset=168, start_offset=168, starts_line=17, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=170, start_offset=170, starts_line=11, is_jump_target=True, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=2, argval=178, argrepr='to 178', offset=172, start_offset=172, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_BACKWARD', opcode=140, arg=33, argval=112, argrepr='to 112', offset=174, start_offset=174, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=178, start_offset=178, starts_line=19, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=188, start_offset=188, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=190, start_offset=190, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=198, start_offset=198, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=200, start_offset=200, starts_line=20, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=202, start_offset=202, starts_line=21, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=204, start_offset=204, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='BINARY_OP', opcode=122, arg=11, argval=11, argrepr='/', offset=206, start_offset=206, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=210, start_offset=210, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=212, start_offset=212, starts_line=25, is_jump_target=False, positions=None),
- Instruction(opname='BEFORE_WITH', opcode=53, arg=None, argval=None, argrepr='', offset=214, start_offset=214, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=216, start_offset=216, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=218, start_offset=218, starts_line=26, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=8, argval='Never reach this', argrepr="'Never reach this'", offset=228, start_offset=228, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=230, start_offset=230, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=238, start_offset=238, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=240, start_offset=240, starts_line=25, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=242, start_offset=242, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=244, start_offset=244, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=2, argval=2, argrepr='', offset=246, start_offset=246, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='TO_BOOL', opcode=6, arg=None, argval=None, argrepr='', offset=110, start_offset=110, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=37, argval=194, argrepr='to 194', offset=118, start_offset=118, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=120, start_offset=120, starts_line=12, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=130, start_offset=130, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=132, start_offset=132, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=140, start_offset=140, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=142, start_offset=142, starts_line=13, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=144, start_offset=144, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='BINARY_OP', opcode=122, arg=23, argval=23, argrepr='-=', offset=146, start_offset=146, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=150, start_offset=150, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=152, start_offset=152, starts_line=14, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=154, start_offset=154, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COMPARE_OP', opcode=107, arg=148, argval='>', argrepr='bool(>)', offset=156, start_offset=156, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=2, argval=166, argrepr='to 166', offset=160, start_offset=160, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_BACKWARD', opcode=140, arg=29, argval=108, argrepr='to 108', offset=162, start_offset=162, starts_line=15, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=166, start_offset=166, starts_line=16, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=168, start_offset=168, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COMPARE_OP', opcode=107, arg=18, argval='<', argrepr='bool(<)', offset=170, start_offset=170, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=1, argval=178, argrepr='to 178', offset=174, start_offset=174, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_FORWARD', opcode=110, arg=19, argval=216, argrepr='to 216', offset=176, start_offset=176, starts_line=17, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=178, start_offset=178, starts_line=11, is_jump_target=True, positions=None),
+ Instruction(opname='TO_BOOL', opcode=6, arg=None, argval=None, argrepr='', offset=180, start_offset=180, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=2, argval=194, argrepr='to 194', offset=188, start_offset=188, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_BACKWARD', opcode=140, arg=37, argval=120, argrepr='to 120', offset=190, start_offset=190, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=194, start_offset=194, starts_line=19, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=204, start_offset=204, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=206, start_offset=206, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=214, start_offset=214, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=216, start_offset=216, starts_line=20, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=218, start_offset=218, starts_line=21, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=220, start_offset=220, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='BINARY_OP', opcode=122, arg=11, argval=11, argrepr='/', offset=222, start_offset=222, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=226, start_offset=226, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=228, start_offset=228, starts_line=25, is_jump_target=False, positions=None),
+ Instruction(opname='BEFORE_WITH', opcode=53, arg=None, argval=None, argrepr='', offset=230, start_offset=230, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=232, start_offset=232, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=234, start_offset=234, starts_line=26, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=8, argval='Never reach this', argrepr="'Never reach this'", offset=244, start_offset=244, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=246, start_offset=246, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=254, start_offset=254, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=256, start_offset=256, starts_line=28, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=266, start_offset=266, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=268, start_offset=268, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=276, start_offset=276, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RETURN_CONST', opcode=121, arg=0, argval=None, argrepr='None', offset=278, start_offset=278, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=280, start_offset=280, starts_line=25, is_jump_target=False, positions=None),
- Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=282, start_offset=282, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=1, argval=288, argrepr='to 288', offset=284, start_offset=284, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=2, argval=2, argrepr='', offset=286, start_offset=286, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=288, start_offset=288, starts_line=None, is_jump_target=True, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=290, start_offset=290, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=256, start_offset=256, starts_line=25, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=258, start_offset=258, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=260, start_offset=260, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=2, argval=2, argrepr='', offset=262, start_offset=262, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=270, start_offset=270, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=272, start_offset=272, starts_line=28, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=282, start_offset=282, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=284, start_offset=284, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=292, start_offset=292, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=294, start_offset=294, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_BACKWARD', opcode=140, arg=22, argval=256, argrepr='to 256', offset=296, start_offset=296, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=300, start_offset=300, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=302, start_offset=302, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=304, start_offset=304, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=306, start_offset=306, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=4, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=308, start_offset=308, starts_line=22, is_jump_target=False, positions=None),
- Instruction(opname='CHECK_EXC_MATCH', opcode=36, arg=None, argval=None, argrepr='', offset=318, start_offset=318, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=15, argval=352, argrepr='to 352', offset=320, start_offset=320, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=322, start_offset=322, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=324, start_offset=324, starts_line=23, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=334, start_offset=334, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=336, start_offset=336, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=344, start_offset=344, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=346, start_offset=346, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_BACKWARD', opcode=140, arg=48, argval=256, argrepr='to 256', offset=348, start_offset=348, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=352, start_offset=352, starts_line=22, is_jump_target=True, positions=None),
- Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=354, start_offset=354, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=356, start_offset=356, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=358, start_offset=358, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=360, start_offset=360, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=362, start_offset=362, starts_line=28, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=372, start_offset=372, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=374, start_offset=374, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=382, start_offset=382, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=384, start_offset=384, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=386, start_offset=386, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=388, start_offset=388, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=390, start_offset=390, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RETURN_CONST', opcode=121, arg=0, argval=None, argrepr='None', offset=294, start_offset=294, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=296, start_offset=296, starts_line=25, is_jump_target=False, positions=None),
+ Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=298, start_offset=298, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='TO_BOOL', opcode=6, arg=None, argval=None, argrepr='', offset=300, start_offset=300, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=1, argval=312, argrepr='to 312', offset=308, start_offset=308, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=2, argval=2, argrepr='', offset=310, start_offset=310, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=312, start_offset=312, starts_line=None, is_jump_target=True, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=314, start_offset=314, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=316, start_offset=316, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=318, start_offset=318, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_BACKWARD', opcode=140, arg=26, argval=272, argrepr='to 272', offset=320, start_offset=320, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=324, start_offset=324, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=326, start_offset=326, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=328, start_offset=328, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=330, start_offset=330, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=4, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=332, start_offset=332, starts_line=22, is_jump_target=False, positions=None),
+ Instruction(opname='CHECK_EXC_MATCH', opcode=36, arg=None, argval=None, argrepr='', offset=342, start_offset=342, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=15, argval=376, argrepr='to 376', offset=344, start_offset=344, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=346, start_offset=346, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=348, start_offset=348, starts_line=23, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=358, start_offset=358, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=360, start_offset=360, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=368, start_offset=368, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=370, start_offset=370, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_BACKWARD', opcode=140, arg=52, argval=272, argrepr='to 272', offset=372, start_offset=372, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=376, start_offset=376, starts_line=22, is_jump_target=True, positions=None),
+ Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=378, start_offset=378, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=380, start_offset=380, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=382, start_offset=382, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=384, start_offset=384, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=386, start_offset=386, starts_line=28, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=396, start_offset=396, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=398, start_offset=398, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=406, start_offset=406, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=408, start_offset=408, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=410, start_offset=410, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=412, start_offset=412, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=414, start_offset=414, starts_line=None, is_jump_target=False, positions=None),
]
# One last piece of inspect fodder to check the default line number handling
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-06-22-17-37-35.gh-issue-106003.2Vc_Tw.rst b/Misc/NEWS.d/next/Core and Builtins/2023-06-22-17-37-35.gh-issue-106003.2Vc_Tw.rst
new file mode 100644
index 0000000000000..47143f7eb8f38
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-06-22-17-37-35.gh-issue-106003.2Vc_Tw.rst
@@ -0,0 +1,5 @@
+Add a new :opcode:`TO_BOOL` instruction, which performs boolean conversions
+for :opcode:`POP_JUMP_IF_TRUE`, :opcode:`POP_JUMP_IF_FALSE`, and
+:opcode:`UNARY_NOT` (which all expect exact :class:`bool` values now). Also,
+modify the oparg of :opcode:`COMPARE_OP` to include an optional "boolean
+conversion" flag.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 1d9664bc27d24..cd23e6624706f 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -279,15 +279,90 @@ dummy_func(
}
inst(UNARY_NOT, (value -- res)) {
+ assert(PyBool_Check(value));
+ res = Py_IsFalse(value) ? Py_True : Py_False;
+ }
+
+ family(to_bool, INLINE_CACHE_ENTRIES_TO_BOOL) = {
+ TO_BOOL,
+ TO_BOOL_ALWAYS_TRUE,
+ TO_BOOL_BOOL,
+ TO_BOOL_INT,
+ TO_BOOL_LIST,
+ TO_BOOL_NONE,
+ TO_BOOL_STR,
+ };
+
+ inst(TO_BOOL, (unused/1, unused/2, value -- res)) {
+ #if ENABLE_SPECIALIZATION
+ _PyToBoolCache *cache = (_PyToBoolCache *)next_instr;
+ if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
+ next_instr--;
+ _Py_Specialize_ToBool(value, next_instr);
+ DISPATCH_SAME_OPARG();
+ }
+ STAT_INC(TO_BOOL, deferred);
+ DECREMENT_ADAPTIVE_COUNTER(cache->counter);
+ #endif /* ENABLE_SPECIALIZATION */
int err = PyObject_IsTrue(value);
DECREF_INPUTS();
ERROR_IF(err < 0, error);
- if (err == 0) {
- res = Py_True;
+ res = err ? Py_True : Py_False;
+ }
+
+ inst(TO_BOOL_BOOL, (unused/1, unused/2, value -- value)) {
+ DEOPT_IF(!PyBool_Check(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ }
+
+ inst(TO_BOOL_INT, (unused/1, unused/2, value -- res)) {
+ DEOPT_IF(!PyLong_CheckExact(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ if (_PyLong_IsZero((PyLongObject *)value)) {
+ assert(_Py_IsImmortal(value));
+ res = Py_False;
}
else {
+ DECREF_INPUTS();
+ res = Py_True;
+ }
+ }
+
+ inst(TO_BOOL_LIST, (unused/1, unused/2, value -- res)) {
+ DEOPT_IF(!PyList_CheckExact(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ res = Py_SIZE(value) ? Py_True : Py_False;
+ DECREF_INPUTS();
+ }
+
+ inst(TO_BOOL_NONE, (unused/1, unused/2, value -- res)) {
+ // This one is a bit weird, because we expect *some* failures:
+ DEOPT_IF(!Py_IsNone(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ res = Py_False;
+ }
+
+ inst(TO_BOOL_STR, (unused/1, unused/2, value -- res)) {
+ DEOPT_IF(!PyUnicode_CheckExact(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ if (value == &_Py_STR(empty)) {
+ assert(_Py_IsImmortal(value));
res = Py_False;
}
+ else {
+ assert(Py_SIZE(value));
+ DECREF_INPUTS();
+ res = Py_True;
+ }
+ }
+
+ inst(TO_BOOL_ALWAYS_TRUE, (unused/1, version/2, value -- res)) {
+ // This one is a bit weird, because we expect *some* failures:
+ assert(version);
+ DEOPT_IF(Py_TYPE(value)->tp_version_tag != version, TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ DECREF_INPUTS();
+ res = Py_True;
}
inst(UNARY_INVERT, (value -- res)) {
@@ -2024,10 +2099,16 @@ dummy_func(
STAT_INC(COMPARE_OP, deferred);
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
#endif /* ENABLE_SPECIALIZATION */
- assert((oparg >> 4) <= Py_GE);
- res = PyObject_RichCompare(left, right, oparg>>4);
+ assert((oparg >> 5) <= Py_GE);
+ res = PyObject_RichCompare(left, right, oparg >> 5);
DECREF_INPUTS();
ERROR_IF(res == NULL, error);
+ if (oparg & 16) {
+ int res_bool = PyObject_IsTrue(res);
+ Py_DECREF(res);
+ ERROR_IF(res_bool < 0, error);
+ res = res_bool ? Py_True : Py_False;
+ }
}
inst(COMPARE_OP_FLOAT, (unused/1, left, right -- res)) {
@@ -2041,6 +2122,7 @@ dummy_func(
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
res = (sign_ish & oparg) ? Py_True : Py_False;
+ // It's always a bool, so we don't care about oparg & 16.
}
// Similar to COMPARE_OP_FLOAT
@@ -2059,6 +2141,7 @@ dummy_func(
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
res = (sign_ish & oparg) ? Py_True : Py_False;
+ // It's always a bool, so we don't care about oparg & 16.
}
// Similar to COMPARE_OP_FLOAT, but for ==, != only
@@ -2067,13 +2150,14 @@ dummy_func(
DEOPT_IF(!PyUnicode_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
int eq = _PyUnicode_Equal(left, right);
- assert((oparg >>4) == Py_EQ || (oparg >>4) == Py_NE);
+ assert((oparg >> 5) == Py_EQ || (oparg >> 5) == Py_NE);
_Py_DECREF_SPECIALIZED(left, _PyUnicode_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
assert(eq == 0 || eq == 1);
assert((oparg & 0xf) == COMPARISON_NOT_EQUALS || (oparg & 0xf) == COMPARISON_EQUALS);
assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS);
res = ((COMPARISON_NOT_EQUALS + eq) & oparg) ? Py_True : Py_False;
+ // It's always a bool, so we don't care about oparg & 16.
}
inst(IS_OP, (left, right -- b)) {
@@ -2183,35 +2267,13 @@ dummy_func(
}
inst(POP_JUMP_IF_FALSE, (cond -- )) {
- if (Py_IsFalse(cond)) {
- JUMPBY(oparg);
- }
- else if (!Py_IsTrue(cond)) {
- int err = PyObject_IsTrue(cond);
- DECREF_INPUTS();
- if (err == 0) {
- JUMPBY(oparg);
- }
- else {
- ERROR_IF(err < 0, error);
- }
- }
+ assert(PyBool_Check(cond));
+ JUMPBY(oparg * Py_IsFalse(cond));
}
inst(POP_JUMP_IF_TRUE, (cond -- )) {
- if (Py_IsTrue(cond)) {
- JUMPBY(oparg);
- }
- else if (!Py_IsFalse(cond)) {
- int err = PyObject_IsTrue(cond);
- DECREF_INPUTS();
- if (err > 0) {
- JUMPBY(oparg);
- }
- else {
- ERROR_IF(err < 0, error);
- }
- }
+ assert(PyBool_Check(cond));
+ JUMPBY(oparg * Py_IsTrue(cond));
}
inst(POP_JUMP_IF_NOT_NONE, (value -- )) {
@@ -3515,23 +3577,17 @@ dummy_func(
inst(INSTRUMENTED_POP_JUMP_IF_TRUE, ( -- )) {
PyObject *cond = POP();
- int err = PyObject_IsTrue(cond);
- Py_DECREF(cond);
- ERROR_IF(err < 0, error);
- _Py_CODEUNIT *here = next_instr-1;
- assert(err == 0 || err == 1);
- int offset = err*oparg;
+ assert(PyBool_Check(cond));
+ _Py_CODEUNIT *here = next_instr - 1;
+ int offset = Py_IsTrue(cond) * oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
}
inst(INSTRUMENTED_POP_JUMP_IF_FALSE, ( -- )) {
PyObject *cond = POP();
- int err = PyObject_IsTrue(cond);
- Py_DECREF(cond);
- ERROR_IF(err < 0, error);
- _Py_CODEUNIT *here = next_instr-1;
- assert(err == 0 || err == 1);
- int offset = (1-err)*oparg;
+ assert(PyBool_Check(cond));
+ _Py_CODEUNIT *here = next_instr - 1;
+ int offset = Py_IsFalse(cond) * oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
}
@@ -3558,7 +3614,7 @@ dummy_func(
}
else {
Py_DECREF(value);
- offset = oparg;
+ offset = oparg;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
}
diff --git a/Python/compile.c b/Python/compile.c
index 5936184d8b76b..d83bf0855ec25 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -2790,9 +2790,11 @@ static int compiler_addcompare(struct compiler *c, location loc,
default:
Py_UNREACHABLE();
}
- /* cmp goes in top bits of the oparg, while the low bits are used by quickened
- * versions of this opcode to store the comparison mask. */
- ADDOP_I(c, loc, COMPARE_OP, (cmp << 4) | compare_masks[cmp]);
+ // cmp goes in top three bits of the oparg, while the low four bits are used
+ // by quickened versions of this opcode to store the comparison mask. The
+ // fifth-lowest bit indicates whether the result should be converted to bool
+ // and is set later):
+ ADDOP_I(c, loc, COMPARE_OP, (cmp << 5) | compare_masks[cmp]);
return SUCCESS;
}
@@ -2858,10 +2860,12 @@ compiler_jump_if(struct compiler *c, location loc,
ADDOP_I(c, LOC(e), SWAP, 2);
ADDOP_I(c, LOC(e), COPY, 2);
ADDOP_COMPARE(c, LOC(e), asdl_seq_GET(e->v.Compare.ops, i));
+ ADDOP(c, LOC(e), TO_BOOL);
ADDOP_JUMP(c, LOC(e), POP_JUMP_IF_FALSE, cleanup);
}
VISIT(c, expr, (expr_ty)asdl_seq_GET(e->v.Compare.comparators, n));
ADDOP_COMPARE(c, LOC(e), asdl_seq_GET(e->v.Compare.ops, n));
+ ADDOP(c, LOC(e), TO_BOOL);
ADDOP_JUMP(c, LOC(e), cond ? POP_JUMP_IF_TRUE : POP_JUMP_IF_FALSE, next);
NEW_JUMP_TARGET_LABEL(c, end);
ADDOP_JUMP(c, NO_LOCATION, JUMP, end);
@@ -2885,6 +2889,7 @@ compiler_jump_if(struct compiler *c, location loc,
/* general implementation */
VISIT(c, expr, e);
+ ADDOP(c, LOC(e), TO_BOOL);
ADDOP_JUMP(c, LOC(e), cond ? POP_JUMP_IF_TRUE : POP_JUMP_IF_FALSE, next);
return SUCCESS;
}
@@ -4016,8 +4021,6 @@ unaryop(unaryop_ty op)
switch (op) {
case Invert:
return UNARY_INVERT;
- case Not:
- return UNARY_NOT;
case USub:
return UNARY_NEGATIVE;
default:
@@ -4247,6 +4250,7 @@ compiler_boolop(struct compiler *c, expr_ty e)
for (i = 0; i < n; ++i) {
VISIT(c, expr, (expr_ty)asdl_seq_GET(s, i));
ADDOP_I(c, loc, COPY, 1);
+ ADDOP(c, loc, TO_BOOL);
ADDOP_JUMP(c, loc, jumpi, end);
ADDOP(c, loc, POP_TOP);
}
@@ -4554,6 +4558,7 @@ compiler_compare(struct compiler *c, expr_ty e)
ADDOP_I(c, loc, COPY, 2);
ADDOP_COMPARE(c, loc, asdl_seq_GET(e->v.Compare.ops, i));
ADDOP_I(c, loc, COPY, 1);
+ ADDOP(c, loc, TO_BOOL);
ADDOP_JUMP(c, loc, POP_JUMP_IF_FALSE, cleanup);
ADDOP(c, loc, POP_TOP);
}
@@ -5789,6 +5794,7 @@ compiler_visit_keyword(struct compiler *c, keyword_ty k)
static int
compiler_with_except_finish(struct compiler *c, jump_target_label cleanup) {
NEW_JUMP_TARGET_LABEL(c, suppress);
+ ADDOP(c, NO_LOCATION, TO_BOOL);
ADDOP_JUMP(c, NO_LOCATION, POP_JUMP_IF_TRUE, suppress);
ADDOP_I(c, NO_LOCATION, RERAISE, 2);
@@ -6022,6 +6028,10 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
if (e->v.UnaryOp.op == UAdd) {
ADDOP_I(c, loc, CALL_INTRINSIC_1, INTRINSIC_UNARY_POSITIVE);
}
+ else if (e->v.UnaryOp.op == Not) {
+ ADDOP(c, loc, TO_BOOL);
+ ADDOP(c, loc, UNARY_NOT);
+ }
else {
ADDOP(c, loc, unaryop(e->v.UnaryOp.op));
}
@@ -7197,6 +7207,7 @@ compiler_pattern_value(struct compiler *c, pattern_ty p, pattern_context *pc)
}
VISIT(c, expr, value);
ADDOP_COMPARE(c, LOC(p), Eq);
+ ADDOP(c, LOC(p), TO_BOOL);
RETURN_IF_ERROR(jump_to_fail_pop(c, LOC(p), pc, POP_JUMP_IF_FALSE));
return SUCCESS;
}
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index a64de0c958ce0..ea932232d7522 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -99,18 +99,105 @@
PyObject *value = stack_pointer[-1];
PyObject *res;
#line 282 "Python/bytecodes.c"
- int err = PyObject_IsTrue(value);
- #line 104 "Python/executor_cases.c.h"
- Py_DECREF(value);
- #line 284 "Python/bytecodes.c"
- if (err < 0) goto pop_1_error;
- if (err == 0) {
- res = Py_True;
+ assert(PyBool_Check(value));
+ res = Py_IsFalse(value) ? Py_True : Py_False;
+ #line 105 "Python/executor_cases.c.h"
+ stack_pointer[-1] = res;
+ break;
+ }
+
+ case TO_BOOL_BOOL: {
+ PyObject *value = stack_pointer[-1];
+ #line 314 "Python/bytecodes.c"
+ DEOPT_IF(!PyBool_Check(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ #line 115 "Python/executor_cases.c.h"
+ break;
+ }
+
+ case TO_BOOL_INT: {
+ PyObject *value = stack_pointer[-1];
+ PyObject *res;
+ #line 319 "Python/bytecodes.c"
+ DEOPT_IF(!PyLong_CheckExact(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ if (_PyLong_IsZero((PyLongObject *)value)) {
+ assert(_Py_IsImmortal(value));
+ res = Py_False;
}
else {
+ #line 130 "Python/executor_cases.c.h"
+ Py_DECREF(value);
+ #line 327 "Python/bytecodes.c"
+ res = Py_True;
+ }
+ #line 135 "Python/executor_cases.c.h"
+ stack_pointer[-1] = res;
+ break;
+ }
+
+ case TO_BOOL_LIST: {
+ PyObject *value = stack_pointer[-1];
+ PyObject *res;
+ #line 332 "Python/bytecodes.c"
+ DEOPT_IF(!PyList_CheckExact(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ res = Py_SIZE(value) ? Py_True : Py_False;
+ #line 147 "Python/executor_cases.c.h"
+ Py_DECREF(value);
+ stack_pointer[-1] = res;
+ break;
+ }
+
+ case TO_BOOL_NONE: {
+ PyObject *value = stack_pointer[-1];
+ PyObject *res;
+ #line 339 "Python/bytecodes.c"
+ // This one is a bit weird, because we expect *some* failures:
+ DEOPT_IF(!Py_IsNone(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ res = Py_False;
+ #line 161 "Python/executor_cases.c.h"
+ stack_pointer[-1] = res;
+ break;
+ }
+
+ case TO_BOOL_STR: {
+ PyObject *value = stack_pointer[-1];
+ PyObject *res;
+ #line 346 "Python/bytecodes.c"
+ DEOPT_IF(!PyUnicode_CheckExact(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ if (value == &_Py_STR(empty)) {
+ assert(_Py_IsImmortal(value));
res = Py_False;
}
- #line 114 "Python/executor_cases.c.h"
+ else {
+ assert(Py_SIZE(value));
+ #line 178 "Python/executor_cases.c.h"
+ Py_DECREF(value);
+ #line 355 "Python/bytecodes.c"
+ res = Py_True;
+ }
+ #line 183 "Python/executor_cases.c.h"
+ stack_pointer[-1] = res;
+ break;
+ }
+
+ case TO_BOOL_ALWAYS_TRUE: {
+ PyObject *value = stack_pointer[-1];
+ PyObject *res;
+ uint32_t version = operand;
+ #line 360 "Python/bytecodes.c"
+ // This one is a bit weird, because we expect *some* failures:
+ assert(version);
+ DEOPT_IF(Py_TYPE(value)->tp_version_tag != version, TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ #line 197 "Python/executor_cases.c.h"
+ Py_DECREF(value);
+ #line 365 "Python/bytecodes.c"
+ res = Py_True;
+ #line 201 "Python/executor_cases.c.h"
stack_pointer[-1] = res;
break;
}
@@ -118,13 +205,13 @@
case UNARY_INVERT: {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 294 "Python/bytecodes.c"
+ #line 369 "Python/bytecodes.c"
res = PyNumber_Invert(value);
- #line 124 "Python/executor_cases.c.h"
+ #line 211 "Python/executor_cases.c.h"
Py_DECREF(value);
- #line 296 "Python/bytecodes.c"
+ #line 371 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 128 "Python/executor_cases.c.h"
+ #line 215 "Python/executor_cases.c.h"
stack_pointer[-1] = res;
break;
}
@@ -132,10 +219,10 @@
case _GUARD_BOTH_INT: {
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
- #line 312 "Python/bytecodes.c"
+ #line 387 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- #line 139 "Python/executor_cases.c.h"
+ #line 226 "Python/executor_cases.c.h"
break;
}
@@ -143,13 +230,13 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 317 "Python/bytecodes.c"
+ #line 392 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
res = _PyLong_Multiply((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
if (res == NULL) goto pop_2_error;
- #line 153 "Python/executor_cases.c.h"
+ #line 240 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -159,13 +246,13 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 325 "Python/bytecodes.c"
+ #line 400 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
res = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
if (res == NULL) goto pop_2_error;
- #line 169 "Python/executor_cases.c.h"
+ #line 256 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -175,13 +262,13 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 333 "Python/bytecodes.c"
+ #line 408 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
res = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
if (res == NULL) goto pop_2_error;
- #line 185 "Python/executor_cases.c.h"
+ #line 272 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -190,10 +277,10 @@
case _GUARD_BOTH_FLOAT: {
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
- #line 348 "Python/bytecodes.c"
+ #line 423 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- #line 197 "Python/executor_cases.c.h"
+ #line 284 "Python/executor_cases.c.h"
break;
}
@@ -201,13 +288,13 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 353 "Python/bytecodes.c"
+ #line 428 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
double dres =
((PyFloatObject *)left)->ob_fval *
((PyFloatObject *)right)->ob_fval;
DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
- #line 211 "Python/executor_cases.c.h"
+ #line 298 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -217,13 +304,13 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 361 "Python/bytecodes.c"
+ #line 436 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
double dres =
((PyFloatObject *)left)->ob_fval +
((PyFloatObject *)right)->ob_fval;
DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
- #line 227 "Python/executor_cases.c.h"
+ #line 314 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -233,13 +320,13 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 369 "Python/bytecodes.c"
+ #line 444 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
double dres =
((PyFloatObject *)left)->ob_fval -
((PyFloatObject *)right)->ob_fval;
DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
- #line 243 "Python/executor_cases.c.h"
+ #line 330 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -248,10 +335,10 @@
case _GUARD_BOTH_UNICODE: {
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
- #line 384 "Python/bytecodes.c"
+ #line 459 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
- #line 255 "Python/executor_cases.c.h"
+ #line 342 "Python/executor_cases.c.h"
break;
}
@@ -259,13 +346,13 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 389 "Python/bytecodes.c"
+ #line 464 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
res = PyUnicode_Concat(left, right);
_Py_DECREF_SPECIALIZED(left, _PyUnicode_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
if (res == NULL) goto pop_2_error;
- #line 269 "Python/executor_cases.c.h"
+ #line 356 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -276,7 +363,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *res;
- #line 459 "Python/bytecodes.c"
+ #line 534 "Python/bytecodes.c"
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
// Can't use ERROR_IF() here, because we haven't
// DECREF'ed container yet, and we still own slice.
@@ -289,7 +376,7 @@
}
Py_DECREF(container);
if (res == NULL) goto pop_3_error;
- #line 293 "Python/executor_cases.c.h"
+ #line 380 "Python/executor_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = res;
break;
@@ -300,7 +387,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *v = stack_pointer[-4];
- #line 474 "Python/bytecodes.c"
+ #line 549 "Python/bytecodes.c"
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
int err;
if (slice == NULL) {
@@ -313,7 +400,7 @@
Py_DECREF(v);
Py_DECREF(container);
if (err) goto pop_4_error;
- #line 317 "Python/executor_cases.c.h"
+ #line 404 "Python/executor_cases.c.h"
STACK_SHRINK(4);
break;
}
@@ -322,7 +409,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *res;
- #line 489 "Python/bytecodes.c"
+ #line 564 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), BINARY_SUBSCR);
@@ -336,7 +423,7 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(list);
- #line 340 "Python/executor_cases.c.h"
+ #line 427 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -346,7 +433,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *tuple = stack_pointer[-2];
PyObject *res;
- #line 505 "Python/bytecodes.c"
+ #line 580 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyTuple_CheckExact(tuple), BINARY_SUBSCR);
@@ -360,7 +447,7 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(tuple);
- #line 364 "Python/executor_cases.c.h"
+ #line 451 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -370,7 +457,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *res;
- #line 521 "Python/bytecodes.c"
+ #line 596 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(dict), BINARY_SUBSCR);
STAT_INC(BINARY_SUBSCR, hit);
res = PyDict_GetItemWithError(dict, sub);
@@ -378,14 +465,14 @@
if (!_PyErr_Occurred(tstate)) {
_PyErr_SetKeyError(sub);
}
- #line 382 "Python/executor_cases.c.h"
+ #line 469 "Python/executor_cases.c.h"
Py_DECREF(dict);
Py_DECREF(sub);
- #line 529 "Python/bytecodes.c"
+ #line 604 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
Py_INCREF(res); // Do this before DECREF'ing dict, sub
- #line 389 "Python/executor_cases.c.h"
+ #line 476 "Python/executor_cases.c.h"
Py_DECREF(dict);
Py_DECREF(sub);
STACK_SHRINK(1);
@@ -396,9 +483,9 @@
case LIST_APPEND: {
PyObject *v = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 561 "Python/bytecodes.c"
+ #line 636 "Python/bytecodes.c"
if (_PyList_AppendTakeRef((PyListObject *)list, v) < 0) goto pop_1_error;
- #line 402 "Python/executor_cases.c.h"
+ #line 489 "Python/executor_cases.c.h"
STACK_SHRINK(1);
break;
}
@@ -406,13 +493,13 @@
case SET_ADD: {
PyObject *v = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 565 "Python/bytecodes.c"
+ #line 640 "Python/bytecodes.c"
int err = PySet_Add(set, v);
- #line 412 "Python/executor_cases.c.h"
+ #line 499 "Python/executor_cases.c.h"
Py_DECREF(v);
- #line 567 "Python/bytecodes.c"
+ #line 642 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 416 "Python/executor_cases.c.h"
+ #line 503 "Python/executor_cases.c.h"
STACK_SHRINK(1);
break;
}
@@ -421,7 +508,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 596 "Python/bytecodes.c"
+ #line 671 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), STORE_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), STORE_SUBSCR);
@@ -438,7 +525,7 @@
Py_DECREF(old_value);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(list);
- #line 442 "Python/executor_cases.c.h"
+ #line 529 "Python/executor_cases.c.h"
STACK_SHRINK(3);
break;
}
@@ -447,13 +534,13 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 615 "Python/bytecodes.c"
+ #line 690 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(dict), STORE_SUBSCR);
STAT_INC(STORE_SUBSCR, hit);
int err = _PyDict_SetItem_Take2((PyDictObject *)dict, sub, value);
Py_DECREF(dict);
if (err) goto pop_3_error;
- #line 457 "Python/executor_cases.c.h"
+ #line 544 "Python/executor_cases.c.h"
STACK_SHRINK(3);
break;
}
@@ -461,15 +548,15 @@
case DELETE_SUBSCR: {
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
- #line 623 "Python/bytecodes.c"
+ #line 698 "Python/bytecodes.c"
/* del container[sub] */
int err = PyObject_DelItem(container, sub);
- #line 468 "Python/executor_cases.c.h"
+ #line 555 "Python/executor_cases.c.h"
Py_DECREF(container);
Py_DECREF(sub);
- #line 626 "Python/bytecodes.c"
+ #line 701 "Python/bytecodes.c"
if (err) goto pop_2_error;
- #line 473 "Python/executor_cases.c.h"
+ #line 560 "Python/executor_cases.c.h"
STACK_SHRINK(2);
break;
}
@@ -477,14 +564,14 @@
case CALL_INTRINSIC_1: {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 630 "Python/bytecodes.c"
+ #line 705 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_1);
res = _PyIntrinsics_UnaryFunctions[oparg](tstate, value);
- #line 484 "Python/executor_cases.c.h"
+ #line 571 "Python/executor_cases.c.h"
Py_DECREF(value);
- #line 633 "Python/bytecodes.c"
+ #line 708 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 488 "Python/executor_cases.c.h"
+ #line 575 "Python/executor_cases.c.h"
stack_pointer[-1] = res;
break;
}
@@ -493,15 +580,15 @@
PyObject *value1 = stack_pointer[-1];
PyObject *value2 = stack_pointer[-2];
PyObject *res;
- #line 637 "Python/bytecodes.c"
+ #line 712 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_2);
res = _PyIntrinsics_BinaryFunctions[oparg](tstate, value2, value1);
- #line 500 "Python/executor_cases.c.h"
+ #line 587 "Python/executor_cases.c.h"
Py_DECREF(value2);
Py_DECREF(value1);
- #line 640 "Python/bytecodes.c"
+ #line 715 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 505 "Python/executor_cases.c.h"
+ #line 592 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -510,7 +597,7 @@
case GET_AITER: {
PyObject *obj = stack_pointer[-1];
PyObject *iter;
- #line 745 "Python/bytecodes.c"
+ #line 820 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyTypeObject *type = Py_TYPE(obj);
@@ -523,16 +610,16 @@
"'async for' requires an object with "
"__aiter__ method, got %.100s",
type->tp_name);
- #line 527 "Python/executor_cases.c.h"
+ #line 614 "Python/executor_cases.c.h"
Py_DECREF(obj);
- #line 758 "Python/bytecodes.c"
+ #line 833 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
iter = (*getter)(obj);
- #line 534 "Python/executor_cases.c.h"
+ #line 621 "Python/executor_cases.c.h"
Py_DECREF(obj);
- #line 763 "Python/bytecodes.c"
+ #line 838 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
if (Py_TYPE(iter)->tp_as_async == NULL ||
@@ -545,7 +632,7 @@
Py_DECREF(iter);
if (true) goto pop_1_error;
}
- #line 549 "Python/executor_cases.c.h"
+ #line 636 "Python/executor_cases.c.h"
stack_pointer[-1] = iter;
break;
}
@@ -553,7 +640,7 @@
case GET_ANEXT: {
PyObject *aiter = stack_pointer[-1];
PyObject *awaitable;
- #line 778 "Python/bytecodes.c"
+ #line 853 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyObject *next_iter = NULL;
PyTypeObject *type = Py_TYPE(aiter);
@@ -596,7 +683,7 @@
Py_DECREF(next_iter);
}
}
- #line 600 "Python/executor_cases.c.h"
+ #line 687 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = awaitable;
break;
@@ -605,16 +692,16 @@
case GET_AWAITABLE: {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 823 "Python/bytecodes.c"
+ #line 898 "Python/bytecodes.c"
iter = _PyCoro_GetAwaitableIter(iterable);
if (iter == NULL) {
format_awaitable_error(tstate, Py_TYPE(iterable), oparg);
}
- #line 616 "Python/executor_cases.c.h"
+ #line 703 "Python/executor_cases.c.h"
Py_DECREF(iterable);
- #line 830 "Python/bytecodes.c"
+ #line 905 "Python/bytecodes.c"
if (iter != NULL && PyCoro_CheckExact(iter)) {
PyObject *yf = _PyGen_yf((PyGenObject*)iter);
@@ -631,26 +718,26 @@
}
if (iter == NULL) goto pop_1_error;
- #line 635 "Python/executor_cases.c.h"
+ #line 722 "Python/executor_cases.c.h"
stack_pointer[-1] = iter;
break;
}
case POP_EXCEPT: {
PyObject *exc_value = stack_pointer[-1];
- #line 960 "Python/bytecodes.c"
+ #line 1035 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
Py_XSETREF(exc_info->exc_value, exc_value);
- #line 645 "Python/executor_cases.c.h"
+ #line 732 "Python/executor_cases.c.h"
STACK_SHRINK(1);
break;
}
case LOAD_ASSERTION_ERROR: {
PyObject *value;
- #line 1011 "Python/bytecodes.c"
+ #line 1086 "Python/bytecodes.c"
value = Py_NewRef(PyExc_AssertionError);
- #line 654 "Python/executor_cases.c.h"
+ #line 741 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
break;
@@ -658,7 +745,7 @@
case LOAD_BUILD_CLASS: {
PyObject *bc;
- #line 1015 "Python/bytecodes.c"
+ #line 1090 "Python/bytecodes.c"
if (PyDict_CheckExact(BUILTINS())) {
bc = _PyDict_GetItemWithError(BUILTINS(),
&_Py_ID(__build_class__));
@@ -680,7 +767,7 @@
if (true) goto error;
}
}
- #line 684 "Python/executor_cases.c.h"
+ #line 771 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = bc;
break;
@@ -688,33 +775,33 @@
case STORE_NAME: {
PyObject *v = stack_pointer[-1];
- #line 1040 "Python/bytecodes.c"
+ #line 1115 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
PyObject *ns = LOCALS();
int err;
if (ns == NULL) {
_PyErr_Format(tstate, PyExc_SystemError,
"no locals found when storing %R", name);
- #line 699 "Python/executor_cases.c.h"
+ #line 786 "Python/executor_cases.c.h"
Py_DECREF(v);
- #line 1047 "Python/bytecodes.c"
+ #line 1122 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
if (PyDict_CheckExact(ns))
err = PyDict_SetItem(ns, name, v);
else
err = PyObject_SetItem(ns, name, v);
- #line 708 "Python/executor_cases.c.h"
+ #line 795 "Python/executor_cases.c.h"
Py_DECREF(v);
- #line 1054 "Python/bytecodes.c"
+ #line 1129 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 712 "Python/executor_cases.c.h"
+ #line 799 "Python/executor_cases.c.h"
STACK_SHRINK(1);
break;
}
case DELETE_NAME: {
- #line 1058 "Python/bytecodes.c"
+ #line 1133 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
PyObject *ns = LOCALS();
int err;
@@ -731,21 +818,21 @@
name);
goto error;
}
- #line 735 "Python/executor_cases.c.h"
+ #line 822 "Python/executor_cases.c.h"
break;
}
case UNPACK_SEQUENCE_TWO_TUPLE: {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1101 "Python/bytecodes.c"
+ #line 1176 "Python/bytecodes.c"
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != 2, UNPACK_SEQUENCE);
assert(oparg == 2);
STAT_INC(UNPACK_SEQUENCE, hit);
values[0] = Py_NewRef(PyTuple_GET_ITEM(seq, 1));
values[1] = Py_NewRef(PyTuple_GET_ITEM(seq, 0));
- #line 749 "Python/executor_cases.c.h"
+ #line 836 "Python/executor_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -755,7 +842,7 @@
case UNPACK_SEQUENCE_TUPLE: {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1111 "Python/bytecodes.c"
+ #line 1186 "Python/bytecodes.c"
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -763,7 +850,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 767 "Python/executor_cases.c.h"
+ #line 854 "Python/executor_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -773,7 +860,7 @@
case UNPACK_SEQUENCE_LIST: {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1122 "Python/bytecodes.c"
+ #line 1197 "Python/bytecodes.c"
DEOPT_IF(!PyList_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyList_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -781,7 +868,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 785 "Python/executor_cases.c.h"
+ #line 872 "Python/executor_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -790,49 +877,49 @@
case UNPACK_EX: {
PyObject *seq = stack_pointer[-1];
- #line 1133 "Python/bytecodes.c"
+ #line 1208 "Python/bytecodes.c"
int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8);
PyObject **top = stack_pointer + totalargs - 1;
int res = unpack_iterable(tstate, seq, oparg & 0xFF, oparg >> 8, top);
- #line 798 "Python/executor_cases.c.h"
+ #line 885 "Python/executor_cases.c.h"
Py_DECREF(seq);
- #line 1137 "Python/bytecodes.c"
+ #line 1212 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
- #line 802 "Python/executor_cases.c.h"
+ #line 889 "Python/executor_cases.c.h"
STACK_GROW((oparg & 0xFF) + (oparg >> 8));
break;
}
case DELETE_ATTR: {
PyObject *owner = stack_pointer[-1];
- #line 1168 "Python/bytecodes.c"
+ #line 1243 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err = PyObject_SetAttr(owner, name, (PyObject *)NULL);
- #line 812 "Python/executor_cases.c.h"
+ #line 899 "Python/executor_cases.c.h"
Py_DECREF(owner);
- #line 1171 "Python/bytecodes.c"
+ #line 1246 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 816 "Python/executor_cases.c.h"
+ #line 903 "Python/executor_cases.c.h"
STACK_SHRINK(1);
break;
}
case STORE_GLOBAL: {
PyObject *v = stack_pointer[-1];
- #line 1175 "Python/bytecodes.c"
+ #line 1250 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err = PyDict_SetItem(GLOBALS(), name, v);
- #line 826 "Python/executor_cases.c.h"
+ #line 913 "Python/executor_cases.c.h"
Py_DECREF(v);
- #line 1178 "Python/bytecodes.c"
+ #line 1253 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 830 "Python/executor_cases.c.h"
+ #line 917 "Python/executor_cases.c.h"
STACK_SHRINK(1);
break;
}
case DELETE_GLOBAL: {
- #line 1182 "Python/bytecodes.c"
+ #line 1257 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err;
err = PyDict_DelItem(GLOBALS(), name);
@@ -844,13 +931,13 @@
}
goto error;
}
- #line 848 "Python/executor_cases.c.h"
+ #line 935 "Python/executor_cases.c.h"
break;
}
case _LOAD_LOCALS: {
PyObject *locals;
- #line 1196 "Python/bytecodes.c"
+ #line 1271 "Python/bytecodes.c"
locals = LOCALS();
if (locals == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -858,7 +945,7 @@
if (true) goto error;
}
Py_INCREF(locals);
- #line 862 "Python/executor_cases.c.h"
+ #line 949 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = locals;
break;
@@ -867,7 +954,7 @@
case _LOAD_FROM_DICT_OR_GLOBALS: {
PyObject *mod_or_class_dict = stack_pointer[-1];
PyObject *v;
- #line 1208 "Python/bytecodes.c"
+ #line 1283 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
if (PyDict_CheckExact(mod_or_class_dict)) {
v = PyDict_GetItemWithError(mod_or_class_dict, name);
@@ -924,13 +1011,13 @@
}
}
}
- #line 928 "Python/executor_cases.c.h"
+ #line 1015 "Python/executor_cases.c.h"
stack_pointer[-1] = v;
break;
}
case DELETE_DEREF: {
- #line 1378 "Python/bytecodes.c"
+ #line 1453 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
// Can't use ERROR_IF here.
@@ -941,14 +1028,14 @@
}
PyCell_SET(cell, NULL);
Py_DECREF(oldobj);
- #line 945 "Python/executor_cases.c.h"
+ #line 1032 "Python/executor_cases.c.h"
break;
}
case LOAD_FROM_DICT_OR_DEREF: {
PyObject *class_dict = stack_pointer[-1];
PyObject *value;
- #line 1391 "Python/bytecodes.c"
+ #line 1466 "Python/bytecodes.c"
PyObject *name;
assert(class_dict);
assert(oparg >= 0 && oparg < _PyFrame_GetCode(frame)->co_nlocalsplus);
@@ -983,14 +1070,14 @@
}
Py_INCREF(value);
}
- #line 987 "Python/executor_cases.c.h"
+ #line 1074 "Python/executor_cases.c.h"
stack_pointer[-1] = value;
break;
}
case LOAD_DEREF: {
PyObject *value;
- #line 1428 "Python/bytecodes.c"
+ #line 1503 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
value = PyCell_GET(cell);
if (value == NULL) {
@@ -998,7 +1085,7 @@
if (true) goto error;
}
Py_INCREF(value);
- #line 1002 "Python/executor_cases.c.h"
+ #line 1089 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
break;
@@ -1006,18 +1093,18 @@
case STORE_DEREF: {
PyObject *v = stack_pointer[-1];
- #line 1438 "Python/bytecodes.c"
+ #line 1513 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
PyCell_SET(cell, v);
Py_XDECREF(oldobj);
- #line 1015 "Python/executor_cases.c.h"
+ #line 1102 "Python/executor_cases.c.h"
STACK_SHRINK(1);
break;
}
case COPY_FREE_VARS: {
- #line 1445 "Python/bytecodes.c"
+ #line 1520 "Python/bytecodes.c"
/* Copy closure variables to free variables */
PyCodeObject *co = _PyFrame_GetCode(frame);
assert(PyFunction_Check(frame->f_funcobj));
@@ -1028,22 +1115,22 @@
PyObject *o = PyTuple_GET_ITEM(closure, i);
frame->localsplus[offset + i] = Py_NewRef(o);
}
- #line 1032 "Python/executor_cases.c.h"
+ #line 1119 "Python/executor_cases.c.h"
break;
}
case BUILD_STRING: {
PyObject **pieces = (stack_pointer - oparg);
PyObject *str;
- #line 1458 "Python/bytecodes.c"
+ #line 1533 "Python/bytecodes.c"
str = _PyUnicode_JoinArray(&_Py_STR(empty), pieces, oparg);
- #line 1041 "Python/executor_cases.c.h"
+ #line 1128 "Python/executor_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(pieces[_i]);
}
- #line 1460 "Python/bytecodes.c"
+ #line 1535 "Python/bytecodes.c"
if (str == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 1047 "Python/executor_cases.c.h"
+ #line 1134 "Python/executor_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = str;
@@ -1053,10 +1140,10 @@
case BUILD_TUPLE: {
PyObject **values = (stack_pointer - oparg);
PyObject *tup;
- #line 1464 "Python/bytecodes.c"
+ #line 1539 "Python/bytecodes.c"
tup = _PyTuple_FromArraySteal(values, oparg);
if (tup == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 1060 "Python/executor_cases.c.h"
+ #line 1147 "Python/executor_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = tup;
@@ -1066,10 +1153,10 @@
case BUILD_LIST: {
PyObject **values = (stack_pointer - oparg);
PyObject *list;
- #line 1469 "Python/bytecodes.c"
+ #line 1544 "Python/bytecodes.c"
list = _PyList_FromArraySteal(values, oparg);
if (list == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 1073 "Python/executor_cases.c.h"
+ #line 1160 "Python/executor_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = list;
@@ -1079,7 +1166,7 @@
case LIST_EXTEND: {
PyObject *iterable = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 1474 "Python/bytecodes.c"
+ #line 1549 "Python/bytecodes.c"
PyObject *none_val = _PyList_Extend((PyListObject *)list, iterable);
if (none_val == NULL) {
if (_PyErr_ExceptionMatches(tstate, PyExc_TypeError) &&
@@ -1090,13 +1177,13 @@
"Value after * must be an iterable, not %.200s",
Py_TYPE(iterable)->tp_name);
}
- #line 1094 "Python/executor_cases.c.h"
+ #line 1181 "Python/executor_cases.c.h"
Py_DECREF(iterable);
- #line 1485 "Python/bytecodes.c"
+ #line 1560 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
assert(Py_IsNone(none_val));
- #line 1100 "Python/executor_cases.c.h"
+ #line 1187 "Python/executor_cases.c.h"
Py_DECREF(iterable);
STACK_SHRINK(1);
break;
@@ -1105,13 +1192,13 @@
case SET_UPDATE: {
PyObject *iterable = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 1492 "Python/bytecodes.c"
+ #line 1567 "Python/bytecodes.c"
int err = _PySet_Update(set, iterable);
- #line 1111 "Python/executor_cases.c.h"
+ #line 1198 "Python/executor_cases.c.h"
Py_DECREF(iterable);
- #line 1494 "Python/bytecodes.c"
+ #line 1569 "Python/bytecodes.c"
if (err < 0) goto pop_1_error;
- #line 1115 "Python/executor_cases.c.h"
+ #line 1202 "Python/executor_cases.c.h"
STACK_SHRINK(1);
break;
}
@@ -1119,7 +1206,7 @@
case BUILD_SET: {
PyObject **values = (stack_pointer - oparg);
PyObject *set;
- #line 1498 "Python/bytecodes.c"
+ #line 1573 "Python/bytecodes.c"
set = PySet_New(NULL);
if (set == NULL)
goto error;
@@ -1134,7 +1221,7 @@
Py_DECREF(set);
if (true) { STACK_SHRINK(oparg); goto error; }
}
- #line 1138 "Python/executor_cases.c.h"
+ #line 1225 "Python/executor_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = set;
@@ -1144,7 +1231,7 @@
case BUILD_MAP: {
PyObject **values = (stack_pointer - oparg*2);
PyObject *map;
- #line 1515 "Python/bytecodes.c"
+ #line 1590 "Python/bytecodes.c"
map = _PyDict_FromItems(
values, 2,
values+1, 2,
@@ -1152,13 +1239,13 @@
if (map == NULL)
goto error;
- #line 1156 "Python/executor_cases.c.h"
+ #line 1243 "Python/executor_cases.c.h"
for (int _i = oparg*2; --_i >= 0;) {
Py_DECREF(values[_i]);
}
- #line 1523 "Python/bytecodes.c"
+ #line 1598 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg*2); goto error; }
- #line 1162 "Python/executor_cases.c.h"
+ #line 1249 "Python/executor_cases.c.h"
STACK_SHRINK(oparg*2);
STACK_GROW(1);
stack_pointer[-1] = map;
@@ -1166,7 +1253,7 @@
}
case SETUP_ANNOTATIONS: {
- #line 1527 "Python/bytecodes.c"
+ #line 1602 "Python/bytecodes.c"
int err;
PyObject *ann_dict;
if (LOCALS() == NULL) {
@@ -1206,7 +1293,7 @@
Py_DECREF(ann_dict);
}
}
- #line 1210 "Python/executor_cases.c.h"
+ #line 1297 "Python/executor_cases.c.h"
break;
}
@@ -1214,7 +1301,7 @@
PyObject *keys = stack_pointer[-1];
PyObject **values = (stack_pointer - (1 + oparg));
PyObject *map;
- #line 1569 "Python/bytecodes.c"
+ #line 1644 "Python/bytecodes.c"
if (!PyTuple_CheckExact(keys) ||
PyTuple_GET_SIZE(keys) != (Py_ssize_t)oparg) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -1224,14 +1311,14 @@
map = _PyDict_FromItems(
&PyTuple_GET_ITEM(keys, 0), 1,
values, 1, oparg);
- #line 1228 "Python/executor_cases.c.h"
+ #line 1315 "Python/executor_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(values[_i]);
}
Py_DECREF(keys);
- #line 1579 "Python/bytecodes.c"
+ #line 1654 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg); goto pop_1_error; }
- #line 1235 "Python/executor_cases.c.h"
+ #line 1322 "Python/executor_cases.c.h"
STACK_SHRINK(oparg);
stack_pointer[-1] = map;
break;
@@ -1239,7 +1326,7 @@
case DICT_UPDATE: {
PyObject *update = stack_pointer[-1];
- #line 1583 "Python/bytecodes.c"
+ #line 1658 "Python/bytecodes.c"
PyObject *dict = PEEK(oparg + 1); // update is still on the stack
if (PyDict_Update(dict, update) < 0) {
if (_PyErr_ExceptionMatches(tstate, PyExc_AttributeError)) {
@@ -1247,12 +1334,12 @@
"'%.200s' object is not a mapping",
Py_TYPE(update)->tp_name);
}
- #line 1251 "Python/executor_cases.c.h"
+ #line 1338 "Python/executor_cases.c.h"
Py_DECREF(update);
- #line 1591 "Python/bytecodes.c"
+ #line 1666 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 1256 "Python/executor_cases.c.h"
+ #line 1343 "Python/executor_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
break;
@@ -1260,17 +1347,17 @@
case DICT_MERGE: {
PyObject *update = stack_pointer[-1];
- #line 1597 "Python/bytecodes.c"
+ #line 1672 "Python/bytecodes.c"
PyObject *dict = PEEK(oparg + 1); // update is still on the stack
if (_PyDict_MergeEx(dict, update, 2) < 0) {
format_kwargs_error(tstate, PEEK(3 + oparg), update);
- #line 1269 "Python/executor_cases.c.h"
+ #line 1356 "Python/executor_cases.c.h"
Py_DECREF(update);
- #line 1602 "Python/bytecodes.c"
+ #line 1677 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 1274 "Python/executor_cases.c.h"
+ #line 1361 "Python/executor_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
break;
@@ -1279,13 +1366,13 @@
case MAP_ADD: {
PyObject *value = stack_pointer[-1];
PyObject *key = stack_pointer[-2];
- #line 1608 "Python/bytecodes.c"
+ #line 1683 "Python/bytecodes.c"
PyObject *dict = PEEK(oparg + 2); // key, value are still on the stack
assert(PyDict_CheckExact(dict));
/* dict[key] = value */
// Do not DECREF INPUTS because the function steals the references
if (_PyDict_SetItem_Take2((PyDictObject *)dict, key, value) != 0) goto pop_2_error;
- #line 1289 "Python/executor_cases.c.h"
+ #line 1376 "Python/executor_cases.c.h"
STACK_SHRINK(2);
break;
}
@@ -1296,20 +1383,20 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1691 "Python/bytecodes.c"
+ #line 1766 "Python/bytecodes.c"
assert(!(oparg & 1));
DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
STAT_INC(LOAD_SUPER_ATTR, hit);
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 2);
res = _PySuper_Lookup((PyTypeObject *)class, self, name, NULL);
- #line 1307 "Python/executor_cases.c.h"
+ #line 1394 "Python/executor_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1698 "Python/bytecodes.c"
+ #line 1773 "Python/bytecodes.c"
if (res == NULL) goto pop_3_error;
- #line 1313 "Python/executor_cases.c.h"
+ #line 1400 "Python/executor_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -1323,7 +1410,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2;
PyObject *res;
- #line 1702 "Python/bytecodes.c"
+ #line 1777 "Python/bytecodes.c"
assert(oparg & 1);
DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
@@ -1346,7 +1433,7 @@
res = res2;
res2 = NULL;
}
- #line 1350 "Python/executor_cases.c.h"
+ #line 1437 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
stack_pointer[-2] = res2;
@@ -1357,7 +1444,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2034 "Python/bytecodes.c"
+ #line 2115 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyFloat_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -1368,7 +1455,8 @@
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 1372 "Python/executor_cases.c.h"
+ // It's always a bool, so we don't care about oparg & 16.
+ #line 1460 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -1378,7 +1466,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2048 "Python/bytecodes.c"
+ #line 2130 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyLong_CheckExact(right), COMPARE_OP);
DEOPT_IF(!_PyLong_IsCompact((PyLongObject *)left), COMPARE_OP);
@@ -1393,7 +1481,8 @@
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 1397 "Python/executor_cases.c.h"
+ // It's always a bool, so we don't care about oparg & 16.
+ #line 1486 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -1403,19 +1492,20 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2066 "Python/bytecodes.c"
+ #line 2149 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
int eq = _PyUnicode_Equal(left, right);
- assert((oparg >>4) == Py_EQ || (oparg >>4) == Py_NE);
+ assert((oparg >> 5) == Py_EQ || (oparg >> 5) == Py_NE);
_Py_DECREF_SPECIALIZED(left, _PyUnicode_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
assert(eq == 0 || eq == 1);
assert((oparg & 0xf) == COMPARISON_NOT_EQUALS || (oparg & 0xf) == COMPARISON_EQUALS);
assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS);
res = ((COMPARISON_NOT_EQUALS + eq) & oparg) ? Py_True : Py_False;
- #line 1419 "Python/executor_cases.c.h"
+ // It's always a bool, so we don't care about oparg & 16.
+ #line 1509 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -1425,14 +1515,14 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2080 "Python/bytecodes.c"
+ #line 2164 "Python/bytecodes.c"
int res = Py_Is(left, right) ^ oparg;
- #line 1431 "Python/executor_cases.c.h"
+ #line 1521 "Python/executor_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2082 "Python/bytecodes.c"
+ #line 2166 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 1436 "Python/executor_cases.c.h"
+ #line 1526 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
break;
@@ -1442,15 +1532,15 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2086 "Python/bytecodes.c"
+ #line 2170 "Python/bytecodes.c"
int res = PySequence_Contains(right, left);
- #line 1448 "Python/executor_cases.c.h"
+ #line 1538 "Python/executor_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2088 "Python/bytecodes.c"
+ #line 2172 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
b = (res ^ oparg) ? Py_True : Py_False;
- #line 1454 "Python/executor_cases.c.h"
+ #line 1544 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
break;
@@ -1461,12 +1551,12 @@
PyObject *exc_value = stack_pointer[-2];
PyObject *rest;
PyObject *match;
- #line 2093 "Python/bytecodes.c"
+ #line 2177 "Python/bytecodes.c"
if (check_except_star_type_valid(tstate, match_type) < 0) {
- #line 1467 "Python/executor_cases.c.h"
+ #line 1557 "Python/executor_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2095 "Python/bytecodes.c"
+ #line 2179 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
@@ -1474,10 +1564,10 @@
rest = NULL;
int res = exception_group_match(exc_value, match_type,
&match, &rest);
- #line 1478 "Python/executor_cases.c.h"
+ #line 1568 "Python/executor_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2103 "Python/bytecodes.c"
+ #line 2187 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
assert((match == NULL) == (rest == NULL));
@@ -1486,7 +1576,7 @@
if (!Py_IsNone(match)) {
PyErr_SetHandledException(match);
}
- #line 1490 "Python/executor_cases.c.h"
+ #line 1580 "Python/executor_cases.c.h"
stack_pointer[-1] = match;
stack_pointer[-2] = rest;
break;
@@ -1496,21 +1586,21 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2114 "Python/bytecodes.c"
+ #line 2198 "Python/bytecodes.c"
assert(PyExceptionInstance_Check(left));
if (check_except_type_valid(tstate, right) < 0) {
- #line 1503 "Python/executor_cases.c.h"
+ #line 1593 "Python/executor_cases.c.h"
Py_DECREF(right);
- #line 2117 "Python/bytecodes.c"
+ #line 2201 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
int res = PyErr_GivenExceptionMatches(left, right);
- #line 1510 "Python/executor_cases.c.h"
+ #line 1600 "Python/executor_cases.c.h"
Py_DECREF(right);
- #line 2122 "Python/bytecodes.c"
+ #line 2206 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 1514 "Python/executor_cases.c.h"
+ #line 1604 "Python/executor_cases.c.h"
stack_pointer[-1] = b;
break;
}
@@ -1518,13 +1608,13 @@
case GET_LEN: {
PyObject *obj = stack_pointer[-1];
PyObject *len_o;
- #line 2243 "Python/bytecodes.c"
+ #line 2305 "Python/bytecodes.c"
// PUSH(len(TOS))
Py_ssize_t len_i = PyObject_Length(obj);
if (len_i < 0) goto error;
len_o = PyLong_FromSsize_t(len_i);
if (len_o == NULL) goto error;
- #line 1528 "Python/executor_cases.c.h"
+ #line 1618 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = len_o;
break;
@@ -1535,16 +1625,16 @@
PyObject *type = stack_pointer[-2];
PyObject *subject = stack_pointer[-3];
PyObject *attrs;
- #line 2251 "Python/bytecodes.c"
+ #line 2313 "Python/bytecodes.c"
// Pop TOS and TOS1. Set TOS to a tuple of attributes on success, or
// None on failure.
assert(PyTuple_CheckExact(names));
attrs = match_class(tstate, subject, type, oparg, names);
- #line 1544 "Python/executor_cases.c.h"
+ #line 1634 "Python/executor_cases.c.h"
Py_DECREF(subject);
Py_DECREF(type);
Py_DECREF(names);
- #line 2256 "Python/bytecodes.c"
+ #line 2318 "Python/bytecodes.c"
if (attrs) {
assert(PyTuple_CheckExact(attrs)); // Success!
}
@@ -1552,7 +1642,7 @@
if (_PyErr_Occurred(tstate)) goto pop_3_error;
attrs = Py_None; // Failure!
}
- #line 1556 "Python/executor_cases.c.h"
+ #line 1646 "Python/executor_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = attrs;
break;
@@ -1561,10 +1651,10 @@
case MATCH_MAPPING: {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2266 "Python/bytecodes.c"
+ #line 2328 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
res = match ? Py_True : Py_False;
- #line 1568 "Python/executor_cases.c.h"
+ #line 1658 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
break;
@@ -1573,10 +1663,10 @@
case MATCH_SEQUENCE: {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2271 "Python/bytecodes.c"
+ #line 2333 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
res = match ? Py_True : Py_False;
- #line 1580 "Python/executor_cases.c.h"
+ #line 1670 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
break;
@@ -1586,11 +1676,11 @@
PyObject *keys = stack_pointer[-1];
PyObject *subject = stack_pointer[-2];
PyObject *values_or_none;
- #line 2276 "Python/bytecodes.c"
+ #line 2338 "Python/bytecodes.c"
// On successful match, PUSH(values). Otherwise, PUSH(None).
values_or_none = match_keys(tstate, subject, keys);
if (values_or_none == NULL) goto error;
- #line 1594 "Python/executor_cases.c.h"
+ #line 1684 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = values_or_none;
break;
@@ -1599,14 +1689,14 @@
case GET_ITER: {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2282 "Python/bytecodes.c"
+ #line 2344 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
iter = PyObject_GetIter(iterable);
- #line 1606 "Python/executor_cases.c.h"
+ #line 1696 "Python/executor_cases.c.h"
Py_DECREF(iterable);
- #line 2285 "Python/bytecodes.c"
+ #line 2347 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
- #line 1610 "Python/executor_cases.c.h"
+ #line 1700 "Python/executor_cases.c.h"
stack_pointer[-1] = iter;
break;
}
@@ -1614,7 +1704,7 @@
case GET_YIELD_FROM_ITER: {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2289 "Python/bytecodes.c"
+ #line 2351 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
if (PyCoro_CheckExact(iterable)) {
/* `iterable` is a coroutine */
@@ -1637,11 +1727,11 @@
if (iter == NULL) {
goto error;
}
- #line 1641 "Python/executor_cases.c.h"
+ #line 1731 "Python/executor_cases.c.h"
Py_DECREF(iterable);
- #line 2312 "Python/bytecodes.c"
+ #line 2374 "Python/bytecodes.c"
}
- #line 1645 "Python/executor_cases.c.h"
+ #line 1735 "Python/executor_cases.c.h"
stack_pointer[-1] = iter;
break;
}
@@ -1651,7 +1741,7 @@
PyObject *lasti = stack_pointer[-3];
PyObject *exit_func = stack_pointer[-4];
PyObject *res;
- #line 2544 "Python/bytecodes.c"
+ #line 2606 "Python/bytecodes.c"
/* At the top of the stack are 4 values:
- val: TOP = exc_info()
- unused: SECOND = previous exception
@@ -1672,7 +1762,7 @@
res = PyObject_Vectorcall(exit_func, stack + 1,
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL) goto error;
- #line 1676 "Python/executor_cases.c.h"
+ #line 1766 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
break;
@@ -1681,7 +1771,7 @@
case PUSH_EXC_INFO: {
PyObject *new_exc = stack_pointer[-1];
PyObject *prev_exc;
- #line 2583 "Python/bytecodes.c"
+ #line 2645 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
if (exc_info->exc_value != NULL) {
prev_exc = exc_info->exc_value;
@@ -1691,7 +1781,7 @@
}
assert(PyExceptionInstance_Check(new_exc));
exc_info->exc_value = Py_NewRef(new_exc);
- #line 1695 "Python/executor_cases.c.h"
+ #line 1785 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = new_exc;
stack_pointer[-2] = prev_exc;
@@ -1700,7 +1790,7 @@
case EXIT_INIT_CHECK: {
PyObject *should_be_none = stack_pointer[-1];
- #line 2952 "Python/bytecodes.c"
+ #line 3014 "Python/bytecodes.c"
assert(STACK_LEVEL() == 2);
if (should_be_none != Py_None) {
PyErr_Format(PyExc_TypeError,
@@ -1708,7 +1798,7 @@
Py_TYPE(should_be_none)->tp_name);
goto error;
}
- #line 1712 "Python/executor_cases.c.h"
+ #line 1802 "Python/executor_cases.c.h"
STACK_SHRINK(1);
break;
}
@@ -1716,7 +1806,7 @@
case MAKE_FUNCTION: {
PyObject *codeobj = stack_pointer[-1];
PyObject *func;
- #line 3366 "Python/bytecodes.c"
+ #line 3428 "Python/bytecodes.c"
PyFunctionObject *func_obj = (PyFunctionObject *)
PyFunction_New(codeobj, GLOBALS());
@@ -1728,7 +1818,7 @@
func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
func = (PyObject *)func_obj;
- #line 1732 "Python/executor_cases.c.h"
+ #line 1822 "Python/executor_cases.c.h"
stack_pointer[-1] = func;
break;
}
@@ -1736,7 +1826,7 @@
case SET_FUNCTION_ATTRIBUTE: {
PyObject *func = stack_pointer[-1];
PyObject *attr = stack_pointer[-2];
- #line 3380 "Python/bytecodes.c"
+ #line 3442 "Python/bytecodes.c"
assert(PyFunction_Check(func));
PyFunctionObject *func_obj = (PyFunctionObject *)func;
switch(oparg) {
@@ -1761,7 +1851,7 @@
default:
Py_UNREACHABLE();
}
- #line 1765 "Python/executor_cases.c.h"
+ #line 1855 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = func;
break;
@@ -1772,15 +1862,15 @@
PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
PyObject *slice;
- #line 3430 "Python/bytecodes.c"
+ #line 3492 "Python/bytecodes.c"
slice = PySlice_New(start, stop, step);
- #line 1778 "Python/executor_cases.c.h"
+ #line 1868 "Python/executor_cases.c.h"
Py_DECREF(start);
Py_DECREF(stop);
Py_XDECREF(step);
- #line 3432 "Python/bytecodes.c"
+ #line 3494 "Python/bytecodes.c"
if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
- #line 1784 "Python/executor_cases.c.h"
+ #line 1874 "Python/executor_cases.c.h"
STACK_SHRINK(((oparg == 3) ? 1 : 0));
STACK_SHRINK(1);
stack_pointer[-1] = slice;
@@ -1790,14 +1880,14 @@
case CONVERT_VALUE: {
PyObject *value = stack_pointer[-1];
PyObject *result;
- #line 3436 "Python/bytecodes.c"
+ #line 3498 "Python/bytecodes.c"
convertion_func_ptr conv_fn;
assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
conv_fn = CONVERSION_FUNCTIONS[oparg];
result = conv_fn(value);
Py_DECREF(value);
if (result == NULL) goto pop_1_error;
- #line 1801 "Python/executor_cases.c.h"
+ #line 1891 "Python/executor_cases.c.h"
stack_pointer[-1] = result;
break;
}
@@ -1805,7 +1895,7 @@
case FORMAT_SIMPLE: {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 3445 "Python/bytecodes.c"
+ #line 3507 "Python/bytecodes.c"
/* If value is a unicode object, then we know the result
* of format(value) is value itself. */
if (!PyUnicode_CheckExact(value)) {
@@ -1816,7 +1906,7 @@
else {
res = value;
}
- #line 1820 "Python/executor_cases.c.h"
+ #line 1910 "Python/executor_cases.c.h"
stack_pointer[-1] = res;
break;
}
@@ -1825,12 +1915,12 @@
PyObject *fmt_spec = stack_pointer[-1];
PyObject *value = stack_pointer[-2];
PyObject *res;
- #line 3458 "Python/bytecodes.c"
+ #line 3520 "Python/bytecodes.c"
res = PyObject_Format(value, fmt_spec);
Py_DECREF(value);
Py_DECREF(fmt_spec);
if (res == NULL) goto pop_2_error;
- #line 1834 "Python/executor_cases.c.h"
+ #line 1924 "Python/executor_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
break;
@@ -1839,10 +1929,10 @@
case COPY: {
PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
PyObject *top;
- #line 3465 "Python/bytecodes.c"
+ #line 3527 "Python/bytecodes.c"
assert(oparg > 0);
top = Py_NewRef(bottom);
- #line 1846 "Python/executor_cases.c.h"
+ #line 1936 "Python/executor_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = top;
break;
@@ -1851,9 +1941,9 @@
case SWAP: {
PyObject *top = stack_pointer[-1];
PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
- #line 3490 "Python/bytecodes.c"
+ #line 3552 "Python/bytecodes.c"
assert(oparg >= 2);
- #line 1857 "Python/executor_cases.c.h"
+ #line 1947 "Python/executor_cases.c.h"
stack_pointer[-1] = bottom;
stack_pointer[-(2 + (oparg-2))] = top;
break;
diff --git a/Python/flowgraph.c b/Python/flowgraph.c
index d78fb92e0d67d..429109b74beab 100644
--- a/Python/flowgraph.c
+++ b/Python/flowgraph.c
@@ -1044,6 +1044,36 @@ get_const_value(int opcode, int oparg, PyObject *co_consts)
return Py_NewRef(constant);
}
+// Steals a reference to newconst.
+static int
+add_const(PyObject *newconst, PyObject *consts, PyObject *const_cache)
+{
+ if (_PyCompile_ConstCacheMergeOne(const_cache, &newconst) < 0) {
+ Py_DECREF(newconst);
+ return -1;
+ }
+
+ Py_ssize_t index;
+ for (index = 0; index < PyList_GET_SIZE(consts); index++) {
+ if (PyList_GET_ITEM(consts, index) == newconst) {
+ break;
+ }
+ }
+ if (index == PyList_GET_SIZE(consts)) {
+ if ((size_t)index >= (size_t)INT_MAX - 1) {
+ PyErr_SetString(PyExc_OverflowError, "too many constants");
+ Py_DECREF(newconst);
+ return -1;
+ }
+ if (PyList_Append(consts, newconst)) {
+ Py_DECREF(newconst);
+ return -1;
+ }
+ }
+ Py_DECREF(newconst);
+ return (int)index;
+}
+
/* Replace LOAD_CONST c1, LOAD_CONST c2 ... LOAD_CONST cn, BUILD_TUPLE n
with LOAD_CONST (c1, c2, ... cn).
The consts table must still be in list form so that the
@@ -1081,33 +1111,14 @@ fold_tuple_on_constants(PyObject *const_cache,
}
PyTuple_SET_ITEM(newconst, i, constant);
}
- if (_PyCompile_ConstCacheMergeOne(const_cache, &newconst) < 0) {
- Py_DECREF(newconst);
+ int index = add_const(newconst, consts, const_cache);
+ if (index < 0) {
return ERROR;
}
-
- Py_ssize_t index;
- for (index = 0; index < PyList_GET_SIZE(consts); index++) {
- if (PyList_GET_ITEM(consts, index) == newconst) {
- break;
- }
- }
- if (index == PyList_GET_SIZE(consts)) {
- if ((size_t)index >= (size_t)INT_MAX - 1) {
- Py_DECREF(newconst);
- PyErr_SetString(PyExc_OverflowError, "too many constants");
- return ERROR;
- }
- if (PyList_Append(consts, newconst)) {
- Py_DECREF(newconst);
- return ERROR;
- }
- }
- Py_DECREF(newconst);
for (int i = 0; i < n; i++) {
INSTR_SET_OP0(&inst[i], NOP);
}
- INSTR_SET_OP1(&inst[n], LOAD_CONST, (int)index);
+ INSTR_SET_OP1(&inst[n], LOAD_CONST, index);
return SUCCESS;
}
@@ -1361,24 +1372,71 @@ optimize_basic_block(PyObject *const_cache, basicblock *bb, PyObject *consts)
}
break;
case IS_OP:
+ // Fold to POP_JUMP_IF_NONE:
+ // - LOAD_CONST(None) IS_OP(0) POP_JUMP_IF_TRUE
+ // - LOAD_CONST(None) IS_OP(1) POP_JUMP_IF_FALSE
+ // - LOAD_CONST(None) IS_OP(0) TO_BOOL POP_JUMP_IF_TRUE
+ // - LOAD_CONST(None) IS_OP(1) TO_BOOL POP_JUMP_IF_FALSE
+ // Fold to POP_JUMP_IF_NOT_NONE:
+ // - LOAD_CONST(None) IS_OP(0) POP_JUMP_IF_FALSE
+ // - LOAD_CONST(None) IS_OP(1) POP_JUMP_IF_TRUE
+ // - LOAD_CONST(None) IS_OP(0) TO_BOOL POP_JUMP_IF_FALSE
+ // - LOAD_CONST(None) IS_OP(1) TO_BOOL POP_JUMP_IF_TRUE
cnt = get_const_value(opcode, oparg, consts);
if (cnt == NULL) {
goto error;
}
- int jump_op = i+2 < bb->b_iused ? bb->b_instr[i+2].i_opcode : 0;
- if (Py_IsNone(cnt) && (jump_op == POP_JUMP_IF_FALSE || jump_op == POP_JUMP_IF_TRUE)) {
- unsigned char nextarg = bb->b_instr[i+1].i_oparg;
- INSTR_SET_OP0(inst, NOP);
- INSTR_SET_OP0(&bb->b_instr[i + 1], NOP);
- bb->b_instr[i+2].i_opcode = nextarg ^ (jump_op == POP_JUMP_IF_FALSE) ?
- POP_JUMP_IF_NOT_NONE : POP_JUMP_IF_NONE;
+ if (!Py_IsNone(cnt)) {
+ break;
}
Py_DECREF(cnt);
+ if (bb->b_iused <= i + 2) {
+ break;
+ }
+ cfg_instr *is_instr = &bb->b_instr[i + 1];
+ cfg_instr *jump_instr = &bb->b_instr[i + 2];
+ // Get rid of TO_BOOL regardless:
+ if (jump_instr->i_opcode == TO_BOOL) {
+ INSTR_SET_OP0(jump_instr, NOP);
+ if (bb->b_iused <= i + 3) {
+ break;
+ }
+ jump_instr = &bb->b_instr[i + 3];
+ }
+ bool invert = is_instr->i_oparg;
+ if (jump_instr->i_opcode == POP_JUMP_IF_FALSE) {
+ invert = !invert;
+ }
+ else if (jump_instr->i_opcode != POP_JUMP_IF_TRUE) {
+ break;
+ }
+ INSTR_SET_OP0(inst, NOP);
+ INSTR_SET_OP0(is_instr, NOP);
+ jump_instr->i_opcode = invert ? POP_JUMP_IF_NOT_NONE
+ : POP_JUMP_IF_NONE;
break;
case RETURN_VALUE:
INSTR_SET_OP0(inst, NOP);
INSTR_SET_OP1(&bb->b_instr[++i], RETURN_CONST, oparg);
break;
+ case TO_BOOL:
+ cnt = get_const_value(opcode, oparg, consts);
+ if (cnt == NULL) {
+ goto error;
+ }
+ is_true = PyObject_IsTrue(cnt);
+ Py_DECREF(cnt);
+ if (is_true == -1) {
+ goto error;
+ }
+ cnt = PyBool_FromLong(is_true);
+ int index = add_const(cnt, consts, const_cache);
+ if (index < 0) {
+ return ERROR;
+ }
+ INSTR_SET_OP0(inst, NOP);
+ INSTR_SET_OP1(&bb->b_instr[i + 1], LOAD_CONST, index);
+ break;
}
break;
}
@@ -1464,6 +1522,39 @@ optimize_basic_block(PyObject *const_cache, basicblock *bb, PyObject *consts)
inst[1].i_oparg |= 1;
}
break;
+ case COMPARE_OP:
+ if (nextop == TO_BOOL) {
+ INSTR_SET_OP0(inst, NOP);
+ INSTR_SET_OP1(&bb->b_instr[i + 1], COMPARE_OP, oparg | 16);
+ continue;
+ }
+ break;
+ case CONTAINS_OP:
+ case IS_OP:
+ if (nextop == TO_BOOL) {
+ INSTR_SET_OP0(inst, NOP);
+ INSTR_SET_OP1(&bb->b_instr[i + 1], opcode, oparg);
+ continue;
+ }
+ break;
+ case TO_BOOL:
+ if (nextop == TO_BOOL) {
+ INSTR_SET_OP0(inst, NOP);
+ continue;
+ }
+ break;
+ case UNARY_NOT:
+ if (nextop == TO_BOOL) {
+ INSTR_SET_OP0(inst, NOP);
+ INSTR_SET_OP0(&bb->b_instr[i + 1], UNARY_NOT);
+ continue;
+ }
+ if (nextop == UNARY_NOT) {
+ INSTR_SET_OP0(inst, NOP);
+ INSTR_SET_OP0(&bb->b_instr[i + 1], NOP);
+ continue;
+ }
+ break;
default:
/* All OPCODE_HAS_CONST opcodes should be handled with LOAD_CONST */
assert (!OPCODE_HAS_CONST(inst->i_opcode));
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 44b4522c9a5f1..568d15ee7edf2 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -260,32 +260,153 @@
PyObject *value = stack_pointer[-1];
PyObject *res;
#line 282 "Python/bytecodes.c"
+ assert(PyBool_Check(value));
+ res = Py_IsFalse(value) ? Py_True : Py_False;
+ #line 266 "Python/generated_cases.c.h"
+ stack_pointer[-1] = res;
+ DISPATCH();
+ }
+
+ TARGET(TO_BOOL) {
+ PREDICTED(TO_BOOL);
+ static_assert(INLINE_CACHE_ENTRIES_TO_BOOL == 3, "incorrect cache size");
+ PyObject *value = stack_pointer[-1];
+ PyObject *res;
+ #line 297 "Python/bytecodes.c"
+ #if ENABLE_SPECIALIZATION
+ _PyToBoolCache *cache = (_PyToBoolCache *)next_instr;
+ if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
+ next_instr--;
+ _Py_Specialize_ToBool(value, next_instr);
+ DISPATCH_SAME_OPARG();
+ }
+ STAT_INC(TO_BOOL, deferred);
+ DECREMENT_ADAPTIVE_COUNTER(cache->counter);
+ #endif /* ENABLE_SPECIALIZATION */
int err = PyObject_IsTrue(value);
- #line 265 "Python/generated_cases.c.h"
+ #line 288 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 284 "Python/bytecodes.c"
+ #line 309 "Python/bytecodes.c"
if (err < 0) goto pop_1_error;
- if (err == 0) {
- res = Py_True;
+ res = err ? Py_True : Py_False;
+ #line 293 "Python/generated_cases.c.h"
+ stack_pointer[-1] = res;
+ next_instr += 3;
+ DISPATCH();
+ }
+
+ TARGET(TO_BOOL_BOOL) {
+ PyObject *value = stack_pointer[-1];
+ #line 314 "Python/bytecodes.c"
+ DEOPT_IF(!PyBool_Check(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ #line 304 "Python/generated_cases.c.h"
+ next_instr += 3;
+ DISPATCH();
+ }
+
+ TARGET(TO_BOOL_INT) {
+ PyObject *value = stack_pointer[-1];
+ PyObject *res;
+ #line 319 "Python/bytecodes.c"
+ DEOPT_IF(!PyLong_CheckExact(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ if (_PyLong_IsZero((PyLongObject *)value)) {
+ assert(_Py_IsImmortal(value));
+ res = Py_False;
}
else {
+ #line 320 "Python/generated_cases.c.h"
+ Py_DECREF(value);
+ #line 327 "Python/bytecodes.c"
+ res = Py_True;
+ }
+ #line 325 "Python/generated_cases.c.h"
+ stack_pointer[-1] = res;
+ next_instr += 3;
+ DISPATCH();
+ }
+
+ TARGET(TO_BOOL_LIST) {
+ PyObject *value = stack_pointer[-1];
+ PyObject *res;
+ #line 332 "Python/bytecodes.c"
+ DEOPT_IF(!PyList_CheckExact(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ res = Py_SIZE(value) ? Py_True : Py_False;
+ #line 338 "Python/generated_cases.c.h"
+ Py_DECREF(value);
+ stack_pointer[-1] = res;
+ next_instr += 3;
+ DISPATCH();
+ }
+
+ TARGET(TO_BOOL_NONE) {
+ PyObject *value = stack_pointer[-1];
+ PyObject *res;
+ #line 339 "Python/bytecodes.c"
+ // This one is a bit weird, because we expect *some* failures:
+ DEOPT_IF(!Py_IsNone(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ res = Py_False;
+ #line 353 "Python/generated_cases.c.h"
+ stack_pointer[-1] = res;
+ next_instr += 3;
+ DISPATCH();
+ }
+
+ TARGET(TO_BOOL_STR) {
+ PyObject *value = stack_pointer[-1];
+ PyObject *res;
+ #line 346 "Python/bytecodes.c"
+ DEOPT_IF(!PyUnicode_CheckExact(value), TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ if (value == &_Py_STR(empty)) {
+ assert(_Py_IsImmortal(value));
res = Py_False;
}
- #line 275 "Python/generated_cases.c.h"
+ else {
+ assert(Py_SIZE(value));
+ #line 371 "Python/generated_cases.c.h"
+ Py_DECREF(value);
+ #line 355 "Python/bytecodes.c"
+ res = Py_True;
+ }
+ #line 376 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
+ next_instr += 3;
+ DISPATCH();
+ }
+
+ TARGET(TO_BOOL_ALWAYS_TRUE) {
+ PyObject *value = stack_pointer[-1];
+ PyObject *res;
+ uint32_t version = read_u32(&next_instr[1].cache);
+ #line 360 "Python/bytecodes.c"
+ // This one is a bit weird, because we expect *some* failures:
+ assert(version);
+ DEOPT_IF(Py_TYPE(value)->tp_version_tag != version, TO_BOOL);
+ STAT_INC(TO_BOOL, hit);
+ #line 391 "Python/generated_cases.c.h"
+ Py_DECREF(value);
+ #line 365 "Python/bytecodes.c"
+ res = Py_True;
+ #line 395 "Python/generated_cases.c.h"
+ stack_pointer[-1] = res;
+ next_instr += 3;
DISPATCH();
}
TARGET(UNARY_INVERT) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 294 "Python/bytecodes.c"
+ #line 369 "Python/bytecodes.c"
res = PyNumber_Invert(value);
- #line 285 "Python/generated_cases.c.h"
+ #line 406 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 296 "Python/bytecodes.c"
+ #line 371 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 289 "Python/generated_cases.c.h"
+ #line 410 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -296,10 +417,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 312 "Python/bytecodes.c"
+ #line 387 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- #line 303 "Python/generated_cases.c.h"
+ #line 424 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -307,13 +428,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 317 "Python/bytecodes.c"
+ #line 392 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
res = _PyLong_Multiply((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
if (res == NULL) goto pop_2_error;
- #line 317 "Python/generated_cases.c.h"
+ #line 438 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -328,10 +449,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 312 "Python/bytecodes.c"
+ #line 387 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- #line 335 "Python/generated_cases.c.h"
+ #line 456 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -339,13 +460,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 325 "Python/bytecodes.c"
+ #line 400 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
res = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
if (res == NULL) goto pop_2_error;
- #line 349 "Python/generated_cases.c.h"
+ #line 470 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -360,10 +481,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 312 "Python/bytecodes.c"
+ #line 387 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- #line 367 "Python/generated_cases.c.h"
+ #line 488 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -371,13 +492,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 333 "Python/bytecodes.c"
+ #line 408 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
res = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
if (res == NULL) goto pop_2_error;
- #line 381 "Python/generated_cases.c.h"
+ #line 502 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -392,10 +513,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 348 "Python/bytecodes.c"
+ #line 423 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- #line 399 "Python/generated_cases.c.h"
+ #line 520 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -403,13 +524,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 353 "Python/bytecodes.c"
+ #line 428 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
double dres =
((PyFloatObject *)left)->ob_fval *
((PyFloatObject *)right)->ob_fval;
DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
- #line 413 "Python/generated_cases.c.h"
+ #line 534 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -424,10 +545,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 348 "Python/bytecodes.c"
+ #line 423 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- #line 431 "Python/generated_cases.c.h"
+ #line 552 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -435,13 +556,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 361 "Python/bytecodes.c"
+ #line 436 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
double dres =
((PyFloatObject *)left)->ob_fval +
((PyFloatObject *)right)->ob_fval;
DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
- #line 445 "Python/generated_cases.c.h"
+ #line 566 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -456,10 +577,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 348 "Python/bytecodes.c"
+ #line 423 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- #line 463 "Python/generated_cases.c.h"
+ #line 584 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -467,13 +588,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 369 "Python/bytecodes.c"
+ #line 444 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
double dres =
((PyFloatObject *)left)->ob_fval -
((PyFloatObject *)right)->ob_fval;
DECREF_INPUTS_AND_REUSE_FLOAT(left, right, dres, res);
- #line 477 "Python/generated_cases.c.h"
+ #line 598 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -488,10 +609,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 384 "Python/bytecodes.c"
+ #line 459 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
- #line 495 "Python/generated_cases.c.h"
+ #line 616 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -499,13 +620,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 389 "Python/bytecodes.c"
+ #line 464 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
res = PyUnicode_Concat(left, right);
_Py_DECREF_SPECIALIZED(left, _PyUnicode_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
if (res == NULL) goto pop_2_error;
- #line 509 "Python/generated_cases.c.h"
+ #line 630 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -520,17 +641,17 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 384 "Python/bytecodes.c"
+ #line 459 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
- #line 527 "Python/generated_cases.c.h"
+ #line 648 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 406 "Python/bytecodes.c"
+ #line 481 "Python/bytecodes.c"
_Py_CODEUNIT true_next = next_instr[INLINE_CACHE_ENTRIES_BINARY_OP];
assert(true_next.op.code == STORE_FAST);
PyObject **target_local = &GETLOCAL(true_next.op.arg);
@@ -554,7 +675,7 @@
if (*target_local == NULL) goto pop_2_error;
// The STORE_FAST is already done.
SKIP_OVER(INLINE_CACHE_ENTRIES_BINARY_OP + 1);
- #line 558 "Python/generated_cases.c.h"
+ #line 679 "Python/generated_cases.c.h"
}
STACK_SHRINK(2);
DISPATCH();
@@ -566,7 +687,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
PyObject *res;
- #line 443 "Python/bytecodes.c"
+ #line 518 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinarySubscrCache *cache = (_PyBinarySubscrCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -578,12 +699,12 @@
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
#endif /* ENABLE_SPECIALIZATION */
res = PyObject_GetItem(container, sub);
- #line 582 "Python/generated_cases.c.h"
+ #line 703 "Python/generated_cases.c.h"
Py_DECREF(container);
Py_DECREF(sub);
- #line 455 "Python/bytecodes.c"
+ #line 530 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 587 "Python/generated_cases.c.h"
+ #line 708 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -595,7 +716,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *res;
- #line 459 "Python/bytecodes.c"
+ #line 534 "Python/bytecodes.c"
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
// Can't use ERROR_IF() here, because we haven't
// DECREF'ed container yet, and we still own slice.
@@ -608,7 +729,7 @@
}
Py_DECREF(container);
if (res == NULL) goto pop_3_error;
- #line 612 "Python/generated_cases.c.h"
+ #line 733 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = res;
DISPATCH();
@@ -619,7 +740,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *v = stack_pointer[-4];
- #line 474 "Python/bytecodes.c"
+ #line 549 "Python/bytecodes.c"
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
int err;
if (slice == NULL) {
@@ -632,7 +753,7 @@
Py_DECREF(v);
Py_DECREF(container);
if (err) goto pop_4_error;
- #line 636 "Python/generated_cases.c.h"
+ #line 757 "Python/generated_cases.c.h"
STACK_SHRINK(4);
DISPATCH();
}
@@ -641,7 +762,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *res;
- #line 489 "Python/bytecodes.c"
+ #line 564 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), BINARY_SUBSCR);
@@ -655,7 +776,7 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(list);
- #line 659 "Python/generated_cases.c.h"
+ #line 780 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -666,7 +787,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *tuple = stack_pointer[-2];
PyObject *res;
- #line 505 "Python/bytecodes.c"
+ #line 580 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyTuple_CheckExact(tuple), BINARY_SUBSCR);
@@ -680,7 +801,7 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(tuple);
- #line 684 "Python/generated_cases.c.h"
+ #line 805 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -691,7 +812,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *res;
- #line 521 "Python/bytecodes.c"
+ #line 596 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(dict), BINARY_SUBSCR);
STAT_INC(BINARY_SUBSCR, hit);
res = PyDict_GetItemWithError(dict, sub);
@@ -699,14 +820,14 @@
if (!_PyErr_Occurred(tstate)) {
_PyErr_SetKeyError(sub);
}
- #line 703 "Python/generated_cases.c.h"
+ #line 824 "Python/generated_cases.c.h"
Py_DECREF(dict);
Py_DECREF(sub);
- #line 529 "Python/bytecodes.c"
+ #line 604 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
Py_INCREF(res); // Do this before DECREF'ing dict, sub
- #line 710 "Python/generated_cases.c.h"
+ #line 831 "Python/generated_cases.c.h"
Py_DECREF(dict);
Py_DECREF(sub);
STACK_SHRINK(1);
@@ -718,7 +839,7 @@
TARGET(BINARY_SUBSCR_GETITEM) {
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
- #line 536 "Python/bytecodes.c"
+ #line 611 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, BINARY_SUBSCR);
PyTypeObject *tp = Py_TYPE(container);
DEOPT_IF(!PyType_HasFeature(tp, Py_TPFLAGS_HEAPTYPE), BINARY_SUBSCR);
@@ -741,15 +862,15 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_BINARY_SUBSCR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 745 "Python/generated_cases.c.h"
+ #line 866 "Python/generated_cases.c.h"
}
TARGET(LIST_APPEND) {
PyObject *v = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 561 "Python/bytecodes.c"
+ #line 636 "Python/bytecodes.c"
if (_PyList_AppendTakeRef((PyListObject *)list, v) < 0) goto pop_1_error;
- #line 753 "Python/generated_cases.c.h"
+ #line 874 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -757,13 +878,13 @@
TARGET(SET_ADD) {
PyObject *v = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 565 "Python/bytecodes.c"
+ #line 640 "Python/bytecodes.c"
int err = PySet_Add(set, v);
- #line 763 "Python/generated_cases.c.h"
+ #line 884 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 567 "Python/bytecodes.c"
+ #line 642 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 767 "Python/generated_cases.c.h"
+ #line 888 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -775,7 +896,7 @@
PyObject *container = stack_pointer[-2];
PyObject *v = stack_pointer[-3];
uint16_t counter = read_u16(&next_instr[0].cache);
- #line 577 "Python/bytecodes.c"
+ #line 652 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr--;
@@ -790,13 +911,13 @@
#endif /* ENABLE_SPECIALIZATION */
/* container[sub] = v */
int err = PyObject_SetItem(container, sub, v);
- #line 794 "Python/generated_cases.c.h"
+ #line 915 "Python/generated_cases.c.h"
Py_DECREF(v);
Py_DECREF(container);
Py_DECREF(sub);
- #line 592 "Python/bytecodes.c"
+ #line 667 "Python/bytecodes.c"
if (err) goto pop_3_error;
- #line 800 "Python/generated_cases.c.h"
+ #line 921 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -806,7 +927,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 596 "Python/bytecodes.c"
+ #line 671 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), STORE_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), STORE_SUBSCR);
@@ -823,7 +944,7 @@
Py_DECREF(old_value);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(list);
- #line 827 "Python/generated_cases.c.h"
+ #line 948 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -833,13 +954,13 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 615 "Python/bytecodes.c"
+ #line 690 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(dict), STORE_SUBSCR);
STAT_INC(STORE_SUBSCR, hit);
int err = _PyDict_SetItem_Take2((PyDictObject *)dict, sub, value);
Py_DECREF(dict);
if (err) goto pop_3_error;
- #line 843 "Python/generated_cases.c.h"
+ #line 964 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -848,15 +969,15 @@
TARGET(DELETE_SUBSCR) {
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
- #line 623 "Python/bytecodes.c"
+ #line 698 "Python/bytecodes.c"
/* del container[sub] */
int err = PyObject_DelItem(container, sub);
- #line 855 "Python/generated_cases.c.h"
+ #line 976 "Python/generated_cases.c.h"
Py_DECREF(container);
Py_DECREF(sub);
- #line 626 "Python/bytecodes.c"
+ #line 701 "Python/bytecodes.c"
if (err) goto pop_2_error;
- #line 860 "Python/generated_cases.c.h"
+ #line 981 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
@@ -864,14 +985,14 @@
TARGET(CALL_INTRINSIC_1) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 630 "Python/bytecodes.c"
+ #line 705 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_1);
res = _PyIntrinsics_UnaryFunctions[oparg](tstate, value);
- #line 871 "Python/generated_cases.c.h"
+ #line 992 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 633 "Python/bytecodes.c"
+ #line 708 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 875 "Python/generated_cases.c.h"
+ #line 996 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -880,15 +1001,15 @@
PyObject *value1 = stack_pointer[-1];
PyObject *value2 = stack_pointer[-2];
PyObject *res;
- #line 637 "Python/bytecodes.c"
+ #line 712 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_2);
res = _PyIntrinsics_BinaryFunctions[oparg](tstate, value2, value1);
- #line 887 "Python/generated_cases.c.h"
+ #line 1008 "Python/generated_cases.c.h"
Py_DECREF(value2);
Py_DECREF(value1);
- #line 640 "Python/bytecodes.c"
+ #line 715 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 892 "Python/generated_cases.c.h"
+ #line 1013 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -896,7 +1017,7 @@
TARGET(RAISE_VARARGS) {
PyObject **args = (stack_pointer - oparg);
- #line 644 "Python/bytecodes.c"
+ #line 719 "Python/bytecodes.c"
PyObject *cause = NULL, *exc = NULL;
switch (oparg) {
case 2:
@@ -914,12 +1035,12 @@
break;
}
if (true) { STACK_SHRINK(oparg); goto error; }
- #line 918 "Python/generated_cases.c.h"
+ #line 1039 "Python/generated_cases.c.h"
}
TARGET(INTERPRETER_EXIT) {
PyObject *retval = stack_pointer[-1];
- #line 664 "Python/bytecodes.c"
+ #line 739 "Python/bytecodes.c"
assert(frame == &entry_frame);
assert(_PyFrame_IsIncomplete(frame));
/* Restore previous cframe and return. */
@@ -928,12 +1049,12 @@
assert(!_PyErr_Occurred(tstate));
_Py_LeaveRecursiveCallTstate(tstate);
return retval;
- #line 932 "Python/generated_cases.c.h"
+ #line 1053 "Python/generated_cases.c.h"
}
TARGET(RETURN_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 675 "Python/bytecodes.c"
+ #line 750 "Python/bytecodes.c"
STACK_SHRINK(1);
assert(EMPTY());
_PyFrame_SetStackPointer(frame, stack_pointer);
@@ -946,12 +1067,12 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 950 "Python/generated_cases.c.h"
+ #line 1071 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_RETURN_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 690 "Python/bytecodes.c"
+ #line 765 "Python/bytecodes.c"
int err = _Py_call_instrumentation_arg(
tstate, PY_MONITORING_EVENT_PY_RETURN,
frame, next_instr-1, retval);
@@ -968,11 +1089,11 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 972 "Python/generated_cases.c.h"
+ #line 1093 "Python/generated_cases.c.h"
}
TARGET(RETURN_CONST) {
- #line 709 "Python/bytecodes.c"
+ #line 784 "Python/bytecodes.c"
PyObject *retval = GETITEM(FRAME_CO_CONSTS, oparg);
Py_INCREF(retval);
assert(EMPTY());
@@ -986,11 +1107,11 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 990 "Python/generated_cases.c.h"
+ #line 1111 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_RETURN_CONST) {
- #line 725 "Python/bytecodes.c"
+ #line 800 "Python/bytecodes.c"
PyObject *retval = GETITEM(FRAME_CO_CONSTS, oparg);
int err = _Py_call_instrumentation_arg(
tstate, PY_MONITORING_EVENT_PY_RETURN,
@@ -1008,13 +1129,13 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1012 "Python/generated_cases.c.h"
+ #line 1133 "Python/generated_cases.c.h"
}
TARGET(GET_AITER) {
PyObject *obj = stack_pointer[-1];
PyObject *iter;
- #line 745 "Python/bytecodes.c"
+ #line 820 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyTypeObject *type = Py_TYPE(obj);
@@ -1027,16 +1148,16 @@
"'async for' requires an object with "
"__aiter__ method, got %.100s",
type->tp_name);
- #line 1031 "Python/generated_cases.c.h"
+ #line 1152 "Python/generated_cases.c.h"
Py_DECREF(obj);
- #line 758 "Python/bytecodes.c"
+ #line 833 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
iter = (*getter)(obj);
- #line 1038 "Python/generated_cases.c.h"
+ #line 1159 "Python/generated_cases.c.h"
Py_DECREF(obj);
- #line 763 "Python/bytecodes.c"
+ #line 838 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
if (Py_TYPE(iter)->tp_as_async == NULL ||
@@ -1049,7 +1170,7 @@
Py_DECREF(iter);
if (true) goto pop_1_error;
}
- #line 1053 "Python/generated_cases.c.h"
+ #line 1174 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -1057,7 +1178,7 @@
TARGET(GET_ANEXT) {
PyObject *aiter = stack_pointer[-1];
PyObject *awaitable;
- #line 778 "Python/bytecodes.c"
+ #line 853 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyObject *next_iter = NULL;
PyTypeObject *type = Py_TYPE(aiter);
@@ -1100,7 +1221,7 @@
Py_DECREF(next_iter);
}
}
- #line 1104 "Python/generated_cases.c.h"
+ #line 1225 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = awaitable;
DISPATCH();
@@ -1109,16 +1230,16 @@
TARGET(GET_AWAITABLE) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 823 "Python/bytecodes.c"
+ #line 898 "Python/bytecodes.c"
iter = _PyCoro_GetAwaitableIter(iterable);
if (iter == NULL) {
format_awaitable_error(tstate, Py_TYPE(iterable), oparg);
}
- #line 1120 "Python/generated_cases.c.h"
+ #line 1241 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 830 "Python/bytecodes.c"
+ #line 905 "Python/bytecodes.c"
if (iter != NULL && PyCoro_CheckExact(iter)) {
PyObject *yf = _PyGen_yf((PyGenObject*)iter);
@@ -1135,7 +1256,7 @@
}
if (iter == NULL) goto pop_1_error;
- #line 1139 "Python/generated_cases.c.h"
+ #line 1260 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -1146,7 +1267,7 @@
PyObject *v = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
PyObject *retval;
- #line 854 "Python/bytecodes.c"
+ #line 929 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PySendCache *cache = (_PySendCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1193,7 +1314,7 @@
}
}
Py_DECREF(v);
- #line 1197 "Python/generated_cases.c.h"
+ #line 1318 "Python/generated_cases.c.h"
stack_pointer[-1] = retval;
next_instr += 1;
DISPATCH();
@@ -1202,7 +1323,7 @@
TARGET(SEND_GEN) {
PyObject *v = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 903 "Python/bytecodes.c"
+ #line 978 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, SEND);
PyGenObject *gen = (PyGenObject *)receiver;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type &&
@@ -1218,12 +1339,12 @@
tstate->exc_info = &gen->gi_exc_state;
SKIP_OVER(INLINE_CACHE_ENTRIES_SEND);
DISPATCH_INLINED(gen_frame);
- #line 1222 "Python/generated_cases.c.h"
+ #line 1343 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_YIELD_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 921 "Python/bytecodes.c"
+ #line 996 "Python/bytecodes.c"
assert(frame != &entry_frame);
assert(oparg >= 0); /* make the generator identify this as HAS_ARG */
PyGenObject *gen = _PyFrame_GetGenerator(frame);
@@ -1241,12 +1362,12 @@
gen_frame->previous = NULL;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1245 "Python/generated_cases.c.h"
+ #line 1366 "Python/generated_cases.c.h"
}
TARGET(YIELD_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 941 "Python/bytecodes.c"
+ #line 1016 "Python/bytecodes.c"
// NOTE: It's important that YIELD_VALUE never raises an exception!
// The compiler treats any exception raised here as a failed close()
// or throw() call.
@@ -1263,15 +1384,15 @@
gen_frame->previous = NULL;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1267 "Python/generated_cases.c.h"
+ #line 1388 "Python/generated_cases.c.h"
}
TARGET(POP_EXCEPT) {
PyObject *exc_value = stack_pointer[-1];
- #line 960 "Python/bytecodes.c"
+ #line 1035 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
Py_XSETREF(exc_info->exc_value, exc_value);
- #line 1275 "Python/generated_cases.c.h"
+ #line 1396 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -1279,7 +1400,7 @@
TARGET(RERAISE) {
PyObject *exc = stack_pointer[-1];
PyObject **values = (stack_pointer - (1 + oparg));
- #line 965 "Python/bytecodes.c"
+ #line 1040 "Python/bytecodes.c"
assert(oparg >= 0 && oparg <= 2);
if (oparg) {
PyObject *lasti = values[0];
@@ -1297,26 +1418,26 @@
Py_INCREF(exc);
_PyErr_SetRaisedException(tstate, exc);
goto exception_unwind;
- #line 1301 "Python/generated_cases.c.h"
+ #line 1422 "Python/generated_cases.c.h"
}
TARGET(END_ASYNC_FOR) {
PyObject *exc = stack_pointer[-1];
PyObject *awaitable = stack_pointer[-2];
- #line 985 "Python/bytecodes.c"
+ #line 1060 "Python/bytecodes.c"
assert(exc && PyExceptionInstance_Check(exc));
if (PyErr_GivenExceptionMatches(exc, PyExc_StopAsyncIteration)) {
- #line 1310 "Python/generated_cases.c.h"
+ #line 1431 "Python/generated_cases.c.h"
Py_DECREF(awaitable);
Py_DECREF(exc);
- #line 988 "Python/bytecodes.c"
+ #line 1063 "Python/bytecodes.c"
}
else {
Py_INCREF(exc);
_PyErr_SetRaisedException(tstate, exc);
goto exception_unwind;
}
- #line 1320 "Python/generated_cases.c.h"
+ #line 1441 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
@@ -1327,23 +1448,23 @@
PyObject *sub_iter = stack_pointer[-3];
PyObject *none;
PyObject *value;
- #line 997 "Python/bytecodes.c"
+ #line 1072 "Python/bytecodes.c"
assert(throwflag);
assert(exc_value && PyExceptionInstance_Check(exc_value));
if (PyErr_GivenExceptionMatches(exc_value, PyExc_StopIteration)) {
value = Py_NewRef(((PyStopIterationObject *)exc_value)->value);
- #line 1336 "Python/generated_cases.c.h"
+ #line 1457 "Python/generated_cases.c.h"
Py_DECREF(sub_iter);
Py_DECREF(last_sent_val);
Py_DECREF(exc_value);
- #line 1002 "Python/bytecodes.c"
+ #line 1077 "Python/bytecodes.c"
none = Py_None;
}
else {
_PyErr_SetRaisedException(tstate, Py_NewRef(exc_value));
goto exception_unwind;
}
- #line 1347 "Python/generated_cases.c.h"
+ #line 1468 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = value;
stack_pointer[-2] = none;
@@ -1352,9 +1473,9 @@
TARGET(LOAD_ASSERTION_ERROR) {
PyObject *value;
- #line 1011 "Python/bytecodes.c"
+ #line 1086 "Python/bytecodes.c"
value = Py_NewRef(PyExc_AssertionError);
- #line 1358 "Python/generated_cases.c.h"
+ #line 1479 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -1362,7 +1483,7 @@
TARGET(LOAD_BUILD_CLASS) {
PyObject *bc;
- #line 1015 "Python/bytecodes.c"
+ #line 1090 "Python/bytecodes.c"
if (PyDict_CheckExact(BUILTINS())) {
bc = _PyDict_GetItemWithError(BUILTINS(),
&_Py_ID(__build_class__));
@@ -1384,7 +1505,7 @@
if (true) goto error;
}
}
- #line 1388 "Python/generated_cases.c.h"
+ #line 1509 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = bc;
DISPATCH();
@@ -1392,33 +1513,33 @@
TARGET(STORE_NAME) {
PyObject *v = stack_pointer[-1];
- #line 1040 "Python/bytecodes.c"
+ #line 1115 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
PyObject *ns = LOCALS();
int err;
if (ns == NULL) {
_PyErr_Format(tstate, PyExc_SystemError,
"no locals found when storing %R", name);
- #line 1403 "Python/generated_cases.c.h"
+ #line 1524 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1047 "Python/bytecodes.c"
+ #line 1122 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
if (PyDict_CheckExact(ns))
err = PyDict_SetItem(ns, name, v);
else
err = PyObject_SetItem(ns, name, v);
- #line 1412 "Python/generated_cases.c.h"
+ #line 1533 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1054 "Python/bytecodes.c"
+ #line 1129 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1416 "Python/generated_cases.c.h"
+ #line 1537 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(DELETE_NAME) {
- #line 1058 "Python/bytecodes.c"
+ #line 1133 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
PyObject *ns = LOCALS();
int err;
@@ -1435,7 +1556,7 @@
name);
goto error;
}
- #line 1439 "Python/generated_cases.c.h"
+ #line 1560 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1443,7 +1564,7 @@
PREDICTED(UNPACK_SEQUENCE);
static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size");
PyObject *seq = stack_pointer[-1];
- #line 1084 "Python/bytecodes.c"
+ #line 1159 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyUnpackSequenceCache *cache = (_PyUnpackSequenceCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1456,11 +1577,11 @@
#endif /* ENABLE_SPECIALIZATION */
PyObject **top = stack_pointer + oparg - 1;
int res = unpack_iterable(tstate, seq, oparg, -1, top);
- #line 1460 "Python/generated_cases.c.h"
+ #line 1581 "Python/generated_cases.c.h"
Py_DECREF(seq);
- #line 1097 "Python/bytecodes.c"
+ #line 1172 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
- #line 1464 "Python/generated_cases.c.h"
+ #line 1585 "Python/generated_cases.c.h"
STACK_SHRINK(1);
STACK_GROW(oparg);
next_instr += 1;
@@ -1470,14 +1591,14 @@
TARGET(UNPACK_SEQUENCE_TWO_TUPLE) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1101 "Python/bytecodes.c"
+ #line 1176 "Python/bytecodes.c"
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != 2, UNPACK_SEQUENCE);
assert(oparg == 2);
STAT_INC(UNPACK_SEQUENCE, hit);
values[0] = Py_NewRef(PyTuple_GET_ITEM(seq, 1));
values[1] = Py_NewRef(PyTuple_GET_ITEM(seq, 0));
- #line 1481 "Python/generated_cases.c.h"
+ #line 1602 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1488,7 +1609,7 @@
TARGET(UNPACK_SEQUENCE_TUPLE) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1111 "Python/bytecodes.c"
+ #line 1186 "Python/bytecodes.c"
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -1496,7 +1617,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 1500 "Python/generated_cases.c.h"
+ #line 1621 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1507,7 +1628,7 @@
TARGET(UNPACK_SEQUENCE_LIST) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1122 "Python/bytecodes.c"
+ #line 1197 "Python/bytecodes.c"
DEOPT_IF(!PyList_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyList_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -1515,7 +1636,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 1519 "Python/generated_cases.c.h"
+ #line 1640 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1525,15 +1646,15 @@
TARGET(UNPACK_EX) {
PyObject *seq = stack_pointer[-1];
- #line 1133 "Python/bytecodes.c"
+ #line 1208 "Python/bytecodes.c"
int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8);
PyObject **top = stack_pointer + totalargs - 1;
int res = unpack_iterable(tstate, seq, oparg & 0xFF, oparg >> 8, top);
- #line 1533 "Python/generated_cases.c.h"
+ #line 1654 "Python/generated_cases.c.h"
Py_DECREF(seq);
- #line 1137 "Python/bytecodes.c"
+ #line 1212 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
- #line 1537 "Python/generated_cases.c.h"
+ #line 1658 "Python/generated_cases.c.h"
STACK_GROW((oparg & 0xFF) + (oparg >> 8));
DISPATCH();
}
@@ -1544,7 +1665,7 @@
PyObject *owner = stack_pointer[-1];
PyObject *v = stack_pointer[-2];
uint16_t counter = read_u16(&next_instr[0].cache);
- #line 1148 "Python/bytecodes.c"
+ #line 1223 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
@@ -1560,12 +1681,12 @@
#endif /* ENABLE_SPECIALIZATION */
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err = PyObject_SetAttr(owner, name, v);
- #line 1564 "Python/generated_cases.c.h"
+ #line 1685 "Python/generated_cases.c.h"
Py_DECREF(v);
Py_DECREF(owner);
- #line 1164 "Python/bytecodes.c"
+ #line 1239 "Python/bytecodes.c"
if (err) goto pop_2_error;
- #line 1569 "Python/generated_cases.c.h"
+ #line 1690 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -1573,34 +1694,34 @@
TARGET(DELETE_ATTR) {
PyObject *owner = stack_pointer[-1];
- #line 1168 "Python/bytecodes.c"
+ #line 1243 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err = PyObject_SetAttr(owner, name, (PyObject *)NULL);
- #line 1580 "Python/generated_cases.c.h"
+ #line 1701 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1171 "Python/bytecodes.c"
+ #line 1246 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1584 "Python/generated_cases.c.h"
+ #line 1705 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(STORE_GLOBAL) {
PyObject *v = stack_pointer[-1];
- #line 1175 "Python/bytecodes.c"
+ #line 1250 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err = PyDict_SetItem(GLOBALS(), name, v);
- #line 1594 "Python/generated_cases.c.h"
+ #line 1715 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1178 "Python/bytecodes.c"
+ #line 1253 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1598 "Python/generated_cases.c.h"
+ #line 1719 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(DELETE_GLOBAL) {
- #line 1182 "Python/bytecodes.c"
+ #line 1257 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err;
err = PyDict_DelItem(GLOBALS(), name);
@@ -1612,7 +1733,7 @@
}
goto error;
}
- #line 1616 "Python/generated_cases.c.h"
+ #line 1737 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1620,7 +1741,7 @@
PyObject *_tmp_1;
{
PyObject *locals;
- #line 1196 "Python/bytecodes.c"
+ #line 1271 "Python/bytecodes.c"
locals = LOCALS();
if (locals == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -1628,7 +1749,7 @@
if (true) goto error;
}
Py_INCREF(locals);
- #line 1632 "Python/generated_cases.c.h"
+ #line 1753 "Python/generated_cases.c.h"
_tmp_1 = locals;
}
STACK_GROW(1);
@@ -1640,7 +1761,7 @@
PyObject *_tmp_1;
{
PyObject *locals;
- #line 1196 "Python/bytecodes.c"
+ #line 1271 "Python/bytecodes.c"
locals = LOCALS();
if (locals == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -1648,13 +1769,13 @@
if (true) goto error;
}
Py_INCREF(locals);
- #line 1652 "Python/generated_cases.c.h"
+ #line 1773 "Python/generated_cases.c.h"
_tmp_1 = locals;
}
{
PyObject *mod_or_class_dict = _tmp_1;
PyObject *v;
- #line 1208 "Python/bytecodes.c"
+ #line 1283 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
if (PyDict_CheckExact(mod_or_class_dict)) {
v = PyDict_GetItemWithError(mod_or_class_dict, name);
@@ -1711,7 +1832,7 @@
}
}
}
- #line 1715 "Python/generated_cases.c.h"
+ #line 1836 "Python/generated_cases.c.h"
_tmp_1 = v;
}
STACK_GROW(1);
@@ -1724,7 +1845,7 @@
{
PyObject *mod_or_class_dict = _tmp_1;
PyObject *v;
- #line 1208 "Python/bytecodes.c"
+ #line 1283 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
if (PyDict_CheckExact(mod_or_class_dict)) {
v = PyDict_GetItemWithError(mod_or_class_dict, name);
@@ -1781,7 +1902,7 @@
}
}
}
- #line 1785 "Python/generated_cases.c.h"
+ #line 1906 "Python/generated_cases.c.h"
_tmp_1 = v;
}
stack_pointer[-1] = _tmp_1;
@@ -1793,7 +1914,7 @@
static_assert(INLINE_CACHE_ENTRIES_LOAD_GLOBAL == 4, "incorrect cache size");
PyObject *null = NULL;
PyObject *v;
- #line 1277 "Python/bytecodes.c"
+ #line 1352 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyLoadGlobalCache *cache = (_PyLoadGlobalCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1845,7 +1966,7 @@
}
}
null = NULL;
- #line 1849 "Python/generated_cases.c.h"
+ #line 1970 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = v;
@@ -1859,7 +1980,7 @@
PyObject *res;
uint16_t index = read_u16(&next_instr[1].cache);
uint16_t version = read_u16(&next_instr[2].cache);
- #line 1331 "Python/bytecodes.c"
+ #line 1406 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
PyDictObject *dict = (PyDictObject *)GLOBALS();
DEOPT_IF(dict->ma_keys->dk_version != version, LOAD_GLOBAL);
@@ -1870,7 +1991,7 @@
Py_INCREF(res);
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
- #line 1874 "Python/generated_cases.c.h"
+ #line 1995 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -1885,7 +2006,7 @@
uint16_t index = read_u16(&next_instr[1].cache);
uint16_t mod_version = read_u16(&next_instr[2].cache);
uint16_t bltn_version = read_u16(&next_instr[3].cache);
- #line 1344 "Python/bytecodes.c"
+ #line 1419 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
DEOPT_IF(!PyDict_CheckExact(BUILTINS()), LOAD_GLOBAL);
PyDictObject *mdict = (PyDictObject *)GLOBALS();
@@ -1900,7 +2021,7 @@
Py_INCREF(res);
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
- #line 1904 "Python/generated_cases.c.h"
+ #line 2025 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -1910,16 +2031,16 @@
}
TARGET(DELETE_FAST) {
- #line 1361 "Python/bytecodes.c"
+ #line 1436 "Python/bytecodes.c"
PyObject *v = GETLOCAL(oparg);
if (v == NULL) goto unbound_local_error;
SETLOCAL(oparg, NULL);
- #line 1918 "Python/generated_cases.c.h"
+ #line 2039 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(MAKE_CELL) {
- #line 1367 "Python/bytecodes.c"
+ #line 1442 "Python/bytecodes.c"
// "initial" is probably NULL but not if it's an arg (or set
// via PyFrame_LocalsToFast() before MAKE_CELL has run).
PyObject *initial = GETLOCAL(oparg);
@@ -1928,12 +2049,12 @@
goto resume_with_error;
}
SETLOCAL(oparg, cell);
- #line 1932 "Python/generated_cases.c.h"
+ #line 2053 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(DELETE_DEREF) {
- #line 1378 "Python/bytecodes.c"
+ #line 1453 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
// Can't use ERROR_IF here.
@@ -1944,14 +2065,14 @@
}
PyCell_SET(cell, NULL);
Py_DECREF(oldobj);
- #line 1948 "Python/generated_cases.c.h"
+ #line 2069 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(LOAD_FROM_DICT_OR_DEREF) {
PyObject *class_dict = stack_pointer[-1];
PyObject *value;
- #line 1391 "Python/bytecodes.c"
+ #line 1466 "Python/bytecodes.c"
PyObject *name;
assert(class_dict);
assert(oparg >= 0 && oparg < _PyFrame_GetCode(frame)->co_nlocalsplus);
@@ -1986,14 +2107,14 @@
}
Py_INCREF(value);
}
- #line 1990 "Python/generated_cases.c.h"
+ #line 2111 "Python/generated_cases.c.h"
stack_pointer[-1] = value;
DISPATCH();
}
TARGET(LOAD_DEREF) {
PyObject *value;
- #line 1428 "Python/bytecodes.c"
+ #line 1503 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
value = PyCell_GET(cell);
if (value == NULL) {
@@ -2001,7 +2122,7 @@
if (true) goto error;
}
Py_INCREF(value);
- #line 2005 "Python/generated_cases.c.h"
+ #line 2126 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -2009,18 +2130,18 @@
TARGET(STORE_DEREF) {
PyObject *v = stack_pointer[-1];
- #line 1438 "Python/bytecodes.c"
+ #line 1513 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
PyCell_SET(cell, v);
Py_XDECREF(oldobj);
- #line 2018 "Python/generated_cases.c.h"
+ #line 2139 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(COPY_FREE_VARS) {
- #line 1445 "Python/bytecodes.c"
+ #line 1520 "Python/bytecodes.c"
/* Copy closure variables to free variables */
PyCodeObject *co = _PyFrame_GetCode(frame);
assert(PyFunction_Check(frame->f_funcobj));
@@ -2031,22 +2152,22 @@
PyObject *o = PyTuple_GET_ITEM(closure, i);
frame->localsplus[offset + i] = Py_NewRef(o);
}
- #line 2035 "Python/generated_cases.c.h"
+ #line 2156 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(BUILD_STRING) {
PyObject **pieces = (stack_pointer - oparg);
PyObject *str;
- #line 1458 "Python/bytecodes.c"
+ #line 1533 "Python/bytecodes.c"
str = _PyUnicode_JoinArray(&_Py_STR(empty), pieces, oparg);
- #line 2044 "Python/generated_cases.c.h"
+ #line 2165 "Python/generated_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(pieces[_i]);
}
- #line 1460 "Python/bytecodes.c"
+ #line 1535 "Python/bytecodes.c"
if (str == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2050 "Python/generated_cases.c.h"
+ #line 2171 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = str;
@@ -2056,10 +2177,10 @@
TARGET(BUILD_TUPLE) {
PyObject **values = (stack_pointer - oparg);
PyObject *tup;
- #line 1464 "Python/bytecodes.c"
+ #line 1539 "Python/bytecodes.c"
tup = _PyTuple_FromArraySteal(values, oparg);
if (tup == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2063 "Python/generated_cases.c.h"
+ #line 2184 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = tup;
@@ -2069,10 +2190,10 @@
TARGET(BUILD_LIST) {
PyObject **values = (stack_pointer - oparg);
PyObject *list;
- #line 1469 "Python/bytecodes.c"
+ #line 1544 "Python/bytecodes.c"
list = _PyList_FromArraySteal(values, oparg);
if (list == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2076 "Python/generated_cases.c.h"
+ #line 2197 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = list;
@@ -2082,7 +2203,7 @@
TARGET(LIST_EXTEND) {
PyObject *iterable = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 1474 "Python/bytecodes.c"
+ #line 1549 "Python/bytecodes.c"
PyObject *none_val = _PyList_Extend((PyListObject *)list, iterable);
if (none_val == NULL) {
if (_PyErr_ExceptionMatches(tstate, PyExc_TypeError) &&
@@ -2093,13 +2214,13 @@
"Value after * must be an iterable, not %.200s",
Py_TYPE(iterable)->tp_name);
}
- #line 2097 "Python/generated_cases.c.h"
+ #line 2218 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 1485 "Python/bytecodes.c"
+ #line 1560 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
assert(Py_IsNone(none_val));
- #line 2103 "Python/generated_cases.c.h"
+ #line 2224 "Python/generated_cases.c.h"
Py_DECREF(iterable);
STACK_SHRINK(1);
DISPATCH();
@@ -2108,13 +2229,13 @@
TARGET(SET_UPDATE) {
PyObject *iterable = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 1492 "Python/bytecodes.c"
+ #line 1567 "Python/bytecodes.c"
int err = _PySet_Update(set, iterable);
- #line 2114 "Python/generated_cases.c.h"
+ #line 2235 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 1494 "Python/bytecodes.c"
+ #line 1569 "Python/bytecodes.c"
if (err < 0) goto pop_1_error;
- #line 2118 "Python/generated_cases.c.h"
+ #line 2239 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -2122,7 +2243,7 @@
TARGET(BUILD_SET) {
PyObject **values = (stack_pointer - oparg);
PyObject *set;
- #line 1498 "Python/bytecodes.c"
+ #line 1573 "Python/bytecodes.c"
set = PySet_New(NULL);
if (set == NULL)
goto error;
@@ -2137,7 +2258,7 @@
Py_DECREF(set);
if (true) { STACK_SHRINK(oparg); goto error; }
}
- #line 2141 "Python/generated_cases.c.h"
+ #line 2262 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = set;
@@ -2147,7 +2268,7 @@
TARGET(BUILD_MAP) {
PyObject **values = (stack_pointer - oparg*2);
PyObject *map;
- #line 1515 "Python/bytecodes.c"
+ #line 1590 "Python/bytecodes.c"
map = _PyDict_FromItems(
values, 2,
values+1, 2,
@@ -2155,13 +2276,13 @@
if (map == NULL)
goto error;
- #line 2159 "Python/generated_cases.c.h"
+ #line 2280 "Python/generated_cases.c.h"
for (int _i = oparg*2; --_i >= 0;) {
Py_DECREF(values[_i]);
}
- #line 1523 "Python/bytecodes.c"
+ #line 1598 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg*2); goto error; }
- #line 2165 "Python/generated_cases.c.h"
+ #line 2286 "Python/generated_cases.c.h"
STACK_SHRINK(oparg*2);
STACK_GROW(1);
stack_pointer[-1] = map;
@@ -2169,7 +2290,7 @@
}
TARGET(SETUP_ANNOTATIONS) {
- #line 1527 "Python/bytecodes.c"
+ #line 1602 "Python/bytecodes.c"
int err;
PyObject *ann_dict;
if (LOCALS() == NULL) {
@@ -2209,7 +2330,7 @@
Py_DECREF(ann_dict);
}
}
- #line 2213 "Python/generated_cases.c.h"
+ #line 2334 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -2217,7 +2338,7 @@
PyObject *keys = stack_pointer[-1];
PyObject **values = (stack_pointer - (1 + oparg));
PyObject *map;
- #line 1569 "Python/bytecodes.c"
+ #line 1644 "Python/bytecodes.c"
if (!PyTuple_CheckExact(keys) ||
PyTuple_GET_SIZE(keys) != (Py_ssize_t)oparg) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -2227,14 +2348,14 @@
map = _PyDict_FromItems(
&PyTuple_GET_ITEM(keys, 0), 1,
values, 1, oparg);
- #line 2231 "Python/generated_cases.c.h"
+ #line 2352 "Python/generated_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(values[_i]);
}
Py_DECREF(keys);
- #line 1579 "Python/bytecodes.c"
+ #line 1654 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg); goto pop_1_error; }
- #line 2238 "Python/generated_cases.c.h"
+ #line 2359 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
stack_pointer[-1] = map;
DISPATCH();
@@ -2242,7 +2363,7 @@
TARGET(DICT_UPDATE) {
PyObject *update = stack_pointer[-1];
- #line 1583 "Python/bytecodes.c"
+ #line 1658 "Python/bytecodes.c"
PyObject *dict = PEEK(oparg + 1); // update is still on the stack
if (PyDict_Update(dict, update) < 0) {
if (_PyErr_ExceptionMatches(tstate, PyExc_AttributeError)) {
@@ -2250,12 +2371,12 @@
"'%.200s' object is not a mapping",
Py_TYPE(update)->tp_name);
}
- #line 2254 "Python/generated_cases.c.h"
+ #line 2375 "Python/generated_cases.c.h"
Py_DECREF(update);
- #line 1591 "Python/bytecodes.c"
+ #line 1666 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 2259 "Python/generated_cases.c.h"
+ #line 2380 "Python/generated_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
DISPATCH();
@@ -2263,17 +2384,17 @@
TARGET(DICT_MERGE) {
PyObject *update = stack_pointer[-1];
- #line 1597 "Python/bytecodes.c"
+ #line 1672 "Python/bytecodes.c"
PyObject *dict = PEEK(oparg + 1); // update is still on the stack
if (_PyDict_MergeEx(dict, update, 2) < 0) {
format_kwargs_error(tstate, PEEK(3 + oparg), update);
- #line 2272 "Python/generated_cases.c.h"
+ #line 2393 "Python/generated_cases.c.h"
Py_DECREF(update);
- #line 1602 "Python/bytecodes.c"
+ #line 1677 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 2277 "Python/generated_cases.c.h"
+ #line 2398 "Python/generated_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
DISPATCH();
@@ -2282,25 +2403,25 @@
TARGET(MAP_ADD) {
PyObject *value = stack_pointer[-1];
PyObject *key = stack_pointer[-2];
- #line 1608 "Python/bytecodes.c"
+ #line 1683 "Python/bytecodes.c"
PyObject *dict = PEEK(oparg + 2); // key, value are still on the stack
assert(PyDict_CheckExact(dict));
/* dict[key] = value */
// Do not DECREF INPUTS because the function steals the references
if (_PyDict_SetItem_Take2((PyDictObject *)dict, key, value) != 0) goto pop_2_error;
- #line 2292 "Python/generated_cases.c.h"
+ #line 2413 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
TARGET(INSTRUMENTED_LOAD_SUPER_ATTR) {
- #line 1616 "Python/bytecodes.c"
+ #line 1691 "Python/bytecodes.c"
_PySuperAttrCache *cache = (_PySuperAttrCache *)next_instr;
// cancel out the decrement that will happen in LOAD_SUPER_ATTR; we
// don't want to specialize instrumented instructions
INCREMENT_ADAPTIVE_COUNTER(cache->counter);
GO_TO_INSTRUCTION(LOAD_SUPER_ATTR);
- #line 2304 "Python/generated_cases.c.h"
+ #line 2425 "Python/generated_cases.c.h"
}
TARGET(LOAD_SUPER_ATTR) {
@@ -2311,7 +2432,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1630 "Python/bytecodes.c"
+ #line 1705 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 2);
int load_method = oparg & 1;
#if ENABLE_SPECIALIZATION
@@ -2353,16 +2474,16 @@
}
}
}
- #line 2357 "Python/generated_cases.c.h"
+ #line 2478 "Python/generated_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1672 "Python/bytecodes.c"
+ #line 1747 "Python/bytecodes.c"
if (super == NULL) goto pop_3_error;
res = PyObject_GetAttr(super, name);
Py_DECREF(super);
if (res == NULL) goto pop_3_error;
- #line 2366 "Python/generated_cases.c.h"
+ #line 2487 "Python/generated_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2377,20 +2498,20 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1691 "Python/bytecodes.c"
+ #line 1766 "Python/bytecodes.c"
assert(!(oparg & 1));
DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
STAT_INC(LOAD_SUPER_ATTR, hit);
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 2);
res = _PySuper_Lookup((PyTypeObject *)class, self, name, NULL);
- #line 2388 "Python/generated_cases.c.h"
+ #line 2509 "Python/generated_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1698 "Python/bytecodes.c"
+ #line 1773 "Python/bytecodes.c"
if (res == NULL) goto pop_3_error;
- #line 2394 "Python/generated_cases.c.h"
+ #line 2515 "Python/generated_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2405,7 +2526,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2;
PyObject *res;
- #line 1702 "Python/bytecodes.c"
+ #line 1777 "Python/bytecodes.c"
assert(oparg & 1);
DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
@@ -2428,7 +2549,7 @@
res = res2;
res2 = NULL;
}
- #line 2432 "Python/generated_cases.c.h"
+ #line 2553 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
stack_pointer[-2] = res2;
@@ -2442,7 +2563,7 @@
PyObject *owner = stack_pointer[-1];
PyObject *res2 = NULL;
PyObject *res;
- #line 1741 "Python/bytecodes.c"
+ #line 1816 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2476,9 +2597,9 @@
NULL | meth | arg1 | ... | argN
*/
- #line 2480 "Python/generated_cases.c.h"
+ #line 2601 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1775 "Python/bytecodes.c"
+ #line 1850 "Python/bytecodes.c"
if (meth == NULL) goto pop_1_error;
res2 = NULL;
res = meth;
@@ -2487,12 +2608,12 @@
else {
/* Classic, pushes one value. */
res = PyObject_GetAttr(owner, name);
- #line 2491 "Python/generated_cases.c.h"
+ #line 2612 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1784 "Python/bytecodes.c"
+ #line 1859 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
}
- #line 2496 "Python/generated_cases.c.h"
+ #line 2617 "Python/generated_cases.c.h"
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -2506,7 +2627,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1793 "Python/bytecodes.c"
+ #line 1868 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2519,7 +2640,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2523 "Python/generated_cases.c.h"
+ #line 2644 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2534,7 +2655,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1809 "Python/bytecodes.c"
+ #line 1884 "Python/bytecodes.c"
DEOPT_IF(!PyModule_CheckExact(owner), LOAD_ATTR);
PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner)->md_dict;
assert(dict != NULL);
@@ -2547,7 +2668,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2551 "Python/generated_cases.c.h"
+ #line 2672 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2562,7 +2683,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1825 "Python/bytecodes.c"
+ #line 1900 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2589,7 +2710,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2593 "Python/generated_cases.c.h"
+ #line 2714 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2604,7 +2725,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1855 "Python/bytecodes.c"
+ #line 1930 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2614,7 +2735,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2618 "Python/generated_cases.c.h"
+ #line 2739 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2629,7 +2750,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 1868 "Python/bytecodes.c"
+ #line 1943 "Python/bytecodes.c"
DEOPT_IF(!PyType_Check(cls), LOAD_ATTR);
DEOPT_IF(((PyTypeObject *)cls)->tp_version_tag != type_version,
@@ -2641,7 +2762,7 @@
res = descr;
assert(res != NULL);
Py_INCREF(res);
- #line 2645 "Python/generated_cases.c.h"
+ #line 2766 "Python/generated_cases.c.h"
Py_DECREF(cls);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2655,7 +2776,7 @@
uint32_t type_version = read_u32(&next_instr[1].cache);
uint32_t func_version = read_u32(&next_instr[3].cache);
PyObject *fget = read_obj(&next_instr[5].cache);
- #line 1883 "Python/bytecodes.c"
+ #line 1958 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
PyTypeObject *cls = Py_TYPE(owner);
@@ -2679,7 +2800,7 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2683 "Python/generated_cases.c.h"
+ #line 2804 "Python/generated_cases.c.h"
}
TARGET(LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN) {
@@ -2687,7 +2808,7 @@
uint32_t type_version = read_u32(&next_instr[1].cache);
uint32_t func_version = read_u32(&next_instr[3].cache);
PyObject *getattribute = read_obj(&next_instr[5].cache);
- #line 1909 "Python/bytecodes.c"
+ #line 1984 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
PyTypeObject *cls = Py_TYPE(owner);
DEOPT_IF(cls->tp_version_tag != type_version, LOAD_ATTR);
@@ -2713,7 +2834,7 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2717 "Python/generated_cases.c.h"
+ #line 2838 "Python/generated_cases.c.h"
}
TARGET(STORE_ATTR_INSTANCE_VALUE) {
@@ -2721,7 +2842,7 @@
PyObject *value = stack_pointer[-2];
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1937 "Python/bytecodes.c"
+ #line 2012 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2739,7 +2860,7 @@
Py_DECREF(old_value);
}
Py_DECREF(owner);
- #line 2743 "Python/generated_cases.c.h"
+ #line 2864 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2750,7 +2871,7 @@
PyObject *value = stack_pointer[-2];
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t hint = read_u16(&next_instr[3].cache);
- #line 1957 "Python/bytecodes.c"
+ #line 2032 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2789,7 +2910,7 @@
/* PEP 509 */
dict->ma_version_tag = new_version;
Py_DECREF(owner);
- #line 2793 "Python/generated_cases.c.h"
+ #line 2914 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2800,7 +2921,7 @@
PyObject *value = stack_pointer[-2];
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1998 "Python/bytecodes.c"
+ #line 2073 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2810,7 +2931,7 @@
*(PyObject **)addr = value;
Py_XDECREF(old_value);
Py_DECREF(owner);
- #line 2814 "Python/generated_cases.c.h"
+ #line 2935 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2822,7 +2943,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2017 "Python/bytecodes.c"
+ #line 2092 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyCompareOpCache *cache = (_PyCompareOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2833,14 +2954,20 @@
STAT_INC(COMPARE_OP, deferred);
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
#endif /* ENABLE_SPECIALIZATION */
- assert((oparg >> 4) <= Py_GE);
- res = PyObject_RichCompare(left, right, oparg>>4);
- #line 2839 "Python/generated_cases.c.h"
+ assert((oparg >> 5) <= Py_GE);
+ res = PyObject_RichCompare(left, right, oparg >> 5);
+ #line 2960 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2030 "Python/bytecodes.c"
+ #line 2105 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 2844 "Python/generated_cases.c.h"
+ if (oparg & 16) {
+ int res_bool = PyObject_IsTrue(res);
+ Py_DECREF(res);
+ if (res_bool < 0) goto pop_2_error;
+ res = res_bool ? Py_True : Py_False;
+ }
+ #line 2971 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2851,7 +2978,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2034 "Python/bytecodes.c"
+ #line 2115 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyFloat_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -2862,7 +2989,8 @@
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 2866 "Python/generated_cases.c.h"
+ // It's always a bool, so we don't care about oparg & 16.
+ #line 2994 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2873,7 +3001,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2048 "Python/bytecodes.c"
+ #line 2130 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyLong_CheckExact(right), COMPARE_OP);
DEOPT_IF(!_PyLong_IsCompact((PyLongObject *)left), COMPARE_OP);
@@ -2888,7 +3016,8 @@
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 2892 "Python/generated_cases.c.h"
+ // It's always a bool, so we don't care about oparg & 16.
+ #line 3021 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2899,19 +3028,20 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2066 "Python/bytecodes.c"
+ #line 2149 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
int eq = _PyUnicode_Equal(left, right);
- assert((oparg >>4) == Py_EQ || (oparg >>4) == Py_NE);
+ assert((oparg >> 5) == Py_EQ || (oparg >> 5) == Py_NE);
_Py_DECREF_SPECIALIZED(left, _PyUnicode_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyUnicode_ExactDealloc);
assert(eq == 0 || eq == 1);
assert((oparg & 0xf) == COMPARISON_NOT_EQUALS || (oparg & 0xf) == COMPARISON_EQUALS);
assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS);
res = ((COMPARISON_NOT_EQUALS + eq) & oparg) ? Py_True : Py_False;
- #line 2915 "Python/generated_cases.c.h"
+ // It's always a bool, so we don't care about oparg & 16.
+ #line 3045 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2922,14 +3052,14 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2080 "Python/bytecodes.c"
+ #line 2164 "Python/bytecodes.c"
int res = Py_Is(left, right) ^ oparg;
- #line 2928 "Python/generated_cases.c.h"
+ #line 3058 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2082 "Python/bytecodes.c"
+ #line 2166 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 2933 "Python/generated_cases.c.h"
+ #line 3063 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -2939,15 +3069,15 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2086 "Python/bytecodes.c"
+ #line 2170 "Python/bytecodes.c"
int res = PySequence_Contains(right, left);
- #line 2945 "Python/generated_cases.c.h"
+ #line 3075 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2088 "Python/bytecodes.c"
+ #line 2172 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
b = (res ^ oparg) ? Py_True : Py_False;
- #line 2951 "Python/generated_cases.c.h"
+ #line 3081 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -2958,12 +3088,12 @@
PyObject *exc_value = stack_pointer[-2];
PyObject *rest;
PyObject *match;
- #line 2093 "Python/bytecodes.c"
+ #line 2177 "Python/bytecodes.c"
if (check_except_star_type_valid(tstate, match_type) < 0) {
- #line 2964 "Python/generated_cases.c.h"
+ #line 3094 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2095 "Python/bytecodes.c"
+ #line 2179 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
@@ -2971,10 +3101,10 @@
rest = NULL;
int res = exception_group_match(exc_value, match_type,
&match, &rest);
- #line 2975 "Python/generated_cases.c.h"
+ #line 3105 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2103 "Python/bytecodes.c"
+ #line 2187 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
assert((match == NULL) == (rest == NULL));
@@ -2983,7 +3113,7 @@
if (!Py_IsNone(match)) {
PyErr_SetHandledException(match);
}
- #line 2987 "Python/generated_cases.c.h"
+ #line 3117 "Python/generated_cases.c.h"
stack_pointer[-1] = match;
stack_pointer[-2] = rest;
DISPATCH();
@@ -2993,21 +3123,21 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2114 "Python/bytecodes.c"
+ #line 2198 "Python/bytecodes.c"
assert(PyExceptionInstance_Check(left));
if (check_except_type_valid(tstate, right) < 0) {
- #line 3000 "Python/generated_cases.c.h"
+ #line 3130 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2117 "Python/bytecodes.c"
+ #line 2201 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
int res = PyErr_GivenExceptionMatches(left, right);
- #line 3007 "Python/generated_cases.c.h"
+ #line 3137 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2122 "Python/bytecodes.c"
+ #line 2206 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 3011 "Python/generated_cases.c.h"
+ #line 3141 "Python/generated_cases.c.h"
stack_pointer[-1] = b;
DISPATCH();
}
@@ -3016,15 +3146,15 @@
PyObject *fromlist = stack_pointer[-1];
PyObject *level = stack_pointer[-2];
PyObject *res;
- #line 2126 "Python/bytecodes.c"
+ #line 2210 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
res = import_name(tstate, frame, name, fromlist, level);
- #line 3023 "Python/generated_cases.c.h"
+ #line 3153 "Python/generated_cases.c.h"
Py_DECREF(level);
Py_DECREF(fromlist);
- #line 2129 "Python/bytecodes.c"
+ #line 2213 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 3028 "Python/generated_cases.c.h"
+ #line 3158 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3033,25 +3163,25 @@
TARGET(IMPORT_FROM) {
PyObject *from = stack_pointer[-1];
PyObject *res;
- #line 2133 "Python/bytecodes.c"
+ #line 2217 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
res = import_from(tstate, from, name);
if (res == NULL) goto error;
- #line 3041 "Python/generated_cases.c.h"
+ #line 3171 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
}
TARGET(JUMP_FORWARD) {
- #line 2139 "Python/bytecodes.c"
+ #line 2223 "Python/bytecodes.c"
JUMPBY(oparg);
- #line 3050 "Python/generated_cases.c.h"
+ #line 3180 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(JUMP_BACKWARD) {
- #line 2143 "Python/bytecodes.c"
+ #line 2227 "Python/bytecodes.c"
_Py_CODEUNIT *here = next_instr - 1;
assert(oparg <= INSTR_OFFSET());
JUMPBY(1-oparg);
@@ -3069,13 +3199,13 @@
goto resume_frame;
}
#endif /* ENABLE_SPECIALIZATION */
- #line 3073 "Python/generated_cases.c.h"
+ #line 3203 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
TARGET(ENTER_EXECUTOR) {
- #line 2174 "Python/bytecodes.c"
+ #line 2258 "Python/bytecodes.c"
PyCodeObject *code = _PyFrame_GetCode(frame);
_PyExecutorObject *executor = (_PyExecutorObject *)code->co_executors->executors[oparg&255];
Py_INCREF(executor);
@@ -3085,107 +3215,81 @@
goto resume_with_error;
}
goto resume_frame;
- #line 3089 "Python/generated_cases.c.h"
+ #line 3219 "Python/generated_cases.c.h"
}
TARGET(POP_JUMP_IF_FALSE) {
PyObject *cond = stack_pointer[-1];
- #line 2186 "Python/bytecodes.c"
- if (Py_IsFalse(cond)) {
- JUMPBY(oparg);
- }
- else if (!Py_IsTrue(cond)) {
- int err = PyObject_IsTrue(cond);
- #line 3100 "Python/generated_cases.c.h"
- Py_DECREF(cond);
- #line 2192 "Python/bytecodes.c"
- if (err == 0) {
- JUMPBY(oparg);
- }
- else {
- if (err < 0) goto pop_1_error;
- }
- }
- #line 3110 "Python/generated_cases.c.h"
+ #line 2270 "Python/bytecodes.c"
+ assert(PyBool_Check(cond));
+ JUMPBY(oparg * Py_IsFalse(cond));
+ #line 3227 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_TRUE) {
PyObject *cond = stack_pointer[-1];
- #line 2202 "Python/bytecodes.c"
- if (Py_IsTrue(cond)) {
- JUMPBY(oparg);
- }
- else if (!Py_IsFalse(cond)) {
- int err = PyObject_IsTrue(cond);
- #line 3123 "Python/generated_cases.c.h"
- Py_DECREF(cond);
- #line 2208 "Python/bytecodes.c"
- if (err > 0) {
- JUMPBY(oparg);
- }
- else {
- if (err < 0) goto pop_1_error;
- }
- }
- #line 3133 "Python/generated_cases.c.h"
+ #line 2275 "Python/bytecodes.c"
+ assert(PyBool_Check(cond));
+ JUMPBY(oparg * Py_IsTrue(cond));
+ #line 3237 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NOT_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2218 "Python/bytecodes.c"
+ #line 2280 "Python/bytecodes.c"
if (!Py_IsNone(value)) {
- #line 3142 "Python/generated_cases.c.h"
+ #line 3246 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2220 "Python/bytecodes.c"
+ #line 2282 "Python/bytecodes.c"
JUMPBY(oparg);
}
- #line 3147 "Python/generated_cases.c.h"
+ #line 3251 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2225 "Python/bytecodes.c"
+ #line 2287 "Python/bytecodes.c"
if (Py_IsNone(value)) {
JUMPBY(oparg);
}
else {
- #line 3159 "Python/generated_cases.c.h"
+ #line 3263 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2230 "Python/bytecodes.c"
+ #line 2292 "Python/bytecodes.c"
}
- #line 3163 "Python/generated_cases.c.h"
+ #line 3267 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(JUMP_BACKWARD_NO_INTERRUPT) {
- #line 2234 "Python/bytecodes.c"
+ #line 2296 "Python/bytecodes.c"
/* This bytecode is used in the `yield from` or `await` loop.
* If there is an interrupt, we want it handled in the innermost
* generator or coroutine, so we deliberately do not check it here.
* (see bpo-30039).
*/
JUMPBY(-oparg);
- #line 3176 "Python/generated_cases.c.h"
+ #line 3280 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(GET_LEN) {
PyObject *obj = stack_pointer[-1];
PyObject *len_o;
- #line 2243 "Python/bytecodes.c"
+ #line 2305 "Python/bytecodes.c"
// PUSH(len(TOS))
Py_ssize_t len_i = PyObject_Length(obj);
if (len_i < 0) goto error;
len_o = PyLong_FromSsize_t(len_i);
if (len_o == NULL) goto error;
- #line 3189 "Python/generated_cases.c.h"
+ #line 3293 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = len_o;
DISPATCH();
@@ -3196,16 +3300,16 @@
PyObject *type = stack_pointer[-2];
PyObject *subject = stack_pointer[-3];
PyObject *attrs;
- #line 2251 "Python/bytecodes.c"
+ #line 2313 "Python/bytecodes.c"
// Pop TOS and TOS1. Set TOS to a tuple of attributes on success, or
// None on failure.
assert(PyTuple_CheckExact(names));
attrs = match_class(tstate, subject, type, oparg, names);
- #line 3205 "Python/generated_cases.c.h"
+ #line 3309 "Python/generated_cases.c.h"
Py_DECREF(subject);
Py_DECREF(type);
Py_DECREF(names);
- #line 2256 "Python/bytecodes.c"
+ #line 2318 "Python/bytecodes.c"
if (attrs) {
assert(PyTuple_CheckExact(attrs)); // Success!
}
@@ -3213,7 +3317,7 @@
if (_PyErr_Occurred(tstate)) goto pop_3_error;
attrs = Py_None; // Failure!
}
- #line 3217 "Python/generated_cases.c.h"
+ #line 3321 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = attrs;
DISPATCH();
@@ -3222,10 +3326,10 @@
TARGET(MATCH_MAPPING) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2266 "Python/bytecodes.c"
+ #line 2328 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
res = match ? Py_True : Py_False;
- #line 3229 "Python/generated_cases.c.h"
+ #line 3333 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3234,10 +3338,10 @@
TARGET(MATCH_SEQUENCE) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2271 "Python/bytecodes.c"
+ #line 2333 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
res = match ? Py_True : Py_False;
- #line 3241 "Python/generated_cases.c.h"
+ #line 3345 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3247,11 +3351,11 @@
PyObject *keys = stack_pointer[-1];
PyObject *subject = stack_pointer[-2];
PyObject *values_or_none;
- #line 2276 "Python/bytecodes.c"
+ #line 2338 "Python/bytecodes.c"
// On successful match, PUSH(values). Otherwise, PUSH(None).
values_or_none = match_keys(tstate, subject, keys);
if (values_or_none == NULL) goto error;
- #line 3255 "Python/generated_cases.c.h"
+ #line 3359 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = values_or_none;
DISPATCH();
@@ -3260,14 +3364,14 @@
TARGET(GET_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2282 "Python/bytecodes.c"
+ #line 2344 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
iter = PyObject_GetIter(iterable);
- #line 3267 "Python/generated_cases.c.h"
+ #line 3371 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2285 "Python/bytecodes.c"
+ #line 2347 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
- #line 3271 "Python/generated_cases.c.h"
+ #line 3375 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -3275,7 +3379,7 @@
TARGET(GET_YIELD_FROM_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2289 "Python/bytecodes.c"
+ #line 2351 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
if (PyCoro_CheckExact(iterable)) {
/* `iterable` is a coroutine */
@@ -3298,11 +3402,11 @@
if (iter == NULL) {
goto error;
}
- #line 3302 "Python/generated_cases.c.h"
+ #line 3406 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2312 "Python/bytecodes.c"
+ #line 2374 "Python/bytecodes.c"
}
- #line 3306 "Python/generated_cases.c.h"
+ #line 3410 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -3312,7 +3416,7 @@
static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache size");
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2330 "Python/bytecodes.c"
+ #line 2392 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyForIterCache *cache = (_PyForIterCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -3344,7 +3448,7 @@
DISPATCH();
}
// Common case: no jump, leave it to the code generator
- #line 3348 "Python/generated_cases.c.h"
+ #line 3452 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3352,7 +3456,7 @@
}
TARGET(INSTRUMENTED_FOR_ITER) {
- #line 2364 "Python/bytecodes.c"
+ #line 2426 "Python/bytecodes.c"
_Py_CODEUNIT *here = next_instr-1;
_Py_CODEUNIT *target;
PyObject *iter = TOP();
@@ -3378,14 +3482,14 @@
target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
}
INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
- #line 3382 "Python/generated_cases.c.h"
+ #line 3486 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(FOR_ITER_LIST) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2392 "Python/bytecodes.c"
+ #line 2454 "Python/bytecodes.c"
DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
_PyListIterObject *it = (_PyListIterObject *)iter;
STAT_INC(FOR_ITER, hit);
@@ -3406,7 +3510,7 @@
DISPATCH();
end_for_iter_list:
// Common case: no jump, leave it to the code generator
- #line 3410 "Python/generated_cases.c.h"
+ #line 3514 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3416,7 +3520,7 @@
TARGET(FOR_ITER_TUPLE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2415 "Python/bytecodes.c"
+ #line 2477 "Python/bytecodes.c"
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3437,7 +3541,7 @@
DISPATCH();
end_for_iter_tuple:
// Common case: no jump, leave it to the code generator
- #line 3441 "Python/generated_cases.c.h"
+ #line 3545 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3447,7 +3551,7 @@
TARGET(FOR_ITER_RANGE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2438 "Python/bytecodes.c"
+ #line 2500 "Python/bytecodes.c"
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3466,7 +3570,7 @@
if (next == NULL) {
goto error;
}
- #line 3470 "Python/generated_cases.c.h"
+ #line 3574 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3475,7 +3579,7 @@
TARGET(FOR_ITER_GEN) {
PyObject *iter = stack_pointer[-1];
- #line 2459 "Python/bytecodes.c"
+ #line 2521 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
PyGenObject *gen = (PyGenObject *)iter;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
@@ -3491,14 +3595,14 @@
assert(next_instr[oparg].op.code == END_FOR ||
next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
DISPATCH_INLINED(gen_frame);
- #line 3495 "Python/generated_cases.c.h"
+ #line 3599 "Python/generated_cases.c.h"
}
TARGET(BEFORE_ASYNC_WITH) {
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2477 "Python/bytecodes.c"
+ #line 2539 "Python/bytecodes.c"
PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__));
if (enter == NULL) {
if (!_PyErr_Occurred(tstate)) {
@@ -3521,16 +3625,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3525 "Python/generated_cases.c.h"
+ #line 3629 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2500 "Python/bytecodes.c"
+ #line 2562 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3534 "Python/generated_cases.c.h"
+ #line 3638 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3541,7 +3645,7 @@
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2509 "Python/bytecodes.c"
+ #line 2571 "Python/bytecodes.c"
/* pop the context manager, push its __exit__ and the
* value returned from calling its __enter__
*/
@@ -3567,16 +3671,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3571 "Python/generated_cases.c.h"
+ #line 3675 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2535 "Python/bytecodes.c"
+ #line 2597 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3580 "Python/generated_cases.c.h"
+ #line 3684 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3588,7 +3692,7 @@
PyObject *lasti = stack_pointer[-3];
PyObject *exit_func = stack_pointer[-4];
PyObject *res;
- #line 2544 "Python/bytecodes.c"
+ #line 2606 "Python/bytecodes.c"
/* At the top of the stack are 4 values:
- val: TOP = exc_info()
- unused: SECOND = previous exception
@@ -3609,7 +3713,7 @@
res = PyObject_Vectorcall(exit_func, stack + 1,
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL) goto error;
- #line 3613 "Python/generated_cases.c.h"
+ #line 3717 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3618,7 +3722,7 @@
TARGET(PUSH_EXC_INFO) {
PyObject *new_exc = stack_pointer[-1];
PyObject *prev_exc;
- #line 2583 "Python/bytecodes.c"
+ #line 2645 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
if (exc_info->exc_value != NULL) {
prev_exc = exc_info->exc_value;
@@ -3628,7 +3732,7 @@
}
assert(PyExceptionInstance_Check(new_exc));
exc_info->exc_value = Py_NewRef(new_exc);
- #line 3632 "Python/generated_cases.c.h"
+ #line 3736 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = new_exc;
stack_pointer[-2] = prev_exc;
@@ -3642,7 +3746,7 @@
uint32_t type_version = read_u32(&next_instr[1].cache);
uint32_t keys_version = read_u32(&next_instr[3].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2595 "Python/bytecodes.c"
+ #line 2657 "Python/bytecodes.c"
/* Cached method object */
PyTypeObject *self_cls = Py_TYPE(self);
assert(type_version != 0);
@@ -3659,7 +3763,7 @@
assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR));
res = self;
assert(oparg & 1);
- #line 3663 "Python/generated_cases.c.h"
+ #line 3767 "Python/generated_cases.c.h"
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3673,7 +3777,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2614 "Python/bytecodes.c"
+ #line 2676 "Python/bytecodes.c"
PyTypeObject *self_cls = Py_TYPE(self);
DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
assert(self_cls->tp_dictoffset == 0);
@@ -3683,7 +3787,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3687 "Python/generated_cases.c.h"
+ #line 3791 "Python/generated_cases.c.h"
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3697,7 +3801,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2626 "Python/bytecodes.c"
+ #line 2688 "Python/bytecodes.c"
PyTypeObject *self_cls = Py_TYPE(self);
DEOPT_IF(self_cls->tp_version_tag != type_version, LOAD_ATTR);
Py_ssize_t dictoffset = self_cls->tp_dictoffset;
@@ -3711,7 +3815,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3715 "Python/generated_cases.c.h"
+ #line 3819 "Python/generated_cases.c.h"
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
if (oparg & 1) { stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))] = res2; }
@@ -3720,16 +3824,16 @@
}
TARGET(KW_NAMES) {
- #line 2642 "Python/bytecodes.c"
+ #line 2704 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg < PyTuple_GET_SIZE(FRAME_CO_CONSTS));
kwnames = GETITEM(FRAME_CO_CONSTS, oparg);
- #line 3728 "Python/generated_cases.c.h"
+ #line 3832 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_CALL) {
- #line 2648 "Python/bytecodes.c"
+ #line 2710 "Python/bytecodes.c"
int is_meth = PEEK(oparg+2) != NULL;
int total_args = oparg + is_meth;
PyObject *function = PEEK(total_args + 1);
@@ -3742,7 +3846,7 @@
_PyCallCache *cache = (_PyCallCache *)next_instr;
INCREMENT_ADAPTIVE_COUNTER(cache->counter);
GO_TO_INSTRUCTION(CALL);
- #line 3746 "Python/generated_cases.c.h"
+ #line 3850 "Python/generated_cases.c.h"
}
TARGET(CALL) {
@@ -3752,7 +3856,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2694 "Python/bytecodes.c"
+ #line 2756 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -3834,7 +3938,7 @@
Py_DECREF(args[i]);
}
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3838 "Python/generated_cases.c.h"
+ #line 3942 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3846,7 +3950,7 @@
TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 2782 "Python/bytecodes.c"
+ #line 2844 "Python/bytecodes.c"
DEOPT_IF(method != NULL, CALL);
DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL);
STAT_INC(CALL, hit);
@@ -3856,7 +3960,7 @@
PEEK(oparg + 2) = Py_NewRef(meth); // method
Py_DECREF(callable);
GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
- #line 3860 "Python/generated_cases.c.h"
+ #line 3964 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_EXACT_ARGS) {
@@ -3865,7 +3969,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2794 "Python/bytecodes.c"
+ #line 2856 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -3891,7 +3995,7 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3895 "Python/generated_cases.c.h"
+ #line 3999 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -3899,7 +4003,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2822 "Python/bytecodes.c"
+ #line 2884 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -3935,7 +4039,7 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3939 "Python/generated_cases.c.h"
+ #line 4043 "Python/generated_cases.c.h"
}
TARGET(CALL_NO_KW_TYPE_1) {
@@ -3943,7 +4047,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2860 "Python/bytecodes.c"
+ #line 2922 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -3953,7 +4057,7 @@
res = Py_NewRef(Py_TYPE(obj));
Py_DECREF(obj);
Py_DECREF(&PyType_Type); // I.e., callable
- #line 3957 "Python/generated_cases.c.h"
+ #line 4061 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3966,7 +4070,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2872 "Python/bytecodes.c"
+ #line 2934 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -3977,7 +4081,7 @@
Py_DECREF(arg);
Py_DECREF(&PyUnicode_Type); // I.e., callable
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3981 "Python/generated_cases.c.h"
+ #line 4085 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3991,7 +4095,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2886 "Python/bytecodes.c"
+ #line 2948 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -4002,7 +4106,7 @@
Py_DECREF(arg);
Py_DECREF(&PyTuple_Type); // I.e., tuple
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4006 "Python/generated_cases.c.h"
+ #line 4110 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4015,7 +4119,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
- #line 2900 "Python/bytecodes.c"
+ #line 2962 "Python/bytecodes.c"
/* This instruction does the following:
* 1. Creates the object (by calling ``object.__new__``)
* 2. Pushes a shim frame to the frame stack (to cleanup after ``__init__``)
@@ -4065,12 +4169,12 @@
frame = cframe.current_frame = init_frame;
CALL_STAT_INC(inlined_py_calls);
goto start_frame;
- #line 4069 "Python/generated_cases.c.h"
+ #line 4173 "Python/generated_cases.c.h"
}
TARGET(EXIT_INIT_CHECK) {
PyObject *should_be_none = stack_pointer[-1];
- #line 2952 "Python/bytecodes.c"
+ #line 3014 "Python/bytecodes.c"
assert(STACK_LEVEL() == 2);
if (should_be_none != Py_None) {
PyErr_Format(PyExc_TypeError,
@@ -4078,7 +4182,7 @@
Py_TYPE(should_be_none)->tp_name);
goto error;
}
- #line 4082 "Python/generated_cases.c.h"
+ #line 4186 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -4088,7 +4192,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2962 "Python/bytecodes.c"
+ #line 3024 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4110,7 +4214,7 @@
}
Py_DECREF(tp);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4114 "Python/generated_cases.c.h"
+ #line 4218 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4124,7 +4228,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2987 "Python/bytecodes.c"
+ #line 3049 "Python/bytecodes.c"
/* Builtin METH_O functions */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4152,7 +4256,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4156 "Python/generated_cases.c.h"
+ #line 4260 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4166,7 +4270,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3018 "Python/bytecodes.c"
+ #line 3080 "Python/bytecodes.c"
/* Builtin METH_FASTCALL functions, without keywords */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4198,7 +4302,7 @@
'invalid'). In those cases an exception is set, so we must
handle it.
*/
- #line 4202 "Python/generated_cases.c.h"
+ #line 4306 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4212,7 +4316,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3053 "Python/bytecodes.c"
+ #line 3115 "Python/bytecodes.c"
/* Builtin METH_FASTCALL | METH_KEYWORDS functions */
int is_meth = method != NULL;
int total_args = oparg;
@@ -4244,7 +4348,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4248 "Python/generated_cases.c.h"
+ #line 4352 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4258,7 +4362,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3088 "Python/bytecodes.c"
+ #line 3150 "Python/bytecodes.c"
assert(kwnames == NULL);
/* len(o) */
int is_meth = method != NULL;
@@ -4283,7 +4387,7 @@
Py_DECREF(callable);
Py_DECREF(arg);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4287 "Python/generated_cases.c.h"
+ #line 4391 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4296,7 +4400,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3115 "Python/bytecodes.c"
+ #line 3177 "Python/bytecodes.c"
assert(kwnames == NULL);
/* isinstance(o, o2) */
int is_meth = method != NULL;
@@ -4323,7 +4427,7 @@
Py_DECREF(cls);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4327 "Python/generated_cases.c.h"
+ #line 4431 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4335,7 +4439,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *self = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 3145 "Python/bytecodes.c"
+ #line 3207 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
assert(method != NULL);
@@ -4353,14 +4457,14 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_CALL + 1);
assert(next_instr[-1].op.code == POP_TOP);
DISPATCH();
- #line 4357 "Python/generated_cases.c.h"
+ #line 4461 "Python/generated_cases.c.h"
}
TARGET(CALL_NO_KW_METHOD_DESCRIPTOR_O) {
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3165 "Python/bytecodes.c"
+ #line 3227 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4391,7 +4495,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4395 "Python/generated_cases.c.h"
+ #line 4499 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4404,7 +4508,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3199 "Python/bytecodes.c"
+ #line 3261 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4433,7 +4537,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4437 "Python/generated_cases.c.h"
+ #line 4541 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4446,7 +4550,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3231 "Python/bytecodes.c"
+ #line 3293 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 0 || oparg == 1);
int is_meth = method != NULL;
@@ -4475,7 +4579,7 @@
Py_DECREF(self);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4479 "Python/generated_cases.c.h"
+ #line 4583 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4488,7 +4592,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3263 "Python/bytecodes.c"
+ #line 3325 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4516,7 +4620,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4520 "Python/generated_cases.c.h"
+ #line 4624 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4526,9 +4630,9 @@
}
TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
- #line 3294 "Python/bytecodes.c"
+ #line 3356 "Python/bytecodes.c"
GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
- #line 4532 "Python/generated_cases.c.h"
+ #line 4636 "Python/generated_cases.c.h"
}
TARGET(CALL_FUNCTION_EX) {
@@ -4537,7 +4641,7 @@
PyObject *callargs = stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))];
PyObject *func = stack_pointer[-(2 + ((oparg & 1) ? 1 : 0))];
PyObject *result;
- #line 3298 "Python/bytecodes.c"
+ #line 3360 "Python/bytecodes.c"
// DICT_MERGE is called before this opcode if there are kwargs.
// It converts all dict subtypes in kwargs into regular dicts.
assert(kwargs == NULL || PyDict_CheckExact(kwargs));
@@ -4599,14 +4703,14 @@
}
result = PyObject_Call(func, callargs, kwargs);
}
- #line 4603 "Python/generated_cases.c.h"
+ #line 4707 "Python/generated_cases.c.h"
Py_DECREF(func);
Py_DECREF(callargs);
Py_XDECREF(kwargs);
- #line 3360 "Python/bytecodes.c"
+ #line 3422 "Python/bytecodes.c"
assert(PEEK(3 + (oparg & 1)) == NULL);
if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
- #line 4610 "Python/generated_cases.c.h"
+ #line 4714 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg & 1) ? 1 : 0));
STACK_SHRINK(2);
stack_pointer[-1] = result;
@@ -4617,7 +4721,7 @@
TARGET(MAKE_FUNCTION) {
PyObject *codeobj = stack_pointer[-1];
PyObject *func;
- #line 3366 "Python/bytecodes.c"
+ #line 3428 "Python/bytecodes.c"
PyFunctionObject *func_obj = (PyFunctionObject *)
PyFunction_New(codeobj, GLOBALS());
@@ -4629,7 +4733,7 @@
func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
func = (PyObject *)func_obj;
- #line 4633 "Python/generated_cases.c.h"
+ #line 4737 "Python/generated_cases.c.h"
stack_pointer[-1] = func;
DISPATCH();
}
@@ -4637,7 +4741,7 @@
TARGET(SET_FUNCTION_ATTRIBUTE) {
PyObject *func = stack_pointer[-1];
PyObject *attr = stack_pointer[-2];
- #line 3380 "Python/bytecodes.c"
+ #line 3442 "Python/bytecodes.c"
assert(PyFunction_Check(func));
PyFunctionObject *func_obj = (PyFunctionObject *)func;
switch(oparg) {
@@ -4662,14 +4766,14 @@
default:
Py_UNREACHABLE();
}
- #line 4666 "Python/generated_cases.c.h"
+ #line 4770 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = func;
DISPATCH();
}
TARGET(RETURN_GENERATOR) {
- #line 3407 "Python/bytecodes.c"
+ #line 3469 "Python/bytecodes.c"
assert(PyFunction_Check(frame->f_funcobj));
PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -4690,7 +4794,7 @@
frame = cframe.current_frame = prev;
_PyFrame_StackPush(frame, (PyObject *)gen);
goto resume_frame;
- #line 4694 "Python/generated_cases.c.h"
+ #line 4798 "Python/generated_cases.c.h"
}
TARGET(BUILD_SLICE) {
@@ -4698,15 +4802,15 @@
PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
PyObject *slice;
- #line 3430 "Python/bytecodes.c"
+ #line 3492 "Python/bytecodes.c"
slice = PySlice_New(start, stop, step);
- #line 4704 "Python/generated_cases.c.h"
+ #line 4808 "Python/generated_cases.c.h"
Py_DECREF(start);
Py_DECREF(stop);
Py_XDECREF(step);
- #line 3432 "Python/bytecodes.c"
+ #line 3494 "Python/bytecodes.c"
if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
- #line 4710 "Python/generated_cases.c.h"
+ #line 4814 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg == 3) ? 1 : 0));
STACK_SHRINK(1);
stack_pointer[-1] = slice;
@@ -4716,14 +4820,14 @@
TARGET(CONVERT_VALUE) {
PyObject *value = stack_pointer[-1];
PyObject *result;
- #line 3436 "Python/bytecodes.c"
+ #line 3498 "Python/bytecodes.c"
convertion_func_ptr conv_fn;
assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
conv_fn = CONVERSION_FUNCTIONS[oparg];
result = conv_fn(value);
Py_DECREF(value);
if (result == NULL) goto pop_1_error;
- #line 4727 "Python/generated_cases.c.h"
+ #line 4831 "Python/generated_cases.c.h"
stack_pointer[-1] = result;
DISPATCH();
}
@@ -4731,7 +4835,7 @@
TARGET(FORMAT_SIMPLE) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 3445 "Python/bytecodes.c"
+ #line 3507 "Python/bytecodes.c"
/* If value is a unicode object, then we know the result
* of format(value) is value itself. */
if (!PyUnicode_CheckExact(value)) {
@@ -4742,7 +4846,7 @@
else {
res = value;
}
- #line 4746 "Python/generated_cases.c.h"
+ #line 4850 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -4751,12 +4855,12 @@
PyObject *fmt_spec = stack_pointer[-1];
PyObject *value = stack_pointer[-2];
PyObject *res;
- #line 3458 "Python/bytecodes.c"
+ #line 3520 "Python/bytecodes.c"
res = PyObject_Format(value, fmt_spec);
Py_DECREF(value);
Py_DECREF(fmt_spec);
if (res == NULL) goto pop_2_error;
- #line 4760 "Python/generated_cases.c.h"
+ #line 4864 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -4765,10 +4869,10 @@
TARGET(COPY) {
PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
PyObject *top;
- #line 3465 "Python/bytecodes.c"
+ #line 3527 "Python/bytecodes.c"
assert(oparg > 0);
top = Py_NewRef(bottom);
- #line 4772 "Python/generated_cases.c.h"
+ #line 4876 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = top;
DISPATCH();
@@ -4780,7 +4884,7 @@
PyObject *rhs = stack_pointer[-1];
PyObject *lhs = stack_pointer[-2];
PyObject *res;
- #line 3470 "Python/bytecodes.c"
+ #line 3532 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -4795,12 +4899,12 @@
assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
assert(binary_ops[oparg]);
res = binary_ops[oparg](lhs, rhs);
- #line 4799 "Python/generated_cases.c.h"
+ #line 4903 "Python/generated_cases.c.h"
Py_DECREF(lhs);
Py_DECREF(rhs);
- #line 3485 "Python/bytecodes.c"
+ #line 3547 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 4804 "Python/generated_cases.c.h"
+ #line 4908 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -4810,16 +4914,16 @@
TARGET(SWAP) {
PyObject *top = stack_pointer[-1];
PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
- #line 3490 "Python/bytecodes.c"
+ #line 3552 "Python/bytecodes.c"
assert(oparg >= 2);
- #line 4816 "Python/generated_cases.c.h"
+ #line 4920 "Python/generated_cases.c.h"
stack_pointer[-1] = bottom;
stack_pointer[-(2 + (oparg-2))] = top;
DISPATCH();
}
TARGET(INSTRUMENTED_INSTRUCTION) {
- #line 3494 "Python/bytecodes.c"
+ #line 3556 "Python/bytecodes.c"
int next_opcode = _Py_call_instrumentation_instruction(
tstate, frame, next_instr-1);
if (next_opcode < 0) goto error;
@@ -4831,54 +4935,48 @@
assert(next_opcode > 0 && next_opcode < 256);
opcode = next_opcode;
DISPATCH_GOTO();
- #line 4835 "Python/generated_cases.c.h"
+ #line 4939 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_JUMP_FORWARD) {
- #line 3508 "Python/bytecodes.c"
+ #line 3570 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
- #line 4841 "Python/generated_cases.c.h"
+ #line 4945 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_JUMP_BACKWARD) {
- #line 3512 "Python/bytecodes.c"
+ #line 3574 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr+1-oparg, PY_MONITORING_EVENT_JUMP);
- #line 4848 "Python/generated_cases.c.h"
+ #line 4952 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) {
- #line 3517 "Python/bytecodes.c"
+ #line 3579 "Python/bytecodes.c"
PyObject *cond = POP();
- int err = PyObject_IsTrue(cond);
- Py_DECREF(cond);
- if (err < 0) goto error;
- _Py_CODEUNIT *here = next_instr-1;
- assert(err == 0 || err == 1);
- int offset = err*oparg;
+ assert(PyBool_Check(cond));
+ _Py_CODEUNIT *here = next_instr - 1;
+ int offset = Py_IsTrue(cond) * oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4863 "Python/generated_cases.c.h"
+ #line 4964 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) {
- #line 3528 "Python/bytecodes.c"
+ #line 3587 "Python/bytecodes.c"
PyObject *cond = POP();
- int err = PyObject_IsTrue(cond);
- Py_DECREF(cond);
- if (err < 0) goto error;
- _Py_CODEUNIT *here = next_instr-1;
- assert(err == 0 || err == 1);
- int offset = (1-err)*oparg;
+ assert(PyBool_Check(cond));
+ _Py_CODEUNIT *here = next_instr - 1;
+ int offset = Py_IsFalse(cond) * oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4877 "Python/generated_cases.c.h"
+ #line 4975 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) {
- #line 3539 "Python/bytecodes.c"
+ #line 3595 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4890,12 +4988,12 @@
offset = 0;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4894 "Python/generated_cases.c.h"
+ #line 4992 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) {
- #line 3553 "Python/bytecodes.c"
+ #line 3609 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4904,33 +5002,33 @@
}
else {
Py_DECREF(value);
- offset = oparg;
+ offset = oparg;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4911 "Python/generated_cases.c.h"
+ #line 5009 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(EXTENDED_ARG) {
- #line 3567 "Python/bytecodes.c"
+ #line 3623 "Python/bytecodes.c"
assert(oparg);
opcode = next_instr->op.code;
oparg = oparg << 8 | next_instr->op.arg;
PRE_DISPATCH_GOTO();
DISPATCH_GOTO();
- #line 4922 "Python/generated_cases.c.h"
+ #line 5020 "Python/generated_cases.c.h"
}
TARGET(CACHE) {
- #line 3575 "Python/bytecodes.c"
+ #line 3631 "Python/bytecodes.c"
assert(0 && "Executing a cache.");
Py_UNREACHABLE();
- #line 4929 "Python/generated_cases.c.h"
+ #line 5027 "Python/generated_cases.c.h"
}
TARGET(RESERVED) {
- #line 3580 "Python/bytecodes.c"
+ #line 3636 "Python/bytecodes.c"
assert(0 && "Executing RESERVED instruction.");
Py_UNREACHABLE();
- #line 4936 "Python/generated_cases.c.h"
+ #line 5034 "Python/generated_cases.c.h"
}
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
index 991006ceb182a..5c7de77deba2d 100644
--- a/Python/opcode_metadata.h
+++ b/Python/opcode_metadata.h
@@ -82,6 +82,20 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
return 1;
case UNARY_NOT:
return 1;
+ case TO_BOOL:
+ return 1;
+ case TO_BOOL_BOOL:
+ return 1;
+ case TO_BOOL_INT:
+ return 1;
+ case TO_BOOL_LIST:
+ return 1;
+ case TO_BOOL_NONE:
+ return 1;
+ case TO_BOOL_STR:
+ return 1;
+ case TO_BOOL_ALWAYS_TRUE:
+ return 1;
case UNARY_INVERT:
return 1;
case BINARY_OP_MULTIPLY_INT:
@@ -508,6 +522,20 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
return 1;
case UNARY_NOT:
return 1;
+ case TO_BOOL:
+ return 1;
+ case TO_BOOL_BOOL:
+ return 1;
+ case TO_BOOL_INT:
+ return 1;
+ case TO_BOOL_LIST:
+ return 1;
+ case TO_BOOL_NONE:
+ return 1;
+ case TO_BOOL_STR:
+ return 1;
+ case TO_BOOL_ALWAYS_TRUE:
+ return 1;
case UNARY_INVERT:
return 1;
case BINARY_OP_MULTIPLY_INT:
@@ -886,7 +914,7 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
}
#endif
-enum InstructionFormat { INSTR_FMT_IB, INSTR_FMT_IBC, INSTR_FMT_IBC00, INSTR_FMT_IBC000, INSTR_FMT_IBC00000000, INSTR_FMT_IX, INSTR_FMT_IXC, INSTR_FMT_IXC000 };
+enum InstructionFormat { INSTR_FMT_IB, INSTR_FMT_IBC, INSTR_FMT_IBC00, INSTR_FMT_IBC000, INSTR_FMT_IBC00000000, INSTR_FMT_IX, INSTR_FMT_IXC, INSTR_FMT_IXC00, INSTR_FMT_IXC000 };
#define HAS_ARG_FLAG (1)
#define HAS_CONST_FLAG (2)
#define HAS_NAME_FLAG (4)
@@ -940,6 +968,13 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[512] = {
[INSTRUMENTED_END_SEND] = { true, INSTR_FMT_IX, 0 },
[UNARY_NEGATIVE] = { true, INSTR_FMT_IX, 0 },
[UNARY_NOT] = { true, INSTR_FMT_IX, 0 },
+ [TO_BOOL] = { true, INSTR_FMT_IXC00, 0 },
+ [TO_BOOL_BOOL] = { true, INSTR_FMT_IXC00, 0 },
+ [TO_BOOL_INT] = { true, INSTR_FMT_IXC00, 0 },
+ [TO_BOOL_LIST] = { true, INSTR_FMT_IXC00, 0 },
+ [TO_BOOL_NONE] = { true, INSTR_FMT_IXC00, 0 },
+ [TO_BOOL_STR] = { true, INSTR_FMT_IXC00, 0 },
+ [TO_BOOL_ALWAYS_TRUE] = { true, INSTR_FMT_IXC00, 0 },
[UNARY_INVERT] = { true, INSTR_FMT_IX, 0 },
[BINARY_OP_MULTIPLY_INT] = { true, INSTR_FMT_IBC, 0 },
[BINARY_OP_ADD_INT] = { true, INSTR_FMT_IBC, 0 },
@@ -1139,6 +1174,12 @@ const struct opcode_macro_expansion _PyOpcode_macro_expansion[256] = {
[END_SEND] = { .nuops = 1, .uops = { { END_SEND, 0, 0 } } },
[UNARY_NEGATIVE] = { .nuops = 1, .uops = { { UNARY_NEGATIVE, 0, 0 } } },
[UNARY_NOT] = { .nuops = 1, .uops = { { UNARY_NOT, 0, 0 } } },
+ [TO_BOOL_BOOL] = { .nuops = 1, .uops = { { TO_BOOL_BOOL, 0, 0 } } },
+ [TO_BOOL_INT] = { .nuops = 1, .uops = { { TO_BOOL_INT, 0, 0 } } },
+ [TO_BOOL_LIST] = { .nuops = 1, .uops = { { TO_BOOL_LIST, 0, 0 } } },
+ [TO_BOOL_NONE] = { .nuops = 1, .uops = { { TO_BOOL_NONE, 0, 0 } } },
+ [TO_BOOL_STR] = { .nuops = 1, .uops = { { TO_BOOL_STR, 0, 0 } } },
+ [TO_BOOL_ALWAYS_TRUE] = { .nuops = 1, .uops = { { TO_BOOL_ALWAYS_TRUE, 2, 1 } } },
[UNARY_INVERT] = { .nuops = 1, .uops = { { UNARY_INVERT, 0, 0 } } },
[BINARY_OP_MULTIPLY_INT] = { .nuops = 2, .uops = { { _GUARD_BOTH_INT, 0, 0 }, { _BINARY_OP_MULTIPLY_INT, 0, 0 } } },
[BINARY_OP_ADD_INT] = { .nuops = 2, .uops = { { _GUARD_BOTH_INT, 0, 0 }, { _BINARY_OP_ADD_INT, 0, 0 } } },
diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index 8561d9d4a3638..1a1ad97e00135 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -5,49 +5,49 @@ static void *opcode_targets[256] = {
&&TARGET_INTERPRETER_EXIT,
&&TARGET_END_FOR,
&&TARGET_END_SEND,
- &&TARGET_BINARY_OP_MULTIPLY_INT,
- &&TARGET_BINARY_OP_ADD_INT,
- &&TARGET_BINARY_OP_SUBTRACT_INT,
+ &&TARGET_TO_BOOL,
+ &&TARGET_TO_BOOL_ALWAYS_TRUE,
+ &&TARGET_TO_BOOL_BOOL,
&&TARGET_NOP,
- &&TARGET_BINARY_OP_MULTIPLY_FLOAT,
+ &&TARGET_TO_BOOL_INT,
&&TARGET_UNARY_NEGATIVE,
&&TARGET_UNARY_NOT,
- &&TARGET_BINARY_OP_ADD_FLOAT,
- &&TARGET_BINARY_OP_SUBTRACT_FLOAT,
+ &&TARGET_TO_BOOL_LIST,
+ &&TARGET_TO_BOOL_NONE,
&&TARGET_UNARY_INVERT,
&&TARGET_EXIT_INIT_CHECK,
&&TARGET_RESERVED,
- &&TARGET_BINARY_OP_ADD_UNICODE,
- &&TARGET_BINARY_OP_INPLACE_ADD_UNICODE,
- &&TARGET_BINARY_SUBSCR_DICT,
- &&TARGET_BINARY_SUBSCR_GETITEM,
- &&TARGET_BINARY_SUBSCR_LIST_INT,
- &&TARGET_BINARY_SUBSCR_TUPLE_INT,
+ &&TARGET_TO_BOOL_STR,
+ &&TARGET_BINARY_OP_MULTIPLY_INT,
+ &&TARGET_BINARY_OP_ADD_INT,
+ &&TARGET_BINARY_OP_SUBTRACT_INT,
+ &&TARGET_BINARY_OP_MULTIPLY_FLOAT,
+ &&TARGET_BINARY_OP_ADD_FLOAT,
&&TARGET_MAKE_FUNCTION,
&&TARGET_BINARY_SUBSCR,
&&TARGET_BINARY_SLICE,
&&TARGET_STORE_SLICE,
- &&TARGET_STORE_SUBSCR_DICT,
- &&TARGET_STORE_SUBSCR_LIST_INT,
+ &&TARGET_BINARY_OP_SUBTRACT_FLOAT,
+ &&TARGET_BINARY_OP_ADD_UNICODE,
&&TARGET_GET_LEN,
&&TARGET_MATCH_MAPPING,
&&TARGET_MATCH_SEQUENCE,
&&TARGET_MATCH_KEYS,
- &&TARGET_SEND_GEN,
+ &&TARGET_BINARY_OP_INPLACE_ADD_UNICODE,
&&TARGET_PUSH_EXC_INFO,
&&TARGET_CHECK_EXC_MATCH,
&&TARGET_CHECK_EG_MATCH,
- &&TARGET_UNPACK_SEQUENCE_TWO_TUPLE,
- &&TARGET_UNPACK_SEQUENCE_TUPLE,
+ &&TARGET_BINARY_SUBSCR_DICT,
+ &&TARGET_BINARY_SUBSCR_GETITEM,
&&TARGET_FORMAT_SIMPLE,
&&TARGET_FORMAT_WITH_SPEC,
- &&TARGET_UNPACK_SEQUENCE_LIST,
- &&TARGET_STORE_ATTR_INSTANCE_VALUE,
- &&TARGET_STORE_ATTR_SLOT,
- &&TARGET_STORE_ATTR_WITH_HINT,
- &&TARGET_LOAD_GLOBAL_MODULE,
- &&TARGET_LOAD_GLOBAL_BUILTIN,
- &&TARGET_LOAD_SUPER_ATTR_ATTR,
+ &&TARGET_BINARY_SUBSCR_LIST_INT,
+ &&TARGET_BINARY_SUBSCR_TUPLE_INT,
+ &&TARGET_STORE_SUBSCR_DICT,
+ &&TARGET_STORE_SUBSCR_LIST_INT,
+ &&TARGET_SEND_GEN,
+ &&TARGET_UNPACK_SEQUENCE_TWO_TUPLE,
+ &&TARGET_UNPACK_SEQUENCE_TUPLE,
&&TARGET_WITH_EXCEPT_START,
&&TARGET_GET_AITER,
&&TARGET_GET_ANEXT,
@@ -55,39 +55,39 @@ static void *opcode_targets[256] = {
&&TARGET_BEFORE_WITH,
&&TARGET_END_ASYNC_FOR,
&&TARGET_CLEANUP_THROW,
+ &&TARGET_UNPACK_SEQUENCE_LIST,
+ &&TARGET_STORE_ATTR_INSTANCE_VALUE,
+ &&TARGET_STORE_ATTR_SLOT,
+ &&TARGET_STORE_ATTR_WITH_HINT,
+ &&TARGET_STORE_SUBSCR,
+ &&TARGET_DELETE_SUBSCR,
+ &&TARGET_LOAD_GLOBAL_MODULE,
+ &&TARGET_LOAD_GLOBAL_BUILTIN,
+ &&TARGET_LOAD_SUPER_ATTR_ATTR,
&&TARGET_LOAD_SUPER_ATTR_METHOD,
&&TARGET_LOAD_ATTR_INSTANCE_VALUE,
&&TARGET_LOAD_ATTR_MODULE,
+ &&TARGET_GET_ITER,
+ &&TARGET_GET_YIELD_FROM_ITER,
&&TARGET_LOAD_ATTR_WITH_HINT,
- &&TARGET_STORE_SUBSCR,
- &&TARGET_DELETE_SUBSCR,
+ &&TARGET_LOAD_BUILD_CLASS,
&&TARGET_LOAD_ATTR_SLOT,
&&TARGET_LOAD_ATTR_CLASS,
+ &&TARGET_LOAD_ASSERTION_ERROR,
+ &&TARGET_RETURN_GENERATOR,
&&TARGET_LOAD_ATTR_PROPERTY,
&&TARGET_LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN,
&&TARGET_LOAD_ATTR_METHOD_WITH_VALUES,
&&TARGET_LOAD_ATTR_METHOD_NO_DICT,
- &&TARGET_GET_ITER,
- &&TARGET_GET_YIELD_FROM_ITER,
&&TARGET_LOAD_ATTR_METHOD_LAZY_DICT,
- &&TARGET_LOAD_BUILD_CLASS,
&&TARGET_COMPARE_OP_FLOAT,
&&TARGET_COMPARE_OP_INT,
- &&TARGET_LOAD_ASSERTION_ERROR,
- &&TARGET_RETURN_GENERATOR,
- &&TARGET_COMPARE_OP_STR,
- &&TARGET_FOR_ITER_LIST,
- &&TARGET_FOR_ITER_TUPLE,
- &&TARGET_FOR_ITER_RANGE,
- &&TARGET_FOR_ITER_GEN,
- &&TARGET_CALL_BOUND_METHOD_EXACT_ARGS,
- &&TARGET_CALL_PY_EXACT_ARGS,
&&TARGET_RETURN_VALUE,
- &&TARGET_CALL_PY_WITH_DEFAULTS,
+ &&TARGET_COMPARE_OP_STR,
&&TARGET_SETUP_ANNOTATIONS,
- &&TARGET_CALL_NO_KW_TYPE_1,
+ &&TARGET_FOR_ITER_LIST,
&&TARGET_LOAD_LOCALS,
- &&TARGET_CALL_NO_KW_STR_1,
+ &&TARGET_FOR_ITER_TUPLE,
&&TARGET_POP_EXCEPT,
&&TARGET_STORE_NAME,
&&TARGET_DELETE_NAME,
@@ -110,9 +110,9 @@ static void *opcode_targets[256] = {
&&TARGET_IMPORT_NAME,
&&TARGET_IMPORT_FROM,
&&TARGET_JUMP_FORWARD,
- &&TARGET_CALL_NO_KW_TUPLE_1,
- &&TARGET_CALL_BUILTIN_CLASS,
- &&TARGET_CALL_NO_KW_BUILTIN_O,
+ &&TARGET_FOR_ITER_RANGE,
+ &&TARGET_FOR_ITER_GEN,
+ &&TARGET_CALL_BOUND_METHOD_EXACT_ARGS,
&&TARGET_POP_JUMP_IF_FALSE,
&&TARGET_POP_JUMP_IF_TRUE,
&&TARGET_LOAD_GLOBAL,
@@ -131,11 +131,11 @@ static void *opcode_targets[256] = {
&&TARGET_POP_JUMP_IF_NONE,
&&TARGET_RAISE_VARARGS,
&&TARGET_GET_AWAITABLE,
- &&TARGET_CALL_NO_KW_BUILTIN_FAST,
+ &&TARGET_CALL_PY_EXACT_ARGS,
&&TARGET_BUILD_SLICE,
&&TARGET_JUMP_BACKWARD_NO_INTERRUPT,
&&TARGET_MAKE_CELL,
- &&TARGET_CALL_BUILTIN_FAST_WITH_KEYWORDS,
+ &&TARGET_CALL_PY_WITH_DEFAULTS,
&&TARGET_LOAD_DEREF,
&&TARGET_STORE_DEREF,
&&TARGET_DELETE_DEREF,
@@ -147,26 +147,26 @@ static void *opcode_targets[256] = {
&&TARGET_LIST_APPEND,
&&TARGET_SET_ADD,
&&TARGET_MAP_ADD,
- &&TARGET_CALL_NO_KW_LEN,
+ &&TARGET_CALL_NO_KW_TYPE_1,
&&TARGET_COPY_FREE_VARS,
&&TARGET_YIELD_VALUE,
&&TARGET_RESUME,
&&TARGET_MATCH_CLASS,
- &&TARGET_CALL_NO_KW_ISINSTANCE,
- &&TARGET_CALL_NO_KW_LIST_APPEND,
- &&TARGET_CALL_NO_KW_METHOD_DESCRIPTOR_O,
+ &&TARGET_CALL_NO_KW_STR_1,
+ &&TARGET_CALL_NO_KW_TUPLE_1,
+ &&TARGET_CALL_BUILTIN_CLASS,
&&TARGET_BUILD_CONST_KEY_MAP,
&&TARGET_BUILD_STRING,
&&TARGET_CONVERT_VALUE,
- &&TARGET_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS,
- &&TARGET_CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS,
- &&TARGET_CALL_NO_KW_METHOD_DESCRIPTOR_FAST,
+ &&TARGET_CALL_NO_KW_BUILTIN_O,
+ &&TARGET_CALL_NO_KW_BUILTIN_FAST,
+ &&TARGET_CALL_BUILTIN_FAST_WITH_KEYWORDS,
&&TARGET_LIST_EXTEND,
&&TARGET_SET_UPDATE,
&&TARGET_DICT_MERGE,
&&TARGET_DICT_UPDATE,
- &&TARGET_CALL_NO_KW_ALLOC_AND_ENTER_INIT,
- &&_unknown_opcode,
+ &&TARGET_CALL_NO_KW_LEN,
+ &&TARGET_CALL_NO_KW_ISINSTANCE,
&&TARGET_LOAD_FAST_LOAD_FAST,
&&TARGET_STORE_FAST_LOAD_FAST,
&&TARGET_STORE_FAST_STORE_FAST,
@@ -177,12 +177,12 @@ static void *opcode_targets[256] = {
&&TARGET_LOAD_FROM_DICT_OR_GLOBALS,
&&TARGET_LOAD_FROM_DICT_OR_DEREF,
&&TARGET_SET_FUNCTION_ATTRIBUTE,
- &&_unknown_opcode,
- &&_unknown_opcode,
- &&_unknown_opcode,
- &&_unknown_opcode,
- &&_unknown_opcode,
- &&_unknown_opcode,
+ &&TARGET_CALL_NO_KW_LIST_APPEND,
+ &&TARGET_CALL_NO_KW_METHOD_DESCRIPTOR_O,
+ &&TARGET_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS,
+ &&TARGET_CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS,
+ &&TARGET_CALL_NO_KW_METHOD_DESCRIPTOR_FAST,
+ &&TARGET_CALL_NO_KW_ALLOC_AND_ENTER_INIT,
&&_unknown_opcode,
&&_unknown_opcode,
&&_unknown_opcode,
diff --git a/Python/specialize.c b/Python/specialize.c
index 3f51432a63af1..22c58e2c46fc3 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -107,6 +107,8 @@ _Py_GetSpecializationStats(void) {
err += add_stat_dict(stats, COMPARE_OP, "compare_op");
err += add_stat_dict(stats, UNPACK_SEQUENCE, "unpack_sequence");
err += add_stat_dict(stats, FOR_ITER, "for_iter");
+ err += add_stat_dict(stats, TO_BOOL, "to_bool");
+ err += add_stat_dict(stats, SEND, "send");
if (err < 0) {
Py_DECREF(stats);
return NULL;
@@ -127,9 +129,7 @@ print_spec_stats(FILE *out, OpcodeStats *stats)
/* Mark some opcodes as specializable for stats,
* even though we don't specialize them yet. */
fprintf(out, "opcode[%d].specializable : 1\n", BINARY_SLICE);
- fprintf(out, "opcode[%d].specializable : 1\n", COMPARE_OP);
fprintf(out, "opcode[%d].specializable : 1\n", STORE_SLICE);
- fprintf(out, "opcode[%d].specializable : 1\n", SEND);
for (int i = 0; i < 256; i++) {
if (_PyOpcode_Caches[i]) {
fprintf(out, "opcode[%d].specializable : 1\n", i);
@@ -447,6 +447,18 @@ _PyCode_Quicken(PyCodeObject *code)
#define SPEC_FAIL_UNPACK_SEQUENCE_ITERATOR 9
#define SPEC_FAIL_UNPACK_SEQUENCE_SEQUENCE 10
+// TO_BOOL
+#define SPEC_FAIL_TO_BOOL_BYTEARRAY 9
+#define SPEC_FAIL_TO_BOOL_BYTES 10
+#define SPEC_FAIL_TO_BOOL_DICT 11
+#define SPEC_FAIL_TO_BOOL_FLOAT 12
+#define SPEC_FAIL_TO_BOOL_MAPPING 13
+#define SPEC_FAIL_TO_BOOL_MEMORY_VIEW 14
+#define SPEC_FAIL_TO_BOOL_NUMBER 15
+#define SPEC_FAIL_TO_BOOL_SEQUENCE 16
+#define SPEC_FAIL_TO_BOOL_SET 17
+#define SPEC_FAIL_TO_BOOL_TUPLE 18
+
static int function_kind(PyCodeObject *code);
static bool function_check_args(PyObject *o, int expected_argcount, int opcode);
static uint32_t function_get_version(PyObject *o, int opcode);
@@ -2047,6 +2059,8 @@ _Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr,
{
assert(ENABLE_SPECIALIZATION);
assert(_PyOpcode_Caches[COMPARE_OP] == INLINE_CACHE_ENTRIES_COMPARE_OP);
+ // All of these specializations compute boolean values, so they're all valid
+ // regardless of the fifth-lowest oparg bit.
_PyCompareOpCache *cache = (_PyCompareOpCache *)(instr + 1);
if (Py_TYPE(lhs) != Py_TYPE(rhs)) {
SPECIALIZATION_FAIL(COMPARE_OP, compare_op_fail_kind(lhs, rhs));
@@ -2067,7 +2081,7 @@ _Py_Specialize_CompareOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr,
}
}
if (PyUnicode_CheckExact(lhs)) {
- int cmp = oparg >> 4;
+ int cmp = oparg >> 5;
if (cmp != Py_EQ && cmp != Py_NE) {
SPECIALIZATION_FAIL(COMPARE_OP, SPEC_FAIL_COMPARE_OP_STRING);
goto failure;
@@ -2284,6 +2298,99 @@ _Py_Specialize_Send(PyObject *receiver, _Py_CODEUNIT *instr)
cache->counter = adaptive_counter_cooldown();
}
+void
+_Py_Specialize_ToBool(PyObject *value, _Py_CODEUNIT *instr)
+{
+ assert(ENABLE_SPECIALIZATION);
+ assert(_PyOpcode_Caches[TO_BOOL] == INLINE_CACHE_ENTRIES_TO_BOOL);
+ _PyToBoolCache *cache = (_PyToBoolCache *)(instr + 1);
+ if (PyBool_Check(value)) {
+ instr->op.code = TO_BOOL_BOOL;
+ goto success;
+ }
+ if (PyLong_CheckExact(value)) {
+ instr->op.code = TO_BOOL_INT;
+ goto success;
+ }
+ if (PyList_CheckExact(value)) {
+ instr->op.code = TO_BOOL_LIST;
+ goto success;
+ }
+ if (Py_IsNone(value)) {
+ instr->op.code = TO_BOOL_NONE;
+ goto success;
+ }
+ if (PyUnicode_CheckExact(value)) {
+ instr->op.code = TO_BOOL_STR;
+ goto success;
+ }
+ if (PyType_HasFeature(Py_TYPE(value), Py_TPFLAGS_HEAPTYPE)) {
+ PyNumberMethods *nb = Py_TYPE(value)->tp_as_number;
+ if (nb && nb->nb_bool) {
+ SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_NUMBER);
+ goto failure;
+ }
+ PyMappingMethods *mp = Py_TYPE(value)->tp_as_mapping;
+ if (mp && mp->mp_length) {
+ SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_MAPPING);
+ goto failure;
+ }
+ PySequenceMethods *sq = Py_TYPE(value)->tp_as_sequence;
+ if (sq && sq->sq_length) {
+ SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_SEQUENCE);
+ goto failure;
+ }
+ if (!PyUnstable_Type_AssignVersionTag(Py_TYPE(value))) {
+ SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_OUT_OF_VERSIONS);
+ goto failure;
+ }
+ uint32_t version = Py_TYPE(value)->tp_version_tag;
+ instr->op.code = TO_BOOL_ALWAYS_TRUE;
+ write_u32(cache->version, version);
+ assert(version);
+ goto success;
+ }
+#ifdef Py_STATS
+ if (PyByteArray_CheckExact(value)) {
+ SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_BYTEARRAY);
+ goto failure;
+ }
+ if (PyBytes_CheckExact(value)) {
+ SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_BYTES);
+ goto failure;
+ }
+ if (PyDict_CheckExact(value)) {
+ SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_DICT);
+ goto failure;
+ }
+ if (PyFloat_CheckExact(value)) {
+ SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_FLOAT);
+ goto failure;
+ }
+ if (PyMemoryView_Check(value)) {
+ SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_MEMORY_VIEW);
+ goto failure;
+ }
+ if (PyAnySet_CheckExact(value)) {
+ SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_SET);
+ goto failure;
+ }
+ if (PyTuple_CheckExact(value)) {
+ SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_TO_BOOL_TUPLE);
+ goto failure;
+ }
+ SPECIALIZATION_FAIL(TO_BOOL, SPEC_FAIL_OTHER);
+#endif
+failure:
+ STAT_INC(TO_BOOL, failure);
+ instr->op.code = TO_BOOL;
+ cache->counter = adaptive_counter_backoff(cache->counter);
+ return;
+success:
+ STAT_INC(TO_BOOL, success);
+ cache->counter = adaptive_counter_cooldown();
+}
+
/* Code init cleanup.
* CALL_NO_KW_ALLOC_AND_ENTER_INIT will set up
* the frame to execute the EXIT_INIT_CHECK
More information about the Python-checkins
mailing list