[Python-checkins] gh-105775: Convert LOAD_CLOSURE to a pseudo-op (#106059)
gvanrossum
webhook-mailer at python.org
Thu Jun 29 12:34:05 EDT 2023
https://github.com/python/cpython/commit/8bff940ad69ce176dcd2b8e91d0b30ddd09945f1
commit: 8bff940ad69ce176dcd2b8e91d0b30ddd09945f1
branch: main
author: hms <18321626+polynomialherder at users.noreply.github.com>
committer: gvanrossum <gvanrossum at gmail.com>
date: 2023-06-29T09:34:00-07:00
summary:
gh-105775: Convert LOAD_CLOSURE to a pseudo-op (#106059)
This enables super-instruction formation,
removal of checks for uninitialized variables,
and frees up an instruction.
files:
A Misc/NEWS.d/next/Core and Builtins/2023-06-24-10-34-27.gh-issue-105775.OqjoGV.rst
M Doc/library/dis.rst
M Include/internal/pycore_opcode.h
M Include/opcode.h
M Lib/importlib/_bootstrap_external.py
M Lib/opcode.py
M Lib/test/test_compiler_assemble.py
M Lib/test/test_dis.py
M PC/launcher.c
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
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 39d43578faf3c..63336bb9e08ea 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -1291,18 +1291,6 @@ iterations of the loop.
.. versionadded:: 3.11
-.. opcode:: LOAD_CLOSURE (i)
-
- Pushes a reference to the cell contained in slot ``i`` of the "fast locals"
- storage. The name of the variable is ``co_fastlocalnames[i]``.
-
- Note that ``LOAD_CLOSURE`` is effectively an alias for ``LOAD_FAST``.
- It exists to keep bytecode a little more readable.
-
- .. versionchanged:: 3.11
- ``i`` is no longer offset by the length of ``co_varnames``.
-
-
.. opcode:: LOAD_DEREF (i)
Loads the cell contained in slot ``i`` of the "fast locals" storage.
@@ -1725,6 +1713,17 @@ but are replaced by real opcodes or removed before bytecode is generated.
Undirected relative jump instructions which are replaced by their
directed (forward/backward) counterparts by the assembler.
+.. opcode:: LOAD_CLOSURE (i)
+
+ Pushes a reference to the cell contained in slot ``i`` of the "fast locals"
+ storage.
+
+ Note that ``LOAD_CLOSURE`` is replaced with ``LOAD_FAST`` in the assembler.
+
+ .. versionchanged:: 3.13
+ This opcode is now a pseudo-instruction.
+
+
.. opcode:: LOAD_METHOD
Optimized unbound method lookup. Emitted as a ``LOAD_ATTR`` opcode
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
index cab5b587eda87..bebdedc962403 100644
--- a/Include/internal/pycore_opcode.h
+++ b/Include/internal/pycore_opcode.h
@@ -161,7 +161,6 @@ const uint8_t _PyOpcode_Deopt[256] = {
[LOAD_ATTR_SLOT] = LOAD_ATTR,
[LOAD_ATTR_WITH_HINT] = LOAD_ATTR,
[LOAD_BUILD_CLASS] = LOAD_BUILD_CLASS,
- [LOAD_CLOSURE] = LOAD_CLOSURE,
[LOAD_CONST] = LOAD_CONST,
[LOAD_DEREF] = LOAD_DEREF,
[LOAD_FAST] = LOAD_FAST,
@@ -236,7 +235,7 @@ const uint8_t _PyOpcode_Deopt[256] = {
#endif // NEED_OPCODE_TABLES
#ifdef Py_DEBUG
-static const char *const _PyOpcode_OpName[267] = {
+static const char *const _PyOpcode_OpName[268] = {
[CACHE] = "CACHE",
[POP_TOP] = "POP_TOP",
[PUSH_NULL] = "PUSH_NULL",
@@ -373,7 +372,7 @@ static const char *const _PyOpcode_OpName[267] = {
[BUILD_SLICE] = "BUILD_SLICE",
[JUMP_BACKWARD_NO_INTERRUPT] = "JUMP_BACKWARD_NO_INTERRUPT",
[MAKE_CELL] = "MAKE_CELL",
- [LOAD_CLOSURE] = "LOAD_CLOSURE",
+ [CALL_BUILTIN_FAST_WITH_KEYWORDS] = "CALL_BUILTIN_FAST_WITH_KEYWORDS",
[LOAD_DEREF] = "LOAD_DEREF",
[STORE_DEREF] = "STORE_DEREF",
[DELETE_DEREF] = "DELETE_DEREF",
@@ -385,26 +384,26 @@ static const char *const _PyOpcode_OpName[267] = {
[LIST_APPEND] = "LIST_APPEND",
[SET_ADD] = "SET_ADD",
[MAP_ADD] = "MAP_ADD",
- [CALL_BUILTIN_FAST_WITH_KEYWORDS] = "CALL_BUILTIN_FAST_WITH_KEYWORDS",
+ [CALL_NO_KW_LEN] = "CALL_NO_KW_LEN",
[COPY_FREE_VARS] = "COPY_FREE_VARS",
[YIELD_VALUE] = "YIELD_VALUE",
[RESUME] = "RESUME",
[MATCH_CLASS] = "MATCH_CLASS",
- [CALL_NO_KW_LEN] = "CALL_NO_KW_LEN",
[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",
[BUILD_CONST_KEY_MAP] = "BUILD_CONST_KEY_MAP",
[BUILD_STRING] = "BUILD_STRING",
[CONVERT_VALUE] = "CONVERT_VALUE",
- [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",
[LIST_EXTEND] = "LIST_EXTEND",
[SET_UPDATE] = "SET_UPDATE",
[DICT_MERGE] = "DICT_MERGE",
[DICT_UPDATE] = "DICT_UPDATE",
- [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",
+ [167] = "<167>",
[LOAD_FAST_LOAD_FAST] = "LOAD_FAST_LOAD_FAST",
[STORE_FAST_LOAD_FAST] = "STORE_FAST_LOAD_FAST",
[STORE_FAST_STORE_FAST] = "STORE_FAST_STORE_FAST",
@@ -504,10 +503,12 @@ static const char *const _PyOpcode_OpName[267] = {
[LOAD_ZERO_SUPER_METHOD] = "LOAD_ZERO_SUPER_METHOD",
[LOAD_ZERO_SUPER_ATTR] = "LOAD_ZERO_SUPER_ATTR",
[STORE_FAST_MAYBE_NULL] = "STORE_FAST_MAYBE_NULL",
+ [LOAD_CLOSURE] = "LOAD_CLOSURE",
};
#endif
#define EXTRA_CASES \
+ case 167: \
case 178: \
case 179: \
case 180: \
diff --git a/Include/opcode.h b/Include/opcode.h
index 3fe4fc0bb3404..0533ae9668870 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -93,7 +93,6 @@ extern "C" {
#define BUILD_SLICE 133
#define JUMP_BACKWARD_NO_INTERRUPT 134
#define MAKE_CELL 135
-#define LOAD_CLOSURE 136
#define LOAD_DEREF 137
#define STORE_DEREF 138
#define DELETE_DEREF 139
@@ -158,7 +157,8 @@ extern "C" {
#define LOAD_ZERO_SUPER_METHOD 264
#define LOAD_ZERO_SUPER_ATTR 265
#define STORE_FAST_MAYBE_NULL 266
-#define MAX_PSEUDO_OPCODE 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
@@ -210,15 +210,15 @@ extern "C" {
#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 148
-#define CALL_NO_KW_LEN 153
-#define CALL_NO_KW_ISINSTANCE 154
-#define CALL_NO_KW_LIST_APPEND 155
-#define CALL_NO_KW_METHOD_DESCRIPTOR_O 159
-#define CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS 160
-#define CALL_NO_KW_METHOD_DESCRIPTOR_NOARGS 161
-#define CALL_NO_KW_METHOD_DESCRIPTOR_FAST 166
-#define CALL_NO_KW_ALLOC_AND_ENTER_INIT 167
+#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 NB_ADD 0
#define NB_AND 1
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index 6a3eabe1973ac..8b4ac6ca01204 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@ -451,6 +451,7 @@ def _write_atomic(path, data, mode=0o666):
# Python 3.13a1 3553 (Add SET_FUNCTION_ATTRIBUTE)
# 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.14 will start with 3600
@@ -467,7 +468,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 = (3555).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3556).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 392464ddab972..52c566cd0cabc 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -198,8 +198,6 @@ def pseudo_op(name, op, real_ops):
jrel_op('JUMP_BACKWARD_NO_INTERRUPT', 134) # Number of words to skip (backwards)
def_op('MAKE_CELL', 135)
hasfree.append(135)
-def_op('LOAD_CLOSURE', 136)
-hasfree.append(136)
def_op('LOAD_DEREF', 137)
hasfree.append(137)
def_op('STORE_DEREF', 138)
@@ -293,6 +291,7 @@ def pseudo_op(name, op, real_ops):
pseudo_op('LOAD_ZERO_SUPER_ATTR', 265, ['LOAD_SUPER_ATTR'])
pseudo_op('STORE_FAST_MAYBE_NULL', 266, ['STORE_FAST'])
+pseudo_op('LOAD_CLOSURE', 267, ['LOAD_FAST'])
MAX_PSEUDO_OPCODE = MIN_PSEUDO_OPCODE + len(_pseudo_ops) - 1
diff --git a/Lib/test/test_compiler_assemble.py b/Lib/test/test_compiler_assemble.py
index 3257aa3cc118f..6df72cbc54666 100644
--- a/Lib/test/test_compiler_assemble.py
+++ b/Lib/test/test_compiler_assemble.py
@@ -70,3 +70,41 @@ def test_simple_expr(self):
]
expected = {(3, 4) : 3.5, (-100, 200) : 50, (10, 18) : 14}
self.assemble_test(insts, metadata, expected)
+
+
+ def test_expression_with_pseudo_instruction_load_closure(self):
+
+ def mod_two(x):
+ def inner():
+ return x
+ return inner() % 2
+
+ inner_code = mod_two.__code__.co_consts[1]
+ assert isinstance(inner_code, types.CodeType)
+
+ metadata = {
+ 'filename' : 'mod_two.py',
+ 'name' : 'mod_two',
+ 'qualname' : 'nested.mod_two',
+ 'cellvars' : {'x' : 0},
+ 'consts': {None: 0, inner_code: 1, 2: 2},
+ 'argcount' : 1,
+ 'varnames' : {'x' : 0},
+ }
+
+ instructions = [
+ ('RESUME', 0,),
+ ('PUSH_NULL', 0, 1),
+ ('LOAD_CLOSURE', 0, 1),
+ ('BUILD_TUPLE', 1, 1),
+ ('LOAD_CONST', 1, 1),
+ ('MAKE_FUNCTION', 0, 2),
+ ('SET_FUNCTION_ATTRIBUTE', 8, 2),
+ ('CALL', 0, 2), # (lambda: x)()
+ ('LOAD_CONST', 2, 2), # 2
+ ('BINARY_OP', 6, 2), # %
+ ('RETURN_VALUE', 0, 2)
+ ]
+
+ expected = {(0,): 0, (1,): 1, (2,): 0, (120,): 0, (121,): 1}
+ self.assemble_test(instructions, metadata, expected)
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 7dd6e3f0d6243..ab8026b81fd3d 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -685,7 +685,7 @@ def foo(x):
%3d RESUME 0
-%3d LOAD_CLOSURE 0 (y)
+%3d LOAD_FAST 0 (y)
BUILD_TUPLE 1
LOAD_CONST 1 (<code object foo at 0x..., file "%s", line %d>)
MAKE_FUNCTION
@@ -709,7 +709,7 @@ def foo(x):
%3d RESUME 0
%3d LOAD_GLOBAL 1 (NULL + list)
- LOAD_CLOSURE 0 (x)
+ LOAD_FAST 0 (x)
BUILD_TUPLE 1
LOAD_CONST 1 (<code object <genexpr> at 0x..., file "%s", line %d>)
MAKE_FUNCTION
@@ -1596,8 +1596,8 @@ def _prepare_test_cases():
Instruction(opname='MAKE_CELL', opcode=135, arg=1, argval='b', argrepr='b', offset=2, start_offset=2, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='RESUME', opcode=151, arg=0, argval=0, argrepr='', offset=4, start_offset=4, starts_line=1, is_jump_target=False, positions=None),
Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=(3, 4), argrepr='(3, 4)', offset=6, start_offset=6, starts_line=2, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CLOSURE', opcode=136, arg=0, argval='a', argrepr='a', offset=8, start_offset=8, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CLOSURE', opcode=136, arg=1, argval='b', argrepr='b', offset=10, start_offset=10, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='a', argrepr='a', offset=8, start_offset=8, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=1, argval='b', argrepr='b', offset=10, start_offset=10, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='BUILD_TUPLE', opcode=102, arg=2, argval=2, argrepr='', offset=12, start_offset=12, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=code_object_f, argrepr=repr(code_object_f), offset=14, start_offset=14, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='MAKE_FUNCTION', opcode=24, arg=None, argval=None, argrepr='', offset=16, start_offset=16, starts_line=None, is_jump_target=False, positions=None),
@@ -1624,10 +1624,10 @@ def _prepare_test_cases():
Instruction(opname='MAKE_CELL', opcode=135, arg=1, argval='d', argrepr='d', offset=4, start_offset=4, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='RESUME', opcode=151, arg=0, argval=0, argrepr='', offset=6, start_offset=6, starts_line=2, is_jump_target=False, positions=None),
Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=(5, 6), argrepr='(5, 6)', offset=8, start_offset=8, starts_line=3, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CLOSURE', opcode=136, arg=3, argval='a', argrepr='a', offset=10, start_offset=10, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CLOSURE', opcode=136, arg=4, argval='b', argrepr='b', offset=12, start_offset=12, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CLOSURE', opcode=136, arg=0, argval='c', argrepr='c', offset=14, start_offset=14, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CLOSURE', opcode=136, arg=1, argval='d', argrepr='d', offset=16, start_offset=16, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=3, argval='a', argrepr='a', offset=10, start_offset=10, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=4, argval='b', argrepr='b', offset=12, start_offset=12, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='c', argrepr='c', offset=14, start_offset=14, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=1, argval='d', argrepr='d', offset=16, start_offset=16, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='BUILD_TUPLE', opcode=102, arg=4, argval=4, argrepr='', offset=18, start_offset=18, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=code_object_inner, argrepr=repr(code_object_inner), offset=20, start_offset=20, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='MAKE_FUNCTION', opcode=24, arg=None, argval=None, argrepr='', offset=22, start_offset=22, starts_line=None, is_jump_target=False, positions=None),
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-06-24-10-34-27.gh-issue-105775.OqjoGV.rst b/Misc/NEWS.d/next/Core and Builtins/2023-06-24-10-34-27.gh-issue-105775.OqjoGV.rst
new file mode 100644
index 0000000000000..27d0e9929794f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-06-24-10-34-27.gh-issue-105775.OqjoGV.rst
@@ -0,0 +1 @@
+:opcode:`LOAD_CLOSURE` is now a pseudo-op.
\ No newline at end of file
diff --git a/PC/launcher.c b/PC/launcher.c
index dc265533740b6..8e60ab9303cb9 100644
--- a/PC/launcher.c
+++ b/PC/launcher.c
@@ -1270,6 +1270,7 @@ static PYC_MAGIC magic_values[] = {
/* Allow 50 magic numbers per version from here on */
{ 3450, 3499, L"3.11" },
{ 3500, 3549, L"3.12" },
+ { 3550, 3599, L"3.13" },
{ 0 }
};
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 02857104f5a4d..1d9664bc27d24 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -175,12 +175,9 @@ dummy_func(
}
}
- inst(LOAD_CLOSURE, (-- value)) {
- /* We keep LOAD_CLOSURE so that the bytecode stays more readable. */
- value = GETLOCAL(oparg);
- ERROR_IF(value == NULL, unbound_local_error);
- Py_INCREF(value);
- }
+ pseudo(LOAD_CLOSURE) = {
+ LOAD_FAST,
+ };
inst(LOAD_FAST_CHECK, (-- value)) {
value = GETLOCAL(oparg);
diff --git a/Python/compile.c b/Python/compile.c
index d080144121af7..5936184d8b76b 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -836,6 +836,8 @@ stack_effect(int opcode, int oparg, int jump)
case STORE_FAST_MAYBE_NULL:
return -1;
+ case LOAD_CLOSURE:
+ return 1;
case LOAD_METHOD:
return 1;
case LOAD_SUPER_METHOD:
diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index 739cb8499c007..a64de0c958ce0 100644
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -9,7 +9,7 @@
case LOAD_FAST: {
PyObject *value;
- #line 192 "Python/bytecodes.c"
+ #line 189 "Python/bytecodes.c"
value = GETLOCAL(oparg);
assert(value != NULL);
Py_INCREF(value);
@@ -21,7 +21,7 @@
case LOAD_FAST_AND_CLEAR: {
PyObject *value;
- #line 198 "Python/bytecodes.c"
+ #line 195 "Python/bytecodes.c"
value = GETLOCAL(oparg);
// do not use SETLOCAL here, it decrefs the old value
GETLOCAL(oparg) = NULL;
@@ -33,7 +33,7 @@
case LOAD_CONST: {
PyObject *value;
- #line 213 "Python/bytecodes.c"
+ #line 210 "Python/bytecodes.c"
value = GETITEM(FRAME_CO_CONSTS, oparg);
Py_INCREF(value);
#line 40 "Python/executor_cases.c.h"
@@ -44,7 +44,7 @@
case STORE_FAST: {
PyObject *value = stack_pointer[-1];
- #line 218 "Python/bytecodes.c"
+ #line 215 "Python/bytecodes.c"
SETLOCAL(oparg, value);
#line 50 "Python/executor_cases.c.h"
STACK_SHRINK(1);
@@ -53,7 +53,7 @@
case POP_TOP: {
PyObject *value = stack_pointer[-1];
- #line 241 "Python/bytecodes.c"
+ #line 238 "Python/bytecodes.c"
#line 58 "Python/executor_cases.c.h"
Py_DECREF(value);
STACK_SHRINK(1);
@@ -62,7 +62,7 @@
case PUSH_NULL: {
PyObject *res;
- #line 245 "Python/bytecodes.c"
+ #line 242 "Python/bytecodes.c"
res = NULL;
#line 68 "Python/executor_cases.c.h"
STACK_GROW(1);
@@ -73,7 +73,7 @@
case END_SEND: {
PyObject *value = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 264 "Python/bytecodes.c"
+ #line 261 "Python/bytecodes.c"
Py_DECREF(receiver);
#line 79 "Python/executor_cases.c.h"
STACK_SHRINK(1);
@@ -84,11 +84,11 @@
case UNARY_NEGATIVE: {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 279 "Python/bytecodes.c"
+ #line 276 "Python/bytecodes.c"
res = PyNumber_Negative(value);
#line 90 "Python/executor_cases.c.h"
Py_DECREF(value);
- #line 281 "Python/bytecodes.c"
+ #line 278 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
#line 94 "Python/executor_cases.c.h"
stack_pointer[-1] = res;
@@ -98,11 +98,11 @@
case UNARY_NOT: {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 285 "Python/bytecodes.c"
+ #line 282 "Python/bytecodes.c"
int err = PyObject_IsTrue(value);
#line 104 "Python/executor_cases.c.h"
Py_DECREF(value);
- #line 287 "Python/bytecodes.c"
+ #line 284 "Python/bytecodes.c"
if (err < 0) goto pop_1_error;
if (err == 0) {
res = Py_True;
@@ -118,11 +118,11 @@
case UNARY_INVERT: {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 297 "Python/bytecodes.c"
+ #line 294 "Python/bytecodes.c"
res = PyNumber_Invert(value);
#line 124 "Python/executor_cases.c.h"
Py_DECREF(value);
- #line 299 "Python/bytecodes.c"
+ #line 296 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
#line 128 "Python/executor_cases.c.h"
stack_pointer[-1] = res;
@@ -132,7 +132,7 @@
case _GUARD_BOTH_INT: {
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
- #line 315 "Python/bytecodes.c"
+ #line 312 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
#line 139 "Python/executor_cases.c.h"
@@ -143,7 +143,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 320 "Python/bytecodes.c"
+ #line 317 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
res = _PyLong_Multiply((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
@@ -159,7 +159,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 328 "Python/bytecodes.c"
+ #line 325 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
res = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
@@ -175,7 +175,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 336 "Python/bytecodes.c"
+ #line 333 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
res = _PyLong_Subtract((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
@@ -190,7 +190,7 @@
case _GUARD_BOTH_FLOAT: {
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
- #line 351 "Python/bytecodes.c"
+ #line 348 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
#line 197 "Python/executor_cases.c.h"
@@ -201,7 +201,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 356 "Python/bytecodes.c"
+ #line 353 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
double dres =
((PyFloatObject *)left)->ob_fval *
@@ -217,7 +217,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 364 "Python/bytecodes.c"
+ #line 361 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
double dres =
((PyFloatObject *)left)->ob_fval +
@@ -233,7 +233,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 372 "Python/bytecodes.c"
+ #line 369 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
double dres =
((PyFloatObject *)left)->ob_fval -
@@ -248,7 +248,7 @@
case _GUARD_BOTH_UNICODE: {
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
- #line 387 "Python/bytecodes.c"
+ #line 384 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
#line 255 "Python/executor_cases.c.h"
@@ -259,7 +259,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 392 "Python/bytecodes.c"
+ #line 389 "Python/bytecodes.c"
STAT_INC(BINARY_OP, hit);
res = PyUnicode_Concat(left, right);
_Py_DECREF_SPECIALIZED(left, _PyUnicode_ExactDealloc);
@@ -276,7 +276,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *res;
- #line 462 "Python/bytecodes.c"
+ #line 459 "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.
@@ -300,7 +300,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *v = stack_pointer[-4];
- #line 477 "Python/bytecodes.c"
+ #line 474 "Python/bytecodes.c"
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
int err;
if (slice == NULL) {
@@ -322,7 +322,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *res;
- #line 492 "Python/bytecodes.c"
+ #line 489 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), BINARY_SUBSCR);
@@ -346,7 +346,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *tuple = stack_pointer[-2];
PyObject *res;
- #line 508 "Python/bytecodes.c"
+ #line 505 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyTuple_CheckExact(tuple), BINARY_SUBSCR);
@@ -370,7 +370,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *res;
- #line 524 "Python/bytecodes.c"
+ #line 521 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(dict), BINARY_SUBSCR);
STAT_INC(BINARY_SUBSCR, hit);
res = PyDict_GetItemWithError(dict, sub);
@@ -381,7 +381,7 @@
#line 382 "Python/executor_cases.c.h"
Py_DECREF(dict);
Py_DECREF(sub);
- #line 532 "Python/bytecodes.c"
+ #line 529 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
Py_INCREF(res); // Do this before DECREF'ing dict, sub
@@ -396,7 +396,7 @@
case LIST_APPEND: {
PyObject *v = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 564 "Python/bytecodes.c"
+ #line 561 "Python/bytecodes.c"
if (_PyList_AppendTakeRef((PyListObject *)list, v) < 0) goto pop_1_error;
#line 402 "Python/executor_cases.c.h"
STACK_SHRINK(1);
@@ -406,11 +406,11 @@
case SET_ADD: {
PyObject *v = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 568 "Python/bytecodes.c"
+ #line 565 "Python/bytecodes.c"
int err = PySet_Add(set, v);
#line 412 "Python/executor_cases.c.h"
Py_DECREF(v);
- #line 570 "Python/bytecodes.c"
+ #line 567 "Python/bytecodes.c"
if (err) goto pop_1_error;
#line 416 "Python/executor_cases.c.h"
STACK_SHRINK(1);
@@ -421,7 +421,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 599 "Python/bytecodes.c"
+ #line 596 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), STORE_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), STORE_SUBSCR);
@@ -447,7 +447,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 618 "Python/bytecodes.c"
+ #line 615 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(dict), STORE_SUBSCR);
STAT_INC(STORE_SUBSCR, hit);
int err = _PyDict_SetItem_Take2((PyDictObject *)dict, sub, value);
@@ -461,13 +461,13 @@
case DELETE_SUBSCR: {
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
- #line 626 "Python/bytecodes.c"
+ #line 623 "Python/bytecodes.c"
/* del container[sub] */
int err = PyObject_DelItem(container, sub);
#line 468 "Python/executor_cases.c.h"
Py_DECREF(container);
Py_DECREF(sub);
- #line 629 "Python/bytecodes.c"
+ #line 626 "Python/bytecodes.c"
if (err) goto pop_2_error;
#line 473 "Python/executor_cases.c.h"
STACK_SHRINK(2);
@@ -477,12 +477,12 @@
case CALL_INTRINSIC_1: {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 633 "Python/bytecodes.c"
+ #line 630 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_1);
res = _PyIntrinsics_UnaryFunctions[oparg](tstate, value);
#line 484 "Python/executor_cases.c.h"
Py_DECREF(value);
- #line 636 "Python/bytecodes.c"
+ #line 633 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
#line 488 "Python/executor_cases.c.h"
stack_pointer[-1] = res;
@@ -493,13 +493,13 @@
PyObject *value1 = stack_pointer[-1];
PyObject *value2 = stack_pointer[-2];
PyObject *res;
- #line 640 "Python/bytecodes.c"
+ #line 637 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_2);
res = _PyIntrinsics_BinaryFunctions[oparg](tstate, value2, value1);
#line 500 "Python/executor_cases.c.h"
Py_DECREF(value2);
Py_DECREF(value1);
- #line 643 "Python/bytecodes.c"
+ #line 640 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
#line 505 "Python/executor_cases.c.h"
STACK_SHRINK(1);
@@ -510,7 +510,7 @@
case GET_AITER: {
PyObject *obj = stack_pointer[-1];
PyObject *iter;
- #line 748 "Python/bytecodes.c"
+ #line 745 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyTypeObject *type = Py_TYPE(obj);
@@ -525,14 +525,14 @@
type->tp_name);
#line 527 "Python/executor_cases.c.h"
Py_DECREF(obj);
- #line 761 "Python/bytecodes.c"
+ #line 758 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
iter = (*getter)(obj);
#line 534 "Python/executor_cases.c.h"
Py_DECREF(obj);
- #line 766 "Python/bytecodes.c"
+ #line 763 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
if (Py_TYPE(iter)->tp_as_async == NULL ||
@@ -553,7 +553,7 @@
case GET_ANEXT: {
PyObject *aiter = stack_pointer[-1];
PyObject *awaitable;
- #line 781 "Python/bytecodes.c"
+ #line 778 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyObject *next_iter = NULL;
PyTypeObject *type = Py_TYPE(aiter);
@@ -605,7 +605,7 @@
case GET_AWAITABLE: {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 826 "Python/bytecodes.c"
+ #line 823 "Python/bytecodes.c"
iter = _PyCoro_GetAwaitableIter(iterable);
if (iter == NULL) {
@@ -614,7 +614,7 @@
#line 616 "Python/executor_cases.c.h"
Py_DECREF(iterable);
- #line 833 "Python/bytecodes.c"
+ #line 830 "Python/bytecodes.c"
if (iter != NULL && PyCoro_CheckExact(iter)) {
PyObject *yf = _PyGen_yf((PyGenObject*)iter);
@@ -638,7 +638,7 @@
case POP_EXCEPT: {
PyObject *exc_value = stack_pointer[-1];
- #line 963 "Python/bytecodes.c"
+ #line 960 "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"
@@ -648,7 +648,7 @@
case LOAD_ASSERTION_ERROR: {
PyObject *value;
- #line 1014 "Python/bytecodes.c"
+ #line 1011 "Python/bytecodes.c"
value = Py_NewRef(PyExc_AssertionError);
#line 654 "Python/executor_cases.c.h"
STACK_GROW(1);
@@ -658,7 +658,7 @@
case LOAD_BUILD_CLASS: {
PyObject *bc;
- #line 1018 "Python/bytecodes.c"
+ #line 1015 "Python/bytecodes.c"
if (PyDict_CheckExact(BUILTINS())) {
bc = _PyDict_GetItemWithError(BUILTINS(),
&_Py_ID(__build_class__));
@@ -688,7 +688,7 @@
case STORE_NAME: {
PyObject *v = stack_pointer[-1];
- #line 1043 "Python/bytecodes.c"
+ #line 1040 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
PyObject *ns = LOCALS();
int err;
@@ -697,7 +697,7 @@
"no locals found when storing %R", name);
#line 699 "Python/executor_cases.c.h"
Py_DECREF(v);
- #line 1050 "Python/bytecodes.c"
+ #line 1047 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
if (PyDict_CheckExact(ns))
@@ -706,7 +706,7 @@
err = PyObject_SetItem(ns, name, v);
#line 708 "Python/executor_cases.c.h"
Py_DECREF(v);
- #line 1057 "Python/bytecodes.c"
+ #line 1054 "Python/bytecodes.c"
if (err) goto pop_1_error;
#line 712 "Python/executor_cases.c.h"
STACK_SHRINK(1);
@@ -714,7 +714,7 @@
}
case DELETE_NAME: {
- #line 1061 "Python/bytecodes.c"
+ #line 1058 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
PyObject *ns = LOCALS();
int err;
@@ -738,7 +738,7 @@
case UNPACK_SEQUENCE_TWO_TUPLE: {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1104 "Python/bytecodes.c"
+ #line 1101 "Python/bytecodes.c"
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != 2, UNPACK_SEQUENCE);
assert(oparg == 2);
@@ -755,7 +755,7 @@
case UNPACK_SEQUENCE_TUPLE: {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1114 "Python/bytecodes.c"
+ #line 1111 "Python/bytecodes.c"
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -773,7 +773,7 @@
case UNPACK_SEQUENCE_LIST: {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1125 "Python/bytecodes.c"
+ #line 1122 "Python/bytecodes.c"
DEOPT_IF(!PyList_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyList_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -790,13 +790,13 @@
case UNPACK_EX: {
PyObject *seq = stack_pointer[-1];
- #line 1136 "Python/bytecodes.c"
+ #line 1133 "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"
Py_DECREF(seq);
- #line 1140 "Python/bytecodes.c"
+ #line 1137 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
#line 802 "Python/executor_cases.c.h"
STACK_GROW((oparg & 0xFF) + (oparg >> 8));
@@ -805,12 +805,12 @@
case DELETE_ATTR: {
PyObject *owner = stack_pointer[-1];
- #line 1171 "Python/bytecodes.c"
+ #line 1168 "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"
Py_DECREF(owner);
- #line 1174 "Python/bytecodes.c"
+ #line 1171 "Python/bytecodes.c"
if (err) goto pop_1_error;
#line 816 "Python/executor_cases.c.h"
STACK_SHRINK(1);
@@ -819,12 +819,12 @@
case STORE_GLOBAL: {
PyObject *v = stack_pointer[-1];
- #line 1178 "Python/bytecodes.c"
+ #line 1175 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err = PyDict_SetItem(GLOBALS(), name, v);
#line 826 "Python/executor_cases.c.h"
Py_DECREF(v);
- #line 1181 "Python/bytecodes.c"
+ #line 1178 "Python/bytecodes.c"
if (err) goto pop_1_error;
#line 830 "Python/executor_cases.c.h"
STACK_SHRINK(1);
@@ -832,7 +832,7 @@
}
case DELETE_GLOBAL: {
- #line 1185 "Python/bytecodes.c"
+ #line 1182 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err;
err = PyDict_DelItem(GLOBALS(), name);
@@ -850,7 +850,7 @@
case _LOAD_LOCALS: {
PyObject *locals;
- #line 1199 "Python/bytecodes.c"
+ #line 1196 "Python/bytecodes.c"
locals = LOCALS();
if (locals == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -867,7 +867,7 @@
case _LOAD_FROM_DICT_OR_GLOBALS: {
PyObject *mod_or_class_dict = stack_pointer[-1];
PyObject *v;
- #line 1211 "Python/bytecodes.c"
+ #line 1208 "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);
@@ -930,7 +930,7 @@
}
case DELETE_DEREF: {
- #line 1381 "Python/bytecodes.c"
+ #line 1378 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
// Can't use ERROR_IF here.
@@ -948,7 +948,7 @@
case LOAD_FROM_DICT_OR_DEREF: {
PyObject *class_dict = stack_pointer[-1];
PyObject *value;
- #line 1394 "Python/bytecodes.c"
+ #line 1391 "Python/bytecodes.c"
PyObject *name;
assert(class_dict);
assert(oparg >= 0 && oparg < _PyFrame_GetCode(frame)->co_nlocalsplus);
@@ -990,7 +990,7 @@
case LOAD_DEREF: {
PyObject *value;
- #line 1431 "Python/bytecodes.c"
+ #line 1428 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
value = PyCell_GET(cell);
if (value == NULL) {
@@ -1006,7 +1006,7 @@
case STORE_DEREF: {
PyObject *v = stack_pointer[-1];
- #line 1441 "Python/bytecodes.c"
+ #line 1438 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
PyCell_SET(cell, v);
@@ -1017,7 +1017,7 @@
}
case COPY_FREE_VARS: {
- #line 1448 "Python/bytecodes.c"
+ #line 1445 "Python/bytecodes.c"
/* Copy closure variables to free variables */
PyCodeObject *co = _PyFrame_GetCode(frame);
assert(PyFunction_Check(frame->f_funcobj));
@@ -1035,13 +1035,13 @@
case BUILD_STRING: {
PyObject **pieces = (stack_pointer - oparg);
PyObject *str;
- #line 1461 "Python/bytecodes.c"
+ #line 1458 "Python/bytecodes.c"
str = _PyUnicode_JoinArray(&_Py_STR(empty), pieces, oparg);
#line 1041 "Python/executor_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(pieces[_i]);
}
- #line 1463 "Python/bytecodes.c"
+ #line 1460 "Python/bytecodes.c"
if (str == NULL) { STACK_SHRINK(oparg); goto error; }
#line 1047 "Python/executor_cases.c.h"
STACK_SHRINK(oparg);
@@ -1053,7 +1053,7 @@
case BUILD_TUPLE: {
PyObject **values = (stack_pointer - oparg);
PyObject *tup;
- #line 1467 "Python/bytecodes.c"
+ #line 1464 "Python/bytecodes.c"
tup = _PyTuple_FromArraySteal(values, oparg);
if (tup == NULL) { STACK_SHRINK(oparg); goto error; }
#line 1060 "Python/executor_cases.c.h"
@@ -1066,7 +1066,7 @@
case BUILD_LIST: {
PyObject **values = (stack_pointer - oparg);
PyObject *list;
- #line 1472 "Python/bytecodes.c"
+ #line 1469 "Python/bytecodes.c"
list = _PyList_FromArraySteal(values, oparg);
if (list == NULL) { STACK_SHRINK(oparg); goto error; }
#line 1073 "Python/executor_cases.c.h"
@@ -1079,7 +1079,7 @@
case LIST_EXTEND: {
PyObject *iterable = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 1477 "Python/bytecodes.c"
+ #line 1474 "Python/bytecodes.c"
PyObject *none_val = _PyList_Extend((PyListObject *)list, iterable);
if (none_val == NULL) {
if (_PyErr_ExceptionMatches(tstate, PyExc_TypeError) &&
@@ -1092,7 +1092,7 @@
}
#line 1094 "Python/executor_cases.c.h"
Py_DECREF(iterable);
- #line 1488 "Python/bytecodes.c"
+ #line 1485 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
assert(Py_IsNone(none_val));
@@ -1105,11 +1105,11 @@
case SET_UPDATE: {
PyObject *iterable = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 1495 "Python/bytecodes.c"
+ #line 1492 "Python/bytecodes.c"
int err = _PySet_Update(set, iterable);
#line 1111 "Python/executor_cases.c.h"
Py_DECREF(iterable);
- #line 1497 "Python/bytecodes.c"
+ #line 1494 "Python/bytecodes.c"
if (err < 0) goto pop_1_error;
#line 1115 "Python/executor_cases.c.h"
STACK_SHRINK(1);
@@ -1119,7 +1119,7 @@
case BUILD_SET: {
PyObject **values = (stack_pointer - oparg);
PyObject *set;
- #line 1501 "Python/bytecodes.c"
+ #line 1498 "Python/bytecodes.c"
set = PySet_New(NULL);
if (set == NULL)
goto error;
@@ -1144,7 +1144,7 @@
case BUILD_MAP: {
PyObject **values = (stack_pointer - oparg*2);
PyObject *map;
- #line 1518 "Python/bytecodes.c"
+ #line 1515 "Python/bytecodes.c"
map = _PyDict_FromItems(
values, 2,
values+1, 2,
@@ -1156,7 +1156,7 @@
for (int _i = oparg*2; --_i >= 0;) {
Py_DECREF(values[_i]);
}
- #line 1526 "Python/bytecodes.c"
+ #line 1523 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg*2); goto error; }
#line 1162 "Python/executor_cases.c.h"
STACK_SHRINK(oparg*2);
@@ -1166,7 +1166,7 @@
}
case SETUP_ANNOTATIONS: {
- #line 1530 "Python/bytecodes.c"
+ #line 1527 "Python/bytecodes.c"
int err;
PyObject *ann_dict;
if (LOCALS() == NULL) {
@@ -1214,7 +1214,7 @@
PyObject *keys = stack_pointer[-1];
PyObject **values = (stack_pointer - (1 + oparg));
PyObject *map;
- #line 1572 "Python/bytecodes.c"
+ #line 1569 "Python/bytecodes.c"
if (!PyTuple_CheckExact(keys) ||
PyTuple_GET_SIZE(keys) != (Py_ssize_t)oparg) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -1229,7 +1229,7 @@
Py_DECREF(values[_i]);
}
Py_DECREF(keys);
- #line 1582 "Python/bytecodes.c"
+ #line 1579 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg); goto pop_1_error; }
#line 1235 "Python/executor_cases.c.h"
STACK_SHRINK(oparg);
@@ -1239,7 +1239,7 @@
case DICT_UPDATE: {
PyObject *update = stack_pointer[-1];
- #line 1586 "Python/bytecodes.c"
+ #line 1583 "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)) {
@@ -1249,7 +1249,7 @@
}
#line 1251 "Python/executor_cases.c.h"
Py_DECREF(update);
- #line 1594 "Python/bytecodes.c"
+ #line 1591 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
#line 1256 "Python/executor_cases.c.h"
@@ -1260,14 +1260,14 @@
case DICT_MERGE: {
PyObject *update = stack_pointer[-1];
- #line 1600 "Python/bytecodes.c"
+ #line 1597 "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"
Py_DECREF(update);
- #line 1605 "Python/bytecodes.c"
+ #line 1602 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
#line 1274 "Python/executor_cases.c.h"
@@ -1279,7 +1279,7 @@
case MAP_ADD: {
PyObject *value = stack_pointer[-1];
PyObject *key = stack_pointer[-2];
- #line 1611 "Python/bytecodes.c"
+ #line 1608 "Python/bytecodes.c"
PyObject *dict = PEEK(oparg + 2); // key, value are still on the stack
assert(PyDict_CheckExact(dict));
/* dict[key] = value */
@@ -1296,7 +1296,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1694 "Python/bytecodes.c"
+ #line 1691 "Python/bytecodes.c"
assert(!(oparg & 1));
DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
@@ -1307,7 +1307,7 @@
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1701 "Python/bytecodes.c"
+ #line 1698 "Python/bytecodes.c"
if (res == NULL) goto pop_3_error;
#line 1313 "Python/executor_cases.c.h"
STACK_SHRINK(2);
@@ -1323,7 +1323,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2;
PyObject *res;
- #line 1705 "Python/bytecodes.c"
+ #line 1702 "Python/bytecodes.c"
assert(oparg & 1);
DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
@@ -1357,7 +1357,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2037 "Python/bytecodes.c"
+ #line 2034 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyFloat_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -1378,7 +1378,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2051 "Python/bytecodes.c"
+ #line 2048 "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);
@@ -1403,7 +1403,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2069 "Python/bytecodes.c"
+ #line 2066 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -1425,12 +1425,12 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2083 "Python/bytecodes.c"
+ #line 2080 "Python/bytecodes.c"
int res = Py_Is(left, right) ^ oparg;
#line 1431 "Python/executor_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2085 "Python/bytecodes.c"
+ #line 2082 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
#line 1436 "Python/executor_cases.c.h"
STACK_SHRINK(1);
@@ -1442,12 +1442,12 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2089 "Python/bytecodes.c"
+ #line 2086 "Python/bytecodes.c"
int res = PySequence_Contains(right, left);
#line 1448 "Python/executor_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2091 "Python/bytecodes.c"
+ #line 2088 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
b = (res ^ oparg) ? Py_True : Py_False;
#line 1454 "Python/executor_cases.c.h"
@@ -1461,12 +1461,12 @@
PyObject *exc_value = stack_pointer[-2];
PyObject *rest;
PyObject *match;
- #line 2096 "Python/bytecodes.c"
+ #line 2093 "Python/bytecodes.c"
if (check_except_star_type_valid(tstate, match_type) < 0) {
#line 1467 "Python/executor_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2098 "Python/bytecodes.c"
+ #line 2095 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
@@ -1477,7 +1477,7 @@
#line 1478 "Python/executor_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2106 "Python/bytecodes.c"
+ #line 2103 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
assert((match == NULL) == (rest == NULL));
@@ -1496,19 +1496,19 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2117 "Python/bytecodes.c"
+ #line 2114 "Python/bytecodes.c"
assert(PyExceptionInstance_Check(left));
if (check_except_type_valid(tstate, right) < 0) {
#line 1503 "Python/executor_cases.c.h"
Py_DECREF(right);
- #line 2120 "Python/bytecodes.c"
+ #line 2117 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
int res = PyErr_GivenExceptionMatches(left, right);
#line 1510 "Python/executor_cases.c.h"
Py_DECREF(right);
- #line 2125 "Python/bytecodes.c"
+ #line 2122 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
#line 1514 "Python/executor_cases.c.h"
stack_pointer[-1] = b;
@@ -1518,7 +1518,7 @@
case GET_LEN: {
PyObject *obj = stack_pointer[-1];
PyObject *len_o;
- #line 2246 "Python/bytecodes.c"
+ #line 2243 "Python/bytecodes.c"
// PUSH(len(TOS))
Py_ssize_t len_i = PyObject_Length(obj);
if (len_i < 0) goto error;
@@ -1535,7 +1535,7 @@
PyObject *type = stack_pointer[-2];
PyObject *subject = stack_pointer[-3];
PyObject *attrs;
- #line 2254 "Python/bytecodes.c"
+ #line 2251 "Python/bytecodes.c"
// Pop TOS and TOS1. Set TOS to a tuple of attributes on success, or
// None on failure.
assert(PyTuple_CheckExact(names));
@@ -1544,7 +1544,7 @@
Py_DECREF(subject);
Py_DECREF(type);
Py_DECREF(names);
- #line 2259 "Python/bytecodes.c"
+ #line 2256 "Python/bytecodes.c"
if (attrs) {
assert(PyTuple_CheckExact(attrs)); // Success!
}
@@ -1561,7 +1561,7 @@
case MATCH_MAPPING: {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2269 "Python/bytecodes.c"
+ #line 2266 "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"
@@ -1573,7 +1573,7 @@
case MATCH_SEQUENCE: {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2274 "Python/bytecodes.c"
+ #line 2271 "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"
@@ -1586,7 +1586,7 @@
PyObject *keys = stack_pointer[-1];
PyObject *subject = stack_pointer[-2];
PyObject *values_or_none;
- #line 2279 "Python/bytecodes.c"
+ #line 2276 "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;
@@ -1599,12 +1599,12 @@
case GET_ITER: {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2285 "Python/bytecodes.c"
+ #line 2282 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
iter = PyObject_GetIter(iterable);
#line 1606 "Python/executor_cases.c.h"
Py_DECREF(iterable);
- #line 2288 "Python/bytecodes.c"
+ #line 2285 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
#line 1610 "Python/executor_cases.c.h"
stack_pointer[-1] = iter;
@@ -1614,7 +1614,7 @@
case GET_YIELD_FROM_ITER: {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2292 "Python/bytecodes.c"
+ #line 2289 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
if (PyCoro_CheckExact(iterable)) {
/* `iterable` is a coroutine */
@@ -1639,7 +1639,7 @@
}
#line 1641 "Python/executor_cases.c.h"
Py_DECREF(iterable);
- #line 2315 "Python/bytecodes.c"
+ #line 2312 "Python/bytecodes.c"
}
#line 1645 "Python/executor_cases.c.h"
stack_pointer[-1] = iter;
@@ -1651,7 +1651,7 @@
PyObject *lasti = stack_pointer[-3];
PyObject *exit_func = stack_pointer[-4];
PyObject *res;
- #line 2547 "Python/bytecodes.c"
+ #line 2544 "Python/bytecodes.c"
/* At the top of the stack are 4 values:
- val: TOP = exc_info()
- unused: SECOND = previous exception
@@ -1681,7 +1681,7 @@
case PUSH_EXC_INFO: {
PyObject *new_exc = stack_pointer[-1];
PyObject *prev_exc;
- #line 2586 "Python/bytecodes.c"
+ #line 2583 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
if (exc_info->exc_value != NULL) {
prev_exc = exc_info->exc_value;
@@ -1700,7 +1700,7 @@
case EXIT_INIT_CHECK: {
PyObject *should_be_none = stack_pointer[-1];
- #line 2955 "Python/bytecodes.c"
+ #line 2952 "Python/bytecodes.c"
assert(STACK_LEVEL() == 2);
if (should_be_none != Py_None) {
PyErr_Format(PyExc_TypeError,
@@ -1716,7 +1716,7 @@
case MAKE_FUNCTION: {
PyObject *codeobj = stack_pointer[-1];
PyObject *func;
- #line 3369 "Python/bytecodes.c"
+ #line 3366 "Python/bytecodes.c"
PyFunctionObject *func_obj = (PyFunctionObject *)
PyFunction_New(codeobj, GLOBALS());
@@ -1736,7 +1736,7 @@
case SET_FUNCTION_ATTRIBUTE: {
PyObject *func = stack_pointer[-1];
PyObject *attr = stack_pointer[-2];
- #line 3383 "Python/bytecodes.c"
+ #line 3380 "Python/bytecodes.c"
assert(PyFunction_Check(func));
PyFunctionObject *func_obj = (PyFunctionObject *)func;
switch(oparg) {
@@ -1772,13 +1772,13 @@
PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
PyObject *slice;
- #line 3433 "Python/bytecodes.c"
+ #line 3430 "Python/bytecodes.c"
slice = PySlice_New(start, stop, step);
#line 1778 "Python/executor_cases.c.h"
Py_DECREF(start);
Py_DECREF(stop);
Py_XDECREF(step);
- #line 3435 "Python/bytecodes.c"
+ #line 3432 "Python/bytecodes.c"
if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
#line 1784 "Python/executor_cases.c.h"
STACK_SHRINK(((oparg == 3) ? 1 : 0));
@@ -1790,7 +1790,7 @@
case CONVERT_VALUE: {
PyObject *value = stack_pointer[-1];
PyObject *result;
- #line 3439 "Python/bytecodes.c"
+ #line 3436 "Python/bytecodes.c"
convertion_func_ptr conv_fn;
assert(oparg >= FVC_STR && oparg <= FVC_ASCII);
conv_fn = CONVERSION_FUNCTIONS[oparg];
@@ -1805,7 +1805,7 @@
case FORMAT_SIMPLE: {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 3448 "Python/bytecodes.c"
+ #line 3445 "Python/bytecodes.c"
/* If value is a unicode object, then we know the result
* of format(value) is value itself. */
if (!PyUnicode_CheckExact(value)) {
@@ -1825,7 +1825,7 @@
PyObject *fmt_spec = stack_pointer[-1];
PyObject *value = stack_pointer[-2];
PyObject *res;
- #line 3461 "Python/bytecodes.c"
+ #line 3458 "Python/bytecodes.c"
res = PyObject_Format(value, fmt_spec);
Py_DECREF(value);
Py_DECREF(fmt_spec);
@@ -1839,7 +1839,7 @@
case COPY: {
PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
PyObject *top;
- #line 3468 "Python/bytecodes.c"
+ #line 3465 "Python/bytecodes.c"
assert(oparg > 0);
top = Py_NewRef(bottom);
#line 1846 "Python/executor_cases.c.h"
@@ -1851,7 +1851,7 @@
case SWAP: {
PyObject *top = stack_pointer[-1];
PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
- #line 3493 "Python/bytecodes.c"
+ #line 3490 "Python/bytecodes.c"
assert(oparg >= 2);
#line 1857 "Python/executor_cases.c.h"
stack_pointer[-1] = bottom;
diff --git a/Python/flowgraph.c b/Python/flowgraph.c
index a6b2a9f275a70..d78fb92e0d67d 100644
--- a/Python/flowgraph.c
+++ b/Python/flowgraph.c
@@ -2002,6 +2002,10 @@ _PyCfg_ConvertPseudoOps(basicblock *entryblock)
assert(SAME_OPCODE_METADATA(instr->i_opcode, NOP));
INSTR_SET_OP0(instr, NOP);
}
+ else if (instr->i_opcode == LOAD_CLOSURE) {
+ assert(SAME_OPCODE_METADATA(LOAD_CLOSURE, LOAD_FAST));
+ instr->i_opcode = LOAD_FAST;
+ }
else if (instr->i_opcode == STORE_FAST_MAYBE_NULL) {
assert(SAME_OPCODE_METADATA(STORE_FAST_MAYBE_NULL, STORE_FAST));
instr->i_opcode = STORE_FAST;
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 43cfd4a882c73..44b4522c9a5f1 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -55,26 +55,13 @@
DISPATCH();
}
- TARGET(LOAD_CLOSURE) {
- PyObject *value;
- #line 179 "Python/bytecodes.c"
- /* We keep LOAD_CLOSURE so that the bytecode stays more readable. */
- value = GETLOCAL(oparg);
- if (value == NULL) goto unbound_local_error;
- Py_INCREF(value);
- #line 66 "Python/generated_cases.c.h"
- STACK_GROW(1);
- stack_pointer[-1] = value;
- DISPATCH();
- }
-
TARGET(LOAD_FAST_CHECK) {
PyObject *value;
- #line 186 "Python/bytecodes.c"
+ #line 183 "Python/bytecodes.c"
value = GETLOCAL(oparg);
if (value == NULL) goto unbound_local_error;
Py_INCREF(value);
- #line 78 "Python/generated_cases.c.h"
+ #line 65 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -82,11 +69,11 @@
TARGET(LOAD_FAST) {
PyObject *value;
- #line 192 "Python/bytecodes.c"
+ #line 189 "Python/bytecodes.c"
value = GETLOCAL(oparg);
assert(value != NULL);
Py_INCREF(value);
- #line 90 "Python/generated_cases.c.h"
+ #line 77 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -94,11 +81,11 @@
TARGET(LOAD_FAST_AND_CLEAR) {
PyObject *value;
- #line 198 "Python/bytecodes.c"
+ #line 195 "Python/bytecodes.c"
value = GETLOCAL(oparg);
// do not use SETLOCAL here, it decrefs the old value
GETLOCAL(oparg) = NULL;
- #line 102 "Python/generated_cases.c.h"
+ #line 89 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -107,14 +94,14 @@
TARGET(LOAD_FAST_LOAD_FAST) {
PyObject *value1;
PyObject *value2;
- #line 204 "Python/bytecodes.c"
+ #line 201 "Python/bytecodes.c"
uint32_t oparg1 = oparg >> 4;
uint32_t oparg2 = oparg & 15;
value1 = GETLOCAL(oparg1);
value2 = GETLOCAL(oparg2);
Py_INCREF(value1);
Py_INCREF(value2);
- #line 118 "Python/generated_cases.c.h"
+ #line 105 "Python/generated_cases.c.h"
STACK_GROW(2);
stack_pointer[-1] = value2;
stack_pointer[-2] = value1;
@@ -123,10 +110,10 @@
TARGET(LOAD_CONST) {
PyObject *value;
- #line 213 "Python/bytecodes.c"
+ #line 210 "Python/bytecodes.c"
value = GETITEM(FRAME_CO_CONSTS, oparg);
Py_INCREF(value);
- #line 130 "Python/generated_cases.c.h"
+ #line 117 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -134,9 +121,9 @@
TARGET(STORE_FAST) {
PyObject *value = stack_pointer[-1];
- #line 218 "Python/bytecodes.c"
+ #line 215 "Python/bytecodes.c"
SETLOCAL(oparg, value);
- #line 140 "Python/generated_cases.c.h"
+ #line 127 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -144,13 +131,13 @@
TARGET(STORE_FAST_LOAD_FAST) {
PyObject *value1 = stack_pointer[-1];
PyObject *value2;
- #line 226 "Python/bytecodes.c"
+ #line 223 "Python/bytecodes.c"
uint32_t oparg1 = oparg >> 4;
uint32_t oparg2 = oparg & 15;
SETLOCAL(oparg1, value1);
value2 = GETLOCAL(oparg2);
Py_INCREF(value2);
- #line 154 "Python/generated_cases.c.h"
+ #line 141 "Python/generated_cases.c.h"
stack_pointer[-1] = value2;
DISPATCH();
}
@@ -158,20 +145,20 @@
TARGET(STORE_FAST_STORE_FAST) {
PyObject *value1 = stack_pointer[-1];
PyObject *value2 = stack_pointer[-2];
- #line 234 "Python/bytecodes.c"
+ #line 231 "Python/bytecodes.c"
uint32_t oparg1 = oparg >> 4;
uint32_t oparg2 = oparg & 15;
SETLOCAL(oparg1, value1);
SETLOCAL(oparg2, value2);
- #line 167 "Python/generated_cases.c.h"
+ #line 154 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
TARGET(POP_TOP) {
PyObject *value = stack_pointer[-1];
- #line 241 "Python/bytecodes.c"
- #line 175 "Python/generated_cases.c.h"
+ #line 238 "Python/bytecodes.c"
+ #line 162 "Python/generated_cases.c.h"
Py_DECREF(value);
STACK_SHRINK(1);
DISPATCH();
@@ -179,9 +166,9 @@
TARGET(PUSH_NULL) {
PyObject *res;
- #line 245 "Python/bytecodes.c"
+ #line 242 "Python/bytecodes.c"
res = NULL;
- #line 185 "Python/generated_cases.c.h"
+ #line 172 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -192,14 +179,14 @@
PyObject *_tmp_2 = stack_pointer[-2];
{
PyObject *value = _tmp_1;
- #line 241 "Python/bytecodes.c"
- #line 197 "Python/generated_cases.c.h"
+ #line 238 "Python/bytecodes.c"
+ #line 184 "Python/generated_cases.c.h"
Py_DECREF(value);
}
{
PyObject *value = _tmp_2;
- #line 241 "Python/bytecodes.c"
- #line 203 "Python/generated_cases.c.h"
+ #line 238 "Python/bytecodes.c"
+ #line 190 "Python/generated_cases.c.h"
Py_DECREF(value);
}
STACK_SHRINK(2);
@@ -209,7 +196,7 @@
TARGET(INSTRUMENTED_END_FOR) {
PyObject *value = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 251 "Python/bytecodes.c"
+ #line 248 "Python/bytecodes.c"
/* Need to create a fake StopIteration error here,
* to conform to PEP 380 */
if (PyGen_Check(receiver)) {
@@ -219,7 +206,7 @@
}
PyErr_SetRaisedException(NULL);
}
- #line 223 "Python/generated_cases.c.h"
+ #line 210 "Python/generated_cases.c.h"
Py_DECREF(receiver);
Py_DECREF(value);
STACK_SHRINK(2);
@@ -229,9 +216,9 @@
TARGET(END_SEND) {
PyObject *value = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 264 "Python/bytecodes.c"
+ #line 261 "Python/bytecodes.c"
Py_DECREF(receiver);
- #line 235 "Python/generated_cases.c.h"
+ #line 222 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -240,7 +227,7 @@
TARGET(INSTRUMENTED_END_SEND) {
PyObject *value = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 268 "Python/bytecodes.c"
+ #line 265 "Python/bytecodes.c"
if (PyGen_Check(receiver) || PyCoro_CheckExact(receiver)) {
PyErr_SetObject(PyExc_StopIteration, value);
if (monitor_stop_iteration(tstate, frame, next_instr-1)) {
@@ -249,7 +236,7 @@
PyErr_SetRaisedException(NULL);
}
Py_DECREF(receiver);
- #line 253 "Python/generated_cases.c.h"
+ #line 240 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -258,13 +245,13 @@
TARGET(UNARY_NEGATIVE) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 279 "Python/bytecodes.c"
+ #line 276 "Python/bytecodes.c"
res = PyNumber_Negative(value);
- #line 264 "Python/generated_cases.c.h"
+ #line 251 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 281 "Python/bytecodes.c"
+ #line 278 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 268 "Python/generated_cases.c.h"
+ #line 255 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -272,11 +259,11 @@
TARGET(UNARY_NOT) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 285 "Python/bytecodes.c"
+ #line 282 "Python/bytecodes.c"
int err = PyObject_IsTrue(value);
- #line 278 "Python/generated_cases.c.h"
+ #line 265 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 287 "Python/bytecodes.c"
+ #line 284 "Python/bytecodes.c"
if (err < 0) goto pop_1_error;
if (err == 0) {
res = Py_True;
@@ -284,7 +271,7 @@
else {
res = Py_False;
}
- #line 288 "Python/generated_cases.c.h"
+ #line 275 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -292,13 +279,13 @@
TARGET(UNARY_INVERT) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 297 "Python/bytecodes.c"
+ #line 294 "Python/bytecodes.c"
res = PyNumber_Invert(value);
- #line 298 "Python/generated_cases.c.h"
+ #line 285 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 299 "Python/bytecodes.c"
+ #line 296 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 302 "Python/generated_cases.c.h"
+ #line 289 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -309,10 +296,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 315 "Python/bytecodes.c"
+ #line 312 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- #line 316 "Python/generated_cases.c.h"
+ #line 303 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -320,13 +307,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 320 "Python/bytecodes.c"
+ #line 317 "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 330 "Python/generated_cases.c.h"
+ #line 317 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -341,10 +328,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 315 "Python/bytecodes.c"
+ #line 312 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- #line 348 "Python/generated_cases.c.h"
+ #line 335 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -352,13 +339,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 328 "Python/bytecodes.c"
+ #line 325 "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 362 "Python/generated_cases.c.h"
+ #line 349 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -373,10 +360,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 315 "Python/bytecodes.c"
+ #line 312 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- #line 380 "Python/generated_cases.c.h"
+ #line 367 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -384,13 +371,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 336 "Python/bytecodes.c"
+ #line 333 "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 394 "Python/generated_cases.c.h"
+ #line 381 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -405,10 +392,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 351 "Python/bytecodes.c"
+ #line 348 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- #line 412 "Python/generated_cases.c.h"
+ #line 399 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -416,13 +403,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 356 "Python/bytecodes.c"
+ #line 353 "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 426 "Python/generated_cases.c.h"
+ #line 413 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -437,10 +424,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 351 "Python/bytecodes.c"
+ #line 348 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- #line 444 "Python/generated_cases.c.h"
+ #line 431 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -448,13 +435,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 364 "Python/bytecodes.c"
+ #line 361 "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 458 "Python/generated_cases.c.h"
+ #line 445 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -469,10 +456,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 351 "Python/bytecodes.c"
+ #line 348 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- #line 476 "Python/generated_cases.c.h"
+ #line 463 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -480,13 +467,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 372 "Python/bytecodes.c"
+ #line 369 "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 490 "Python/generated_cases.c.h"
+ #line 477 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -501,10 +488,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 387 "Python/bytecodes.c"
+ #line 384 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
- #line 508 "Python/generated_cases.c.h"
+ #line 495 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -512,13 +499,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 392 "Python/bytecodes.c"
+ #line 389 "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 522 "Python/generated_cases.c.h"
+ #line 509 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -533,17 +520,17 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 387 "Python/bytecodes.c"
+ #line 384 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
- #line 540 "Python/generated_cases.c.h"
+ #line 527 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 409 "Python/bytecodes.c"
+ #line 406 "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);
@@ -567,7 +554,7 @@
if (*target_local == NULL) goto pop_2_error;
// The STORE_FAST is already done.
SKIP_OVER(INLINE_CACHE_ENTRIES_BINARY_OP + 1);
- #line 571 "Python/generated_cases.c.h"
+ #line 558 "Python/generated_cases.c.h"
}
STACK_SHRINK(2);
DISPATCH();
@@ -579,7 +566,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
PyObject *res;
- #line 446 "Python/bytecodes.c"
+ #line 443 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinarySubscrCache *cache = (_PyBinarySubscrCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -591,12 +578,12 @@
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
#endif /* ENABLE_SPECIALIZATION */
res = PyObject_GetItem(container, sub);
- #line 595 "Python/generated_cases.c.h"
+ #line 582 "Python/generated_cases.c.h"
Py_DECREF(container);
Py_DECREF(sub);
- #line 458 "Python/bytecodes.c"
+ #line 455 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 600 "Python/generated_cases.c.h"
+ #line 587 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -608,7 +595,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *res;
- #line 462 "Python/bytecodes.c"
+ #line 459 "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.
@@ -621,7 +608,7 @@
}
Py_DECREF(container);
if (res == NULL) goto pop_3_error;
- #line 625 "Python/generated_cases.c.h"
+ #line 612 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = res;
DISPATCH();
@@ -632,7 +619,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *v = stack_pointer[-4];
- #line 477 "Python/bytecodes.c"
+ #line 474 "Python/bytecodes.c"
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
int err;
if (slice == NULL) {
@@ -645,7 +632,7 @@
Py_DECREF(v);
Py_DECREF(container);
if (err) goto pop_4_error;
- #line 649 "Python/generated_cases.c.h"
+ #line 636 "Python/generated_cases.c.h"
STACK_SHRINK(4);
DISPATCH();
}
@@ -654,7 +641,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *res;
- #line 492 "Python/bytecodes.c"
+ #line 489 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), BINARY_SUBSCR);
@@ -668,7 +655,7 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(list);
- #line 672 "Python/generated_cases.c.h"
+ #line 659 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -679,7 +666,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *tuple = stack_pointer[-2];
PyObject *res;
- #line 508 "Python/bytecodes.c"
+ #line 505 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyTuple_CheckExact(tuple), BINARY_SUBSCR);
@@ -693,7 +680,7 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(tuple);
- #line 697 "Python/generated_cases.c.h"
+ #line 684 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -704,7 +691,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *res;
- #line 524 "Python/bytecodes.c"
+ #line 521 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(dict), BINARY_SUBSCR);
STAT_INC(BINARY_SUBSCR, hit);
res = PyDict_GetItemWithError(dict, sub);
@@ -712,14 +699,14 @@
if (!_PyErr_Occurred(tstate)) {
_PyErr_SetKeyError(sub);
}
- #line 716 "Python/generated_cases.c.h"
+ #line 703 "Python/generated_cases.c.h"
Py_DECREF(dict);
Py_DECREF(sub);
- #line 532 "Python/bytecodes.c"
+ #line 529 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
Py_INCREF(res); // Do this before DECREF'ing dict, sub
- #line 723 "Python/generated_cases.c.h"
+ #line 710 "Python/generated_cases.c.h"
Py_DECREF(dict);
Py_DECREF(sub);
STACK_SHRINK(1);
@@ -731,7 +718,7 @@
TARGET(BINARY_SUBSCR_GETITEM) {
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
- #line 539 "Python/bytecodes.c"
+ #line 536 "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);
@@ -754,15 +741,15 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_BINARY_SUBSCR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 758 "Python/generated_cases.c.h"
+ #line 745 "Python/generated_cases.c.h"
}
TARGET(LIST_APPEND) {
PyObject *v = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 564 "Python/bytecodes.c"
+ #line 561 "Python/bytecodes.c"
if (_PyList_AppendTakeRef((PyListObject *)list, v) < 0) goto pop_1_error;
- #line 766 "Python/generated_cases.c.h"
+ #line 753 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -770,13 +757,13 @@
TARGET(SET_ADD) {
PyObject *v = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 568 "Python/bytecodes.c"
+ #line 565 "Python/bytecodes.c"
int err = PySet_Add(set, v);
- #line 776 "Python/generated_cases.c.h"
+ #line 763 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 570 "Python/bytecodes.c"
+ #line 567 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 780 "Python/generated_cases.c.h"
+ #line 767 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -788,7 +775,7 @@
PyObject *container = stack_pointer[-2];
PyObject *v = stack_pointer[-3];
uint16_t counter = read_u16(&next_instr[0].cache);
- #line 580 "Python/bytecodes.c"
+ #line 577 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr--;
@@ -803,13 +790,13 @@
#endif /* ENABLE_SPECIALIZATION */
/* container[sub] = v */
int err = PyObject_SetItem(container, sub, v);
- #line 807 "Python/generated_cases.c.h"
+ #line 794 "Python/generated_cases.c.h"
Py_DECREF(v);
Py_DECREF(container);
Py_DECREF(sub);
- #line 595 "Python/bytecodes.c"
+ #line 592 "Python/bytecodes.c"
if (err) goto pop_3_error;
- #line 813 "Python/generated_cases.c.h"
+ #line 800 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -819,7 +806,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 599 "Python/bytecodes.c"
+ #line 596 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), STORE_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), STORE_SUBSCR);
@@ -836,7 +823,7 @@
Py_DECREF(old_value);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(list);
- #line 840 "Python/generated_cases.c.h"
+ #line 827 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -846,13 +833,13 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 618 "Python/bytecodes.c"
+ #line 615 "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 856 "Python/generated_cases.c.h"
+ #line 843 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -861,15 +848,15 @@
TARGET(DELETE_SUBSCR) {
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
- #line 626 "Python/bytecodes.c"
+ #line 623 "Python/bytecodes.c"
/* del container[sub] */
int err = PyObject_DelItem(container, sub);
- #line 868 "Python/generated_cases.c.h"
+ #line 855 "Python/generated_cases.c.h"
Py_DECREF(container);
Py_DECREF(sub);
- #line 629 "Python/bytecodes.c"
+ #line 626 "Python/bytecodes.c"
if (err) goto pop_2_error;
- #line 873 "Python/generated_cases.c.h"
+ #line 860 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
@@ -877,14 +864,14 @@
TARGET(CALL_INTRINSIC_1) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 633 "Python/bytecodes.c"
+ #line 630 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_1);
res = _PyIntrinsics_UnaryFunctions[oparg](tstate, value);
- #line 884 "Python/generated_cases.c.h"
+ #line 871 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 636 "Python/bytecodes.c"
+ #line 633 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 888 "Python/generated_cases.c.h"
+ #line 875 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -893,15 +880,15 @@
PyObject *value1 = stack_pointer[-1];
PyObject *value2 = stack_pointer[-2];
PyObject *res;
- #line 640 "Python/bytecodes.c"
+ #line 637 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_2);
res = _PyIntrinsics_BinaryFunctions[oparg](tstate, value2, value1);
- #line 900 "Python/generated_cases.c.h"
+ #line 887 "Python/generated_cases.c.h"
Py_DECREF(value2);
Py_DECREF(value1);
- #line 643 "Python/bytecodes.c"
+ #line 640 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 905 "Python/generated_cases.c.h"
+ #line 892 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -909,7 +896,7 @@
TARGET(RAISE_VARARGS) {
PyObject **args = (stack_pointer - oparg);
- #line 647 "Python/bytecodes.c"
+ #line 644 "Python/bytecodes.c"
PyObject *cause = NULL, *exc = NULL;
switch (oparg) {
case 2:
@@ -927,12 +914,12 @@
break;
}
if (true) { STACK_SHRINK(oparg); goto error; }
- #line 931 "Python/generated_cases.c.h"
+ #line 918 "Python/generated_cases.c.h"
}
TARGET(INTERPRETER_EXIT) {
PyObject *retval = stack_pointer[-1];
- #line 667 "Python/bytecodes.c"
+ #line 664 "Python/bytecodes.c"
assert(frame == &entry_frame);
assert(_PyFrame_IsIncomplete(frame));
/* Restore previous cframe and return. */
@@ -941,12 +928,12 @@
assert(!_PyErr_Occurred(tstate));
_Py_LeaveRecursiveCallTstate(tstate);
return retval;
- #line 945 "Python/generated_cases.c.h"
+ #line 932 "Python/generated_cases.c.h"
}
TARGET(RETURN_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 678 "Python/bytecodes.c"
+ #line 675 "Python/bytecodes.c"
STACK_SHRINK(1);
assert(EMPTY());
_PyFrame_SetStackPointer(frame, stack_pointer);
@@ -959,12 +946,12 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 963 "Python/generated_cases.c.h"
+ #line 950 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_RETURN_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 693 "Python/bytecodes.c"
+ #line 690 "Python/bytecodes.c"
int err = _Py_call_instrumentation_arg(
tstate, PY_MONITORING_EVENT_PY_RETURN,
frame, next_instr-1, retval);
@@ -981,11 +968,11 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 985 "Python/generated_cases.c.h"
+ #line 972 "Python/generated_cases.c.h"
}
TARGET(RETURN_CONST) {
- #line 712 "Python/bytecodes.c"
+ #line 709 "Python/bytecodes.c"
PyObject *retval = GETITEM(FRAME_CO_CONSTS, oparg);
Py_INCREF(retval);
assert(EMPTY());
@@ -999,11 +986,11 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1003 "Python/generated_cases.c.h"
+ #line 990 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_RETURN_CONST) {
- #line 728 "Python/bytecodes.c"
+ #line 725 "Python/bytecodes.c"
PyObject *retval = GETITEM(FRAME_CO_CONSTS, oparg);
int err = _Py_call_instrumentation_arg(
tstate, PY_MONITORING_EVENT_PY_RETURN,
@@ -1021,13 +1008,13 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1025 "Python/generated_cases.c.h"
+ #line 1012 "Python/generated_cases.c.h"
}
TARGET(GET_AITER) {
PyObject *obj = stack_pointer[-1];
PyObject *iter;
- #line 748 "Python/bytecodes.c"
+ #line 745 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyTypeObject *type = Py_TYPE(obj);
@@ -1040,16 +1027,16 @@
"'async for' requires an object with "
"__aiter__ method, got %.100s",
type->tp_name);
- #line 1044 "Python/generated_cases.c.h"
+ #line 1031 "Python/generated_cases.c.h"
Py_DECREF(obj);
- #line 761 "Python/bytecodes.c"
+ #line 758 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
iter = (*getter)(obj);
- #line 1051 "Python/generated_cases.c.h"
+ #line 1038 "Python/generated_cases.c.h"
Py_DECREF(obj);
- #line 766 "Python/bytecodes.c"
+ #line 763 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
if (Py_TYPE(iter)->tp_as_async == NULL ||
@@ -1062,7 +1049,7 @@
Py_DECREF(iter);
if (true) goto pop_1_error;
}
- #line 1066 "Python/generated_cases.c.h"
+ #line 1053 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -1070,7 +1057,7 @@
TARGET(GET_ANEXT) {
PyObject *aiter = stack_pointer[-1];
PyObject *awaitable;
- #line 781 "Python/bytecodes.c"
+ #line 778 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyObject *next_iter = NULL;
PyTypeObject *type = Py_TYPE(aiter);
@@ -1113,7 +1100,7 @@
Py_DECREF(next_iter);
}
}
- #line 1117 "Python/generated_cases.c.h"
+ #line 1104 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = awaitable;
DISPATCH();
@@ -1122,16 +1109,16 @@
TARGET(GET_AWAITABLE) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 826 "Python/bytecodes.c"
+ #line 823 "Python/bytecodes.c"
iter = _PyCoro_GetAwaitableIter(iterable);
if (iter == NULL) {
format_awaitable_error(tstate, Py_TYPE(iterable), oparg);
}
- #line 1133 "Python/generated_cases.c.h"
+ #line 1120 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 833 "Python/bytecodes.c"
+ #line 830 "Python/bytecodes.c"
if (iter != NULL && PyCoro_CheckExact(iter)) {
PyObject *yf = _PyGen_yf((PyGenObject*)iter);
@@ -1148,7 +1135,7 @@
}
if (iter == NULL) goto pop_1_error;
- #line 1152 "Python/generated_cases.c.h"
+ #line 1139 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -1159,7 +1146,7 @@
PyObject *v = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
PyObject *retval;
- #line 857 "Python/bytecodes.c"
+ #line 854 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PySendCache *cache = (_PySendCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1206,7 +1193,7 @@
}
}
Py_DECREF(v);
- #line 1210 "Python/generated_cases.c.h"
+ #line 1197 "Python/generated_cases.c.h"
stack_pointer[-1] = retval;
next_instr += 1;
DISPATCH();
@@ -1215,7 +1202,7 @@
TARGET(SEND_GEN) {
PyObject *v = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 906 "Python/bytecodes.c"
+ #line 903 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, SEND);
PyGenObject *gen = (PyGenObject *)receiver;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type &&
@@ -1231,12 +1218,12 @@
tstate->exc_info = &gen->gi_exc_state;
SKIP_OVER(INLINE_CACHE_ENTRIES_SEND);
DISPATCH_INLINED(gen_frame);
- #line 1235 "Python/generated_cases.c.h"
+ #line 1222 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_YIELD_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 924 "Python/bytecodes.c"
+ #line 921 "Python/bytecodes.c"
assert(frame != &entry_frame);
assert(oparg >= 0); /* make the generator identify this as HAS_ARG */
PyGenObject *gen = _PyFrame_GetGenerator(frame);
@@ -1254,12 +1241,12 @@
gen_frame->previous = NULL;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1258 "Python/generated_cases.c.h"
+ #line 1245 "Python/generated_cases.c.h"
}
TARGET(YIELD_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 944 "Python/bytecodes.c"
+ #line 941 "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.
@@ -1276,15 +1263,15 @@
gen_frame->previous = NULL;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1280 "Python/generated_cases.c.h"
+ #line 1267 "Python/generated_cases.c.h"
}
TARGET(POP_EXCEPT) {
PyObject *exc_value = stack_pointer[-1];
- #line 963 "Python/bytecodes.c"
+ #line 960 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
Py_XSETREF(exc_info->exc_value, exc_value);
- #line 1288 "Python/generated_cases.c.h"
+ #line 1275 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -1292,7 +1279,7 @@
TARGET(RERAISE) {
PyObject *exc = stack_pointer[-1];
PyObject **values = (stack_pointer - (1 + oparg));
- #line 968 "Python/bytecodes.c"
+ #line 965 "Python/bytecodes.c"
assert(oparg >= 0 && oparg <= 2);
if (oparg) {
PyObject *lasti = values[0];
@@ -1310,26 +1297,26 @@
Py_INCREF(exc);
_PyErr_SetRaisedException(tstate, exc);
goto exception_unwind;
- #line 1314 "Python/generated_cases.c.h"
+ #line 1301 "Python/generated_cases.c.h"
}
TARGET(END_ASYNC_FOR) {
PyObject *exc = stack_pointer[-1];
PyObject *awaitable = stack_pointer[-2];
- #line 988 "Python/bytecodes.c"
+ #line 985 "Python/bytecodes.c"
assert(exc && PyExceptionInstance_Check(exc));
if (PyErr_GivenExceptionMatches(exc, PyExc_StopAsyncIteration)) {
- #line 1323 "Python/generated_cases.c.h"
+ #line 1310 "Python/generated_cases.c.h"
Py_DECREF(awaitable);
Py_DECREF(exc);
- #line 991 "Python/bytecodes.c"
+ #line 988 "Python/bytecodes.c"
}
else {
Py_INCREF(exc);
_PyErr_SetRaisedException(tstate, exc);
goto exception_unwind;
}
- #line 1333 "Python/generated_cases.c.h"
+ #line 1320 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
@@ -1340,23 +1327,23 @@
PyObject *sub_iter = stack_pointer[-3];
PyObject *none;
PyObject *value;
- #line 1000 "Python/bytecodes.c"
+ #line 997 "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 1349 "Python/generated_cases.c.h"
+ #line 1336 "Python/generated_cases.c.h"
Py_DECREF(sub_iter);
Py_DECREF(last_sent_val);
Py_DECREF(exc_value);
- #line 1005 "Python/bytecodes.c"
+ #line 1002 "Python/bytecodes.c"
none = Py_None;
}
else {
_PyErr_SetRaisedException(tstate, Py_NewRef(exc_value));
goto exception_unwind;
}
- #line 1360 "Python/generated_cases.c.h"
+ #line 1347 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = value;
stack_pointer[-2] = none;
@@ -1365,9 +1352,9 @@
TARGET(LOAD_ASSERTION_ERROR) {
PyObject *value;
- #line 1014 "Python/bytecodes.c"
+ #line 1011 "Python/bytecodes.c"
value = Py_NewRef(PyExc_AssertionError);
- #line 1371 "Python/generated_cases.c.h"
+ #line 1358 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -1375,7 +1362,7 @@
TARGET(LOAD_BUILD_CLASS) {
PyObject *bc;
- #line 1018 "Python/bytecodes.c"
+ #line 1015 "Python/bytecodes.c"
if (PyDict_CheckExact(BUILTINS())) {
bc = _PyDict_GetItemWithError(BUILTINS(),
&_Py_ID(__build_class__));
@@ -1397,7 +1384,7 @@
if (true) goto error;
}
}
- #line 1401 "Python/generated_cases.c.h"
+ #line 1388 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = bc;
DISPATCH();
@@ -1405,33 +1392,33 @@
TARGET(STORE_NAME) {
PyObject *v = stack_pointer[-1];
- #line 1043 "Python/bytecodes.c"
+ #line 1040 "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 1416 "Python/generated_cases.c.h"
+ #line 1403 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1050 "Python/bytecodes.c"
+ #line 1047 "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 1425 "Python/generated_cases.c.h"
+ #line 1412 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1057 "Python/bytecodes.c"
+ #line 1054 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1429 "Python/generated_cases.c.h"
+ #line 1416 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(DELETE_NAME) {
- #line 1061 "Python/bytecodes.c"
+ #line 1058 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
PyObject *ns = LOCALS();
int err;
@@ -1448,7 +1435,7 @@
name);
goto error;
}
- #line 1452 "Python/generated_cases.c.h"
+ #line 1439 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1456,7 +1443,7 @@
PREDICTED(UNPACK_SEQUENCE);
static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size");
PyObject *seq = stack_pointer[-1];
- #line 1087 "Python/bytecodes.c"
+ #line 1084 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyUnpackSequenceCache *cache = (_PyUnpackSequenceCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1469,11 +1456,11 @@
#endif /* ENABLE_SPECIALIZATION */
PyObject **top = stack_pointer + oparg - 1;
int res = unpack_iterable(tstate, seq, oparg, -1, top);
- #line 1473 "Python/generated_cases.c.h"
+ #line 1460 "Python/generated_cases.c.h"
Py_DECREF(seq);
- #line 1100 "Python/bytecodes.c"
+ #line 1097 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
- #line 1477 "Python/generated_cases.c.h"
+ #line 1464 "Python/generated_cases.c.h"
STACK_SHRINK(1);
STACK_GROW(oparg);
next_instr += 1;
@@ -1483,14 +1470,14 @@
TARGET(UNPACK_SEQUENCE_TWO_TUPLE) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1104 "Python/bytecodes.c"
+ #line 1101 "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 1494 "Python/generated_cases.c.h"
+ #line 1481 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1501,7 +1488,7 @@
TARGET(UNPACK_SEQUENCE_TUPLE) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1114 "Python/bytecodes.c"
+ #line 1111 "Python/bytecodes.c"
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -1509,7 +1496,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 1513 "Python/generated_cases.c.h"
+ #line 1500 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1520,7 +1507,7 @@
TARGET(UNPACK_SEQUENCE_LIST) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1125 "Python/bytecodes.c"
+ #line 1122 "Python/bytecodes.c"
DEOPT_IF(!PyList_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyList_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -1528,7 +1515,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 1532 "Python/generated_cases.c.h"
+ #line 1519 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1538,15 +1525,15 @@
TARGET(UNPACK_EX) {
PyObject *seq = stack_pointer[-1];
- #line 1136 "Python/bytecodes.c"
+ #line 1133 "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 1546 "Python/generated_cases.c.h"
+ #line 1533 "Python/generated_cases.c.h"
Py_DECREF(seq);
- #line 1140 "Python/bytecodes.c"
+ #line 1137 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
- #line 1550 "Python/generated_cases.c.h"
+ #line 1537 "Python/generated_cases.c.h"
STACK_GROW((oparg & 0xFF) + (oparg >> 8));
DISPATCH();
}
@@ -1557,7 +1544,7 @@
PyObject *owner = stack_pointer[-1];
PyObject *v = stack_pointer[-2];
uint16_t counter = read_u16(&next_instr[0].cache);
- #line 1151 "Python/bytecodes.c"
+ #line 1148 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
@@ -1573,12 +1560,12 @@
#endif /* ENABLE_SPECIALIZATION */
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err = PyObject_SetAttr(owner, name, v);
- #line 1577 "Python/generated_cases.c.h"
+ #line 1564 "Python/generated_cases.c.h"
Py_DECREF(v);
Py_DECREF(owner);
- #line 1167 "Python/bytecodes.c"
+ #line 1164 "Python/bytecodes.c"
if (err) goto pop_2_error;
- #line 1582 "Python/generated_cases.c.h"
+ #line 1569 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -1586,34 +1573,34 @@
TARGET(DELETE_ATTR) {
PyObject *owner = stack_pointer[-1];
- #line 1171 "Python/bytecodes.c"
+ #line 1168 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err = PyObject_SetAttr(owner, name, (PyObject *)NULL);
- #line 1593 "Python/generated_cases.c.h"
+ #line 1580 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1174 "Python/bytecodes.c"
+ #line 1171 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1597 "Python/generated_cases.c.h"
+ #line 1584 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(STORE_GLOBAL) {
PyObject *v = stack_pointer[-1];
- #line 1178 "Python/bytecodes.c"
+ #line 1175 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err = PyDict_SetItem(GLOBALS(), name, v);
- #line 1607 "Python/generated_cases.c.h"
+ #line 1594 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1181 "Python/bytecodes.c"
+ #line 1178 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1611 "Python/generated_cases.c.h"
+ #line 1598 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(DELETE_GLOBAL) {
- #line 1185 "Python/bytecodes.c"
+ #line 1182 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
int err;
err = PyDict_DelItem(GLOBALS(), name);
@@ -1625,7 +1612,7 @@
}
goto error;
}
- #line 1629 "Python/generated_cases.c.h"
+ #line 1616 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1633,7 +1620,7 @@
PyObject *_tmp_1;
{
PyObject *locals;
- #line 1199 "Python/bytecodes.c"
+ #line 1196 "Python/bytecodes.c"
locals = LOCALS();
if (locals == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -1641,7 +1628,7 @@
if (true) goto error;
}
Py_INCREF(locals);
- #line 1645 "Python/generated_cases.c.h"
+ #line 1632 "Python/generated_cases.c.h"
_tmp_1 = locals;
}
STACK_GROW(1);
@@ -1653,7 +1640,7 @@
PyObject *_tmp_1;
{
PyObject *locals;
- #line 1199 "Python/bytecodes.c"
+ #line 1196 "Python/bytecodes.c"
locals = LOCALS();
if (locals == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -1661,13 +1648,13 @@
if (true) goto error;
}
Py_INCREF(locals);
- #line 1665 "Python/generated_cases.c.h"
+ #line 1652 "Python/generated_cases.c.h"
_tmp_1 = locals;
}
{
PyObject *mod_or_class_dict = _tmp_1;
PyObject *v;
- #line 1211 "Python/bytecodes.c"
+ #line 1208 "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);
@@ -1724,7 +1711,7 @@
}
}
}
- #line 1728 "Python/generated_cases.c.h"
+ #line 1715 "Python/generated_cases.c.h"
_tmp_1 = v;
}
STACK_GROW(1);
@@ -1737,7 +1724,7 @@
{
PyObject *mod_or_class_dict = _tmp_1;
PyObject *v;
- #line 1211 "Python/bytecodes.c"
+ #line 1208 "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);
@@ -1794,7 +1781,7 @@
}
}
}
- #line 1798 "Python/generated_cases.c.h"
+ #line 1785 "Python/generated_cases.c.h"
_tmp_1 = v;
}
stack_pointer[-1] = _tmp_1;
@@ -1806,7 +1793,7 @@
static_assert(INLINE_CACHE_ENTRIES_LOAD_GLOBAL == 4, "incorrect cache size");
PyObject *null = NULL;
PyObject *v;
- #line 1280 "Python/bytecodes.c"
+ #line 1277 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyLoadGlobalCache *cache = (_PyLoadGlobalCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1858,7 +1845,7 @@
}
}
null = NULL;
- #line 1862 "Python/generated_cases.c.h"
+ #line 1849 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = v;
@@ -1872,7 +1859,7 @@
PyObject *res;
uint16_t index = read_u16(&next_instr[1].cache);
uint16_t version = read_u16(&next_instr[2].cache);
- #line 1334 "Python/bytecodes.c"
+ #line 1331 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
PyDictObject *dict = (PyDictObject *)GLOBALS();
DEOPT_IF(dict->ma_keys->dk_version != version, LOAD_GLOBAL);
@@ -1883,7 +1870,7 @@
Py_INCREF(res);
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
- #line 1887 "Python/generated_cases.c.h"
+ #line 1874 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -1898,7 +1885,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 1347 "Python/bytecodes.c"
+ #line 1344 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
DEOPT_IF(!PyDict_CheckExact(BUILTINS()), LOAD_GLOBAL);
PyDictObject *mdict = (PyDictObject *)GLOBALS();
@@ -1913,7 +1900,7 @@
Py_INCREF(res);
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
- #line 1917 "Python/generated_cases.c.h"
+ #line 1904 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -1923,16 +1910,16 @@
}
TARGET(DELETE_FAST) {
- #line 1364 "Python/bytecodes.c"
+ #line 1361 "Python/bytecodes.c"
PyObject *v = GETLOCAL(oparg);
if (v == NULL) goto unbound_local_error;
SETLOCAL(oparg, NULL);
- #line 1931 "Python/generated_cases.c.h"
+ #line 1918 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(MAKE_CELL) {
- #line 1370 "Python/bytecodes.c"
+ #line 1367 "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);
@@ -1941,12 +1928,12 @@
goto resume_with_error;
}
SETLOCAL(oparg, cell);
- #line 1945 "Python/generated_cases.c.h"
+ #line 1932 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(DELETE_DEREF) {
- #line 1381 "Python/bytecodes.c"
+ #line 1378 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
// Can't use ERROR_IF here.
@@ -1957,14 +1944,14 @@
}
PyCell_SET(cell, NULL);
Py_DECREF(oldobj);
- #line 1961 "Python/generated_cases.c.h"
+ #line 1948 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(LOAD_FROM_DICT_OR_DEREF) {
PyObject *class_dict = stack_pointer[-1];
PyObject *value;
- #line 1394 "Python/bytecodes.c"
+ #line 1391 "Python/bytecodes.c"
PyObject *name;
assert(class_dict);
assert(oparg >= 0 && oparg < _PyFrame_GetCode(frame)->co_nlocalsplus);
@@ -1999,14 +1986,14 @@
}
Py_INCREF(value);
}
- #line 2003 "Python/generated_cases.c.h"
+ #line 1990 "Python/generated_cases.c.h"
stack_pointer[-1] = value;
DISPATCH();
}
TARGET(LOAD_DEREF) {
PyObject *value;
- #line 1431 "Python/bytecodes.c"
+ #line 1428 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
value = PyCell_GET(cell);
if (value == NULL) {
@@ -2014,7 +2001,7 @@
if (true) goto error;
}
Py_INCREF(value);
- #line 2018 "Python/generated_cases.c.h"
+ #line 2005 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -2022,18 +2009,18 @@
TARGET(STORE_DEREF) {
PyObject *v = stack_pointer[-1];
- #line 1441 "Python/bytecodes.c"
+ #line 1438 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
PyCell_SET(cell, v);
Py_XDECREF(oldobj);
- #line 2031 "Python/generated_cases.c.h"
+ #line 2018 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(COPY_FREE_VARS) {
- #line 1448 "Python/bytecodes.c"
+ #line 1445 "Python/bytecodes.c"
/* Copy closure variables to free variables */
PyCodeObject *co = _PyFrame_GetCode(frame);
assert(PyFunction_Check(frame->f_funcobj));
@@ -2044,22 +2031,22 @@
PyObject *o = PyTuple_GET_ITEM(closure, i);
frame->localsplus[offset + i] = Py_NewRef(o);
}
- #line 2048 "Python/generated_cases.c.h"
+ #line 2035 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(BUILD_STRING) {
PyObject **pieces = (stack_pointer - oparg);
PyObject *str;
- #line 1461 "Python/bytecodes.c"
+ #line 1458 "Python/bytecodes.c"
str = _PyUnicode_JoinArray(&_Py_STR(empty), pieces, oparg);
- #line 2057 "Python/generated_cases.c.h"
+ #line 2044 "Python/generated_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(pieces[_i]);
}
- #line 1463 "Python/bytecodes.c"
+ #line 1460 "Python/bytecodes.c"
if (str == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2063 "Python/generated_cases.c.h"
+ #line 2050 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = str;
@@ -2069,10 +2056,10 @@
TARGET(BUILD_TUPLE) {
PyObject **values = (stack_pointer - oparg);
PyObject *tup;
- #line 1467 "Python/bytecodes.c"
+ #line 1464 "Python/bytecodes.c"
tup = _PyTuple_FromArraySteal(values, oparg);
if (tup == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2076 "Python/generated_cases.c.h"
+ #line 2063 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = tup;
@@ -2082,10 +2069,10 @@
TARGET(BUILD_LIST) {
PyObject **values = (stack_pointer - oparg);
PyObject *list;
- #line 1472 "Python/bytecodes.c"
+ #line 1469 "Python/bytecodes.c"
list = _PyList_FromArraySteal(values, oparg);
if (list == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2089 "Python/generated_cases.c.h"
+ #line 2076 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = list;
@@ -2095,7 +2082,7 @@
TARGET(LIST_EXTEND) {
PyObject *iterable = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 1477 "Python/bytecodes.c"
+ #line 1474 "Python/bytecodes.c"
PyObject *none_val = _PyList_Extend((PyListObject *)list, iterable);
if (none_val == NULL) {
if (_PyErr_ExceptionMatches(tstate, PyExc_TypeError) &&
@@ -2106,13 +2093,13 @@
"Value after * must be an iterable, not %.200s",
Py_TYPE(iterable)->tp_name);
}
- #line 2110 "Python/generated_cases.c.h"
+ #line 2097 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 1488 "Python/bytecodes.c"
+ #line 1485 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
assert(Py_IsNone(none_val));
- #line 2116 "Python/generated_cases.c.h"
+ #line 2103 "Python/generated_cases.c.h"
Py_DECREF(iterable);
STACK_SHRINK(1);
DISPATCH();
@@ -2121,13 +2108,13 @@
TARGET(SET_UPDATE) {
PyObject *iterable = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 1495 "Python/bytecodes.c"
+ #line 1492 "Python/bytecodes.c"
int err = _PySet_Update(set, iterable);
- #line 2127 "Python/generated_cases.c.h"
+ #line 2114 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 1497 "Python/bytecodes.c"
+ #line 1494 "Python/bytecodes.c"
if (err < 0) goto pop_1_error;
- #line 2131 "Python/generated_cases.c.h"
+ #line 2118 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -2135,7 +2122,7 @@
TARGET(BUILD_SET) {
PyObject **values = (stack_pointer - oparg);
PyObject *set;
- #line 1501 "Python/bytecodes.c"
+ #line 1498 "Python/bytecodes.c"
set = PySet_New(NULL);
if (set == NULL)
goto error;
@@ -2150,7 +2137,7 @@
Py_DECREF(set);
if (true) { STACK_SHRINK(oparg); goto error; }
}
- #line 2154 "Python/generated_cases.c.h"
+ #line 2141 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = set;
@@ -2160,7 +2147,7 @@
TARGET(BUILD_MAP) {
PyObject **values = (stack_pointer - oparg*2);
PyObject *map;
- #line 1518 "Python/bytecodes.c"
+ #line 1515 "Python/bytecodes.c"
map = _PyDict_FromItems(
values, 2,
values+1, 2,
@@ -2168,13 +2155,13 @@
if (map == NULL)
goto error;
- #line 2172 "Python/generated_cases.c.h"
+ #line 2159 "Python/generated_cases.c.h"
for (int _i = oparg*2; --_i >= 0;) {
Py_DECREF(values[_i]);
}
- #line 1526 "Python/bytecodes.c"
+ #line 1523 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg*2); goto error; }
- #line 2178 "Python/generated_cases.c.h"
+ #line 2165 "Python/generated_cases.c.h"
STACK_SHRINK(oparg*2);
STACK_GROW(1);
stack_pointer[-1] = map;
@@ -2182,7 +2169,7 @@
}
TARGET(SETUP_ANNOTATIONS) {
- #line 1530 "Python/bytecodes.c"
+ #line 1527 "Python/bytecodes.c"
int err;
PyObject *ann_dict;
if (LOCALS() == NULL) {
@@ -2222,7 +2209,7 @@
Py_DECREF(ann_dict);
}
}
- #line 2226 "Python/generated_cases.c.h"
+ #line 2213 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -2230,7 +2217,7 @@
PyObject *keys = stack_pointer[-1];
PyObject **values = (stack_pointer - (1 + oparg));
PyObject *map;
- #line 1572 "Python/bytecodes.c"
+ #line 1569 "Python/bytecodes.c"
if (!PyTuple_CheckExact(keys) ||
PyTuple_GET_SIZE(keys) != (Py_ssize_t)oparg) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -2240,14 +2227,14 @@
map = _PyDict_FromItems(
&PyTuple_GET_ITEM(keys, 0), 1,
values, 1, oparg);
- #line 2244 "Python/generated_cases.c.h"
+ #line 2231 "Python/generated_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(values[_i]);
}
Py_DECREF(keys);
- #line 1582 "Python/bytecodes.c"
+ #line 1579 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg); goto pop_1_error; }
- #line 2251 "Python/generated_cases.c.h"
+ #line 2238 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
stack_pointer[-1] = map;
DISPATCH();
@@ -2255,7 +2242,7 @@
TARGET(DICT_UPDATE) {
PyObject *update = stack_pointer[-1];
- #line 1586 "Python/bytecodes.c"
+ #line 1583 "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)) {
@@ -2263,12 +2250,12 @@
"'%.200s' object is not a mapping",
Py_TYPE(update)->tp_name);
}
- #line 2267 "Python/generated_cases.c.h"
+ #line 2254 "Python/generated_cases.c.h"
Py_DECREF(update);
- #line 1594 "Python/bytecodes.c"
+ #line 1591 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 2272 "Python/generated_cases.c.h"
+ #line 2259 "Python/generated_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
DISPATCH();
@@ -2276,17 +2263,17 @@
TARGET(DICT_MERGE) {
PyObject *update = stack_pointer[-1];
- #line 1600 "Python/bytecodes.c"
+ #line 1597 "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 2285 "Python/generated_cases.c.h"
+ #line 2272 "Python/generated_cases.c.h"
Py_DECREF(update);
- #line 1605 "Python/bytecodes.c"
+ #line 1602 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 2290 "Python/generated_cases.c.h"
+ #line 2277 "Python/generated_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
DISPATCH();
@@ -2295,25 +2282,25 @@
TARGET(MAP_ADD) {
PyObject *value = stack_pointer[-1];
PyObject *key = stack_pointer[-2];
- #line 1611 "Python/bytecodes.c"
+ #line 1608 "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 2305 "Python/generated_cases.c.h"
+ #line 2292 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
TARGET(INSTRUMENTED_LOAD_SUPER_ATTR) {
- #line 1619 "Python/bytecodes.c"
+ #line 1616 "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 2317 "Python/generated_cases.c.h"
+ #line 2304 "Python/generated_cases.c.h"
}
TARGET(LOAD_SUPER_ATTR) {
@@ -2324,7 +2311,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1633 "Python/bytecodes.c"
+ #line 1630 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 2);
int load_method = oparg & 1;
#if ENABLE_SPECIALIZATION
@@ -2366,16 +2353,16 @@
}
}
}
- #line 2370 "Python/generated_cases.c.h"
+ #line 2357 "Python/generated_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1675 "Python/bytecodes.c"
+ #line 1672 "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 2379 "Python/generated_cases.c.h"
+ #line 2366 "Python/generated_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2390,20 +2377,20 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1694 "Python/bytecodes.c"
+ #line 1691 "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 2401 "Python/generated_cases.c.h"
+ #line 2388 "Python/generated_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1701 "Python/bytecodes.c"
+ #line 1698 "Python/bytecodes.c"
if (res == NULL) goto pop_3_error;
- #line 2407 "Python/generated_cases.c.h"
+ #line 2394 "Python/generated_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2418,7 +2405,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2;
PyObject *res;
- #line 1705 "Python/bytecodes.c"
+ #line 1702 "Python/bytecodes.c"
assert(oparg & 1);
DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
@@ -2441,7 +2428,7 @@
res = res2;
res2 = NULL;
}
- #line 2445 "Python/generated_cases.c.h"
+ #line 2432 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
stack_pointer[-2] = res2;
@@ -2455,7 +2442,7 @@
PyObject *owner = stack_pointer[-1];
PyObject *res2 = NULL;
PyObject *res;
- #line 1744 "Python/bytecodes.c"
+ #line 1741 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2489,9 +2476,9 @@
NULL | meth | arg1 | ... | argN
*/
- #line 2493 "Python/generated_cases.c.h"
+ #line 2480 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1778 "Python/bytecodes.c"
+ #line 1775 "Python/bytecodes.c"
if (meth == NULL) goto pop_1_error;
res2 = NULL;
res = meth;
@@ -2500,12 +2487,12 @@
else {
/* Classic, pushes one value. */
res = PyObject_GetAttr(owner, name);
- #line 2504 "Python/generated_cases.c.h"
+ #line 2491 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1787 "Python/bytecodes.c"
+ #line 1784 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
}
- #line 2509 "Python/generated_cases.c.h"
+ #line 2496 "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; }
@@ -2519,7 +2506,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1796 "Python/bytecodes.c"
+ #line 1793 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2532,7 +2519,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2536 "Python/generated_cases.c.h"
+ #line 2523 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2547,7 +2534,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1812 "Python/bytecodes.c"
+ #line 1809 "Python/bytecodes.c"
DEOPT_IF(!PyModule_CheckExact(owner), LOAD_ATTR);
PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner)->md_dict;
assert(dict != NULL);
@@ -2560,7 +2547,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2564 "Python/generated_cases.c.h"
+ #line 2551 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2575,7 +2562,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1828 "Python/bytecodes.c"
+ #line 1825 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2602,7 +2589,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2606 "Python/generated_cases.c.h"
+ #line 2593 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2617,7 +2604,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1858 "Python/bytecodes.c"
+ #line 1855 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2627,7 +2614,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2631 "Python/generated_cases.c.h"
+ #line 2618 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2642,7 +2629,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 1871 "Python/bytecodes.c"
+ #line 1868 "Python/bytecodes.c"
DEOPT_IF(!PyType_Check(cls), LOAD_ATTR);
DEOPT_IF(((PyTypeObject *)cls)->tp_version_tag != type_version,
@@ -2654,7 +2641,7 @@
res = descr;
assert(res != NULL);
Py_INCREF(res);
- #line 2658 "Python/generated_cases.c.h"
+ #line 2645 "Python/generated_cases.c.h"
Py_DECREF(cls);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2668,7 +2655,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 1886 "Python/bytecodes.c"
+ #line 1883 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
PyTypeObject *cls = Py_TYPE(owner);
@@ -2692,7 +2679,7 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2696 "Python/generated_cases.c.h"
+ #line 2683 "Python/generated_cases.c.h"
}
TARGET(LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN) {
@@ -2700,7 +2687,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 1912 "Python/bytecodes.c"
+ #line 1909 "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);
@@ -2726,7 +2713,7 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2730 "Python/generated_cases.c.h"
+ #line 2717 "Python/generated_cases.c.h"
}
TARGET(STORE_ATTR_INSTANCE_VALUE) {
@@ -2734,7 +2721,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 1940 "Python/bytecodes.c"
+ #line 1937 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2752,7 +2739,7 @@
Py_DECREF(old_value);
}
Py_DECREF(owner);
- #line 2756 "Python/generated_cases.c.h"
+ #line 2743 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2763,7 +2750,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 1960 "Python/bytecodes.c"
+ #line 1957 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2802,7 +2789,7 @@
/* PEP 509 */
dict->ma_version_tag = new_version;
Py_DECREF(owner);
- #line 2806 "Python/generated_cases.c.h"
+ #line 2793 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2813,7 +2800,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 2001 "Python/bytecodes.c"
+ #line 1998 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2823,7 +2810,7 @@
*(PyObject **)addr = value;
Py_XDECREF(old_value);
Py_DECREF(owner);
- #line 2827 "Python/generated_cases.c.h"
+ #line 2814 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2835,7 +2822,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2020 "Python/bytecodes.c"
+ #line 2017 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyCompareOpCache *cache = (_PyCompareOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2848,12 +2835,12 @@
#endif /* ENABLE_SPECIALIZATION */
assert((oparg >> 4) <= Py_GE);
res = PyObject_RichCompare(left, right, oparg>>4);
- #line 2852 "Python/generated_cases.c.h"
+ #line 2839 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2033 "Python/bytecodes.c"
+ #line 2030 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 2857 "Python/generated_cases.c.h"
+ #line 2844 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2864,7 +2851,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2037 "Python/bytecodes.c"
+ #line 2034 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyFloat_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -2875,7 +2862,7 @@
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 2879 "Python/generated_cases.c.h"
+ #line 2866 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2886,7 +2873,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2051 "Python/bytecodes.c"
+ #line 2048 "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);
@@ -2901,7 +2888,7 @@
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 2905 "Python/generated_cases.c.h"
+ #line 2892 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2912,7 +2899,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2069 "Python/bytecodes.c"
+ #line 2066 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -2924,7 +2911,7 @@
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 2928 "Python/generated_cases.c.h"
+ #line 2915 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2935,14 +2922,14 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2083 "Python/bytecodes.c"
+ #line 2080 "Python/bytecodes.c"
int res = Py_Is(left, right) ^ oparg;
- #line 2941 "Python/generated_cases.c.h"
+ #line 2928 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2085 "Python/bytecodes.c"
+ #line 2082 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 2946 "Python/generated_cases.c.h"
+ #line 2933 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -2952,15 +2939,15 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2089 "Python/bytecodes.c"
+ #line 2086 "Python/bytecodes.c"
int res = PySequence_Contains(right, left);
- #line 2958 "Python/generated_cases.c.h"
+ #line 2945 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2091 "Python/bytecodes.c"
+ #line 2088 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
b = (res ^ oparg) ? Py_True : Py_False;
- #line 2964 "Python/generated_cases.c.h"
+ #line 2951 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -2971,12 +2958,12 @@
PyObject *exc_value = stack_pointer[-2];
PyObject *rest;
PyObject *match;
- #line 2096 "Python/bytecodes.c"
+ #line 2093 "Python/bytecodes.c"
if (check_except_star_type_valid(tstate, match_type) < 0) {
- #line 2977 "Python/generated_cases.c.h"
+ #line 2964 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2098 "Python/bytecodes.c"
+ #line 2095 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
@@ -2984,10 +2971,10 @@
rest = NULL;
int res = exception_group_match(exc_value, match_type,
&match, &rest);
- #line 2988 "Python/generated_cases.c.h"
+ #line 2975 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2106 "Python/bytecodes.c"
+ #line 2103 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
assert((match == NULL) == (rest == NULL));
@@ -2996,7 +2983,7 @@
if (!Py_IsNone(match)) {
PyErr_SetHandledException(match);
}
- #line 3000 "Python/generated_cases.c.h"
+ #line 2987 "Python/generated_cases.c.h"
stack_pointer[-1] = match;
stack_pointer[-2] = rest;
DISPATCH();
@@ -3006,21 +2993,21 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2117 "Python/bytecodes.c"
+ #line 2114 "Python/bytecodes.c"
assert(PyExceptionInstance_Check(left));
if (check_except_type_valid(tstate, right) < 0) {
- #line 3013 "Python/generated_cases.c.h"
+ #line 3000 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2120 "Python/bytecodes.c"
+ #line 2117 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
int res = PyErr_GivenExceptionMatches(left, right);
- #line 3020 "Python/generated_cases.c.h"
+ #line 3007 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2125 "Python/bytecodes.c"
+ #line 2122 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 3024 "Python/generated_cases.c.h"
+ #line 3011 "Python/generated_cases.c.h"
stack_pointer[-1] = b;
DISPATCH();
}
@@ -3029,15 +3016,15 @@
PyObject *fromlist = stack_pointer[-1];
PyObject *level = stack_pointer[-2];
PyObject *res;
- #line 2129 "Python/bytecodes.c"
+ #line 2126 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
res = import_name(tstate, frame, name, fromlist, level);
- #line 3036 "Python/generated_cases.c.h"
+ #line 3023 "Python/generated_cases.c.h"
Py_DECREF(level);
Py_DECREF(fromlist);
- #line 2132 "Python/bytecodes.c"
+ #line 2129 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 3041 "Python/generated_cases.c.h"
+ #line 3028 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3046,25 +3033,25 @@
TARGET(IMPORT_FROM) {
PyObject *from = stack_pointer[-1];
PyObject *res;
- #line 2136 "Python/bytecodes.c"
+ #line 2133 "Python/bytecodes.c"
PyObject *name = GETITEM(FRAME_CO_NAMES, oparg);
res = import_from(tstate, from, name);
if (res == NULL) goto error;
- #line 3054 "Python/generated_cases.c.h"
+ #line 3041 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
}
TARGET(JUMP_FORWARD) {
- #line 2142 "Python/bytecodes.c"
+ #line 2139 "Python/bytecodes.c"
JUMPBY(oparg);
- #line 3063 "Python/generated_cases.c.h"
+ #line 3050 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(JUMP_BACKWARD) {
- #line 2146 "Python/bytecodes.c"
+ #line 2143 "Python/bytecodes.c"
_Py_CODEUNIT *here = next_instr - 1;
assert(oparg <= INSTR_OFFSET());
JUMPBY(1-oparg);
@@ -3082,13 +3069,13 @@
goto resume_frame;
}
#endif /* ENABLE_SPECIALIZATION */
- #line 3086 "Python/generated_cases.c.h"
+ #line 3073 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
TARGET(ENTER_EXECUTOR) {
- #line 2177 "Python/bytecodes.c"
+ #line 2174 "Python/bytecodes.c"
PyCodeObject *code = _PyFrame_GetCode(frame);
_PyExecutorObject *executor = (_PyExecutorObject *)code->co_executors->executors[oparg&255];
Py_INCREF(executor);
@@ -3098,20 +3085,20 @@
goto resume_with_error;
}
goto resume_frame;
- #line 3102 "Python/generated_cases.c.h"
+ #line 3089 "Python/generated_cases.c.h"
}
TARGET(POP_JUMP_IF_FALSE) {
PyObject *cond = stack_pointer[-1];
- #line 2189 "Python/bytecodes.c"
+ #line 2186 "Python/bytecodes.c"
if (Py_IsFalse(cond)) {
JUMPBY(oparg);
}
else if (!Py_IsTrue(cond)) {
int err = PyObject_IsTrue(cond);
- #line 3113 "Python/generated_cases.c.h"
+ #line 3100 "Python/generated_cases.c.h"
Py_DECREF(cond);
- #line 2195 "Python/bytecodes.c"
+ #line 2192 "Python/bytecodes.c"
if (err == 0) {
JUMPBY(oparg);
}
@@ -3119,22 +3106,22 @@
if (err < 0) goto pop_1_error;
}
}
- #line 3123 "Python/generated_cases.c.h"
+ #line 3110 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_TRUE) {
PyObject *cond = stack_pointer[-1];
- #line 2205 "Python/bytecodes.c"
+ #line 2202 "Python/bytecodes.c"
if (Py_IsTrue(cond)) {
JUMPBY(oparg);
}
else if (!Py_IsFalse(cond)) {
int err = PyObject_IsTrue(cond);
- #line 3136 "Python/generated_cases.c.h"
+ #line 3123 "Python/generated_cases.c.h"
Py_DECREF(cond);
- #line 2211 "Python/bytecodes.c"
+ #line 2208 "Python/bytecodes.c"
if (err > 0) {
JUMPBY(oparg);
}
@@ -3142,63 +3129,63 @@
if (err < 0) goto pop_1_error;
}
}
- #line 3146 "Python/generated_cases.c.h"
+ #line 3133 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NOT_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2221 "Python/bytecodes.c"
+ #line 2218 "Python/bytecodes.c"
if (!Py_IsNone(value)) {
- #line 3155 "Python/generated_cases.c.h"
+ #line 3142 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2223 "Python/bytecodes.c"
+ #line 2220 "Python/bytecodes.c"
JUMPBY(oparg);
}
- #line 3160 "Python/generated_cases.c.h"
+ #line 3147 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2228 "Python/bytecodes.c"
+ #line 2225 "Python/bytecodes.c"
if (Py_IsNone(value)) {
JUMPBY(oparg);
}
else {
- #line 3172 "Python/generated_cases.c.h"
+ #line 3159 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2233 "Python/bytecodes.c"
+ #line 2230 "Python/bytecodes.c"
}
- #line 3176 "Python/generated_cases.c.h"
+ #line 3163 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(JUMP_BACKWARD_NO_INTERRUPT) {
- #line 2237 "Python/bytecodes.c"
+ #line 2234 "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 3189 "Python/generated_cases.c.h"
+ #line 3176 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(GET_LEN) {
PyObject *obj = stack_pointer[-1];
PyObject *len_o;
- #line 2246 "Python/bytecodes.c"
+ #line 2243 "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 3202 "Python/generated_cases.c.h"
+ #line 3189 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = len_o;
DISPATCH();
@@ -3209,16 +3196,16 @@
PyObject *type = stack_pointer[-2];
PyObject *subject = stack_pointer[-3];
PyObject *attrs;
- #line 2254 "Python/bytecodes.c"
+ #line 2251 "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 3218 "Python/generated_cases.c.h"
+ #line 3205 "Python/generated_cases.c.h"
Py_DECREF(subject);
Py_DECREF(type);
Py_DECREF(names);
- #line 2259 "Python/bytecodes.c"
+ #line 2256 "Python/bytecodes.c"
if (attrs) {
assert(PyTuple_CheckExact(attrs)); // Success!
}
@@ -3226,7 +3213,7 @@
if (_PyErr_Occurred(tstate)) goto pop_3_error;
attrs = Py_None; // Failure!
}
- #line 3230 "Python/generated_cases.c.h"
+ #line 3217 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = attrs;
DISPATCH();
@@ -3235,10 +3222,10 @@
TARGET(MATCH_MAPPING) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2269 "Python/bytecodes.c"
+ #line 2266 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
res = match ? Py_True : Py_False;
- #line 3242 "Python/generated_cases.c.h"
+ #line 3229 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3247,10 +3234,10 @@
TARGET(MATCH_SEQUENCE) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2274 "Python/bytecodes.c"
+ #line 2271 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
res = match ? Py_True : Py_False;
- #line 3254 "Python/generated_cases.c.h"
+ #line 3241 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3260,11 +3247,11 @@
PyObject *keys = stack_pointer[-1];
PyObject *subject = stack_pointer[-2];
PyObject *values_or_none;
- #line 2279 "Python/bytecodes.c"
+ #line 2276 "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 3268 "Python/generated_cases.c.h"
+ #line 3255 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = values_or_none;
DISPATCH();
@@ -3273,14 +3260,14 @@
TARGET(GET_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2285 "Python/bytecodes.c"
+ #line 2282 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
iter = PyObject_GetIter(iterable);
- #line 3280 "Python/generated_cases.c.h"
+ #line 3267 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2288 "Python/bytecodes.c"
+ #line 2285 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
- #line 3284 "Python/generated_cases.c.h"
+ #line 3271 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -3288,7 +3275,7 @@
TARGET(GET_YIELD_FROM_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2292 "Python/bytecodes.c"
+ #line 2289 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
if (PyCoro_CheckExact(iterable)) {
/* `iterable` is a coroutine */
@@ -3311,11 +3298,11 @@
if (iter == NULL) {
goto error;
}
- #line 3315 "Python/generated_cases.c.h"
+ #line 3302 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2315 "Python/bytecodes.c"
+ #line 2312 "Python/bytecodes.c"
}
- #line 3319 "Python/generated_cases.c.h"
+ #line 3306 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -3325,7 +3312,7 @@
static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache size");
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2333 "Python/bytecodes.c"
+ #line 2330 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyForIterCache *cache = (_PyForIterCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -3357,7 +3344,7 @@
DISPATCH();
}
// Common case: no jump, leave it to the code generator
- #line 3361 "Python/generated_cases.c.h"
+ #line 3348 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3365,7 +3352,7 @@
}
TARGET(INSTRUMENTED_FOR_ITER) {
- #line 2367 "Python/bytecodes.c"
+ #line 2364 "Python/bytecodes.c"
_Py_CODEUNIT *here = next_instr-1;
_Py_CODEUNIT *target;
PyObject *iter = TOP();
@@ -3391,14 +3378,14 @@
target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
}
INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
- #line 3395 "Python/generated_cases.c.h"
+ #line 3382 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(FOR_ITER_LIST) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2395 "Python/bytecodes.c"
+ #line 2392 "Python/bytecodes.c"
DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
_PyListIterObject *it = (_PyListIterObject *)iter;
STAT_INC(FOR_ITER, hit);
@@ -3419,7 +3406,7 @@
DISPATCH();
end_for_iter_list:
// Common case: no jump, leave it to the code generator
- #line 3423 "Python/generated_cases.c.h"
+ #line 3410 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3429,7 +3416,7 @@
TARGET(FOR_ITER_TUPLE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2418 "Python/bytecodes.c"
+ #line 2415 "Python/bytecodes.c"
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3450,7 +3437,7 @@
DISPATCH();
end_for_iter_tuple:
// Common case: no jump, leave it to the code generator
- #line 3454 "Python/generated_cases.c.h"
+ #line 3441 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3460,7 +3447,7 @@
TARGET(FOR_ITER_RANGE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2441 "Python/bytecodes.c"
+ #line 2438 "Python/bytecodes.c"
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3479,7 +3466,7 @@
if (next == NULL) {
goto error;
}
- #line 3483 "Python/generated_cases.c.h"
+ #line 3470 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3488,7 +3475,7 @@
TARGET(FOR_ITER_GEN) {
PyObject *iter = stack_pointer[-1];
- #line 2462 "Python/bytecodes.c"
+ #line 2459 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
PyGenObject *gen = (PyGenObject *)iter;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
@@ -3504,14 +3491,14 @@
assert(next_instr[oparg].op.code == END_FOR ||
next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
DISPATCH_INLINED(gen_frame);
- #line 3508 "Python/generated_cases.c.h"
+ #line 3495 "Python/generated_cases.c.h"
}
TARGET(BEFORE_ASYNC_WITH) {
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2480 "Python/bytecodes.c"
+ #line 2477 "Python/bytecodes.c"
PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__));
if (enter == NULL) {
if (!_PyErr_Occurred(tstate)) {
@@ -3534,16 +3521,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3538 "Python/generated_cases.c.h"
+ #line 3525 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2503 "Python/bytecodes.c"
+ #line 2500 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3547 "Python/generated_cases.c.h"
+ #line 3534 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3554,7 +3541,7 @@
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2512 "Python/bytecodes.c"
+ #line 2509 "Python/bytecodes.c"
/* pop the context manager, push its __exit__ and the
* value returned from calling its __enter__
*/
@@ -3580,16 +3567,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3584 "Python/generated_cases.c.h"
+ #line 3571 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2538 "Python/bytecodes.c"
+ #line 2535 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3593 "Python/generated_cases.c.h"
+ #line 3580 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3601,7 +3588,7 @@
PyObject *lasti = stack_pointer[-3];
PyObject *exit_func = stack_pointer[-4];
PyObject *res;
- #line 2547 "Python/bytecodes.c"
+ #line 2544 "Python/bytecodes.c"
/* At the top of the stack are 4 values:
- val: TOP = exc_info()
- unused: SECOND = previous exception
@@ -3622,7 +3609,7 @@
res = PyObject_Vectorcall(exit_func, stack + 1,
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL) goto error;
- #line 3626 "Python/generated_cases.c.h"
+ #line 3613 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3631,7 +3618,7 @@
TARGET(PUSH_EXC_INFO) {
PyObject *new_exc = stack_pointer[-1];
PyObject *prev_exc;
- #line 2586 "Python/bytecodes.c"
+ #line 2583 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
if (exc_info->exc_value != NULL) {
prev_exc = exc_info->exc_value;
@@ -3641,7 +3628,7 @@
}
assert(PyExceptionInstance_Check(new_exc));
exc_info->exc_value = Py_NewRef(new_exc);
- #line 3645 "Python/generated_cases.c.h"
+ #line 3632 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = new_exc;
stack_pointer[-2] = prev_exc;
@@ -3655,7 +3642,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 2598 "Python/bytecodes.c"
+ #line 2595 "Python/bytecodes.c"
/* Cached method object */
PyTypeObject *self_cls = Py_TYPE(self);
assert(type_version != 0);
@@ -3672,7 +3659,7 @@
assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR));
res = self;
assert(oparg & 1);
- #line 3676 "Python/generated_cases.c.h"
+ #line 3663 "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; }
@@ -3686,7 +3673,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2617 "Python/bytecodes.c"
+ #line 2614 "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);
@@ -3696,7 +3683,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3700 "Python/generated_cases.c.h"
+ #line 3687 "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; }
@@ -3710,7 +3697,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2629 "Python/bytecodes.c"
+ #line 2626 "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;
@@ -3724,7 +3711,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3728 "Python/generated_cases.c.h"
+ #line 3715 "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; }
@@ -3733,16 +3720,16 @@
}
TARGET(KW_NAMES) {
- #line 2645 "Python/bytecodes.c"
+ #line 2642 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg < PyTuple_GET_SIZE(FRAME_CO_CONSTS));
kwnames = GETITEM(FRAME_CO_CONSTS, oparg);
- #line 3741 "Python/generated_cases.c.h"
+ #line 3728 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_CALL) {
- #line 2651 "Python/bytecodes.c"
+ #line 2648 "Python/bytecodes.c"
int is_meth = PEEK(oparg+2) != NULL;
int total_args = oparg + is_meth;
PyObject *function = PEEK(total_args + 1);
@@ -3755,7 +3742,7 @@
_PyCallCache *cache = (_PyCallCache *)next_instr;
INCREMENT_ADAPTIVE_COUNTER(cache->counter);
GO_TO_INSTRUCTION(CALL);
- #line 3759 "Python/generated_cases.c.h"
+ #line 3746 "Python/generated_cases.c.h"
}
TARGET(CALL) {
@@ -3765,7 +3752,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2697 "Python/bytecodes.c"
+ #line 2694 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -3847,7 +3834,7 @@
Py_DECREF(args[i]);
}
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3851 "Python/generated_cases.c.h"
+ #line 3838 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3859,7 +3846,7 @@
TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 2785 "Python/bytecodes.c"
+ #line 2782 "Python/bytecodes.c"
DEOPT_IF(method != NULL, CALL);
DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL);
STAT_INC(CALL, hit);
@@ -3869,7 +3856,7 @@
PEEK(oparg + 2) = Py_NewRef(meth); // method
Py_DECREF(callable);
GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
- #line 3873 "Python/generated_cases.c.h"
+ #line 3860 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_EXACT_ARGS) {
@@ -3878,7 +3865,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2797 "Python/bytecodes.c"
+ #line 2794 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -3904,7 +3891,7 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3908 "Python/generated_cases.c.h"
+ #line 3895 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -3912,7 +3899,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2825 "Python/bytecodes.c"
+ #line 2822 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -3948,7 +3935,7 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3952 "Python/generated_cases.c.h"
+ #line 3939 "Python/generated_cases.c.h"
}
TARGET(CALL_NO_KW_TYPE_1) {
@@ -3956,7 +3943,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2863 "Python/bytecodes.c"
+ #line 2860 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -3966,7 +3953,7 @@
res = Py_NewRef(Py_TYPE(obj));
Py_DECREF(obj);
Py_DECREF(&PyType_Type); // I.e., callable
- #line 3970 "Python/generated_cases.c.h"
+ #line 3957 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3979,7 +3966,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2875 "Python/bytecodes.c"
+ #line 2872 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -3990,7 +3977,7 @@
Py_DECREF(arg);
Py_DECREF(&PyUnicode_Type); // I.e., callable
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3994 "Python/generated_cases.c.h"
+ #line 3981 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4004,7 +3991,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2889 "Python/bytecodes.c"
+ #line 2886 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -4015,7 +4002,7 @@
Py_DECREF(arg);
Py_DECREF(&PyTuple_Type); // I.e., tuple
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4019 "Python/generated_cases.c.h"
+ #line 4006 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4028,7 +4015,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
- #line 2903 "Python/bytecodes.c"
+ #line 2900 "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__``)
@@ -4078,12 +4065,12 @@
frame = cframe.current_frame = init_frame;
CALL_STAT_INC(inlined_py_calls);
goto start_frame;
- #line 4082 "Python/generated_cases.c.h"
+ #line 4069 "Python/generated_cases.c.h"
}
TARGET(EXIT_INIT_CHECK) {
PyObject *should_be_none = stack_pointer[-1];
- #line 2955 "Python/bytecodes.c"
+ #line 2952 "Python/bytecodes.c"
assert(STACK_LEVEL() == 2);
if (should_be_none != Py_None) {
PyErr_Format(PyExc_TypeError,
@@ -4091,7 +4078,7 @@
Py_TYPE(should_be_none)->tp_name);
goto error;
}
- #line 4095 "Python/generated_cases.c.h"
+ #line 4082 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -4101,7 +4088,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2965 "Python/bytecodes.c"
+ #line 2962 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4123,7 +4110,7 @@
}
Py_DECREF(tp);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4127 "Python/generated_cases.c.h"
+ #line 4114 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4137,7 +4124,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2990 "Python/bytecodes.c"
+ #line 2987 "Python/bytecodes.c"
/* Builtin METH_O functions */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4165,7 +4152,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4169 "Python/generated_cases.c.h"
+ #line 4156 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4179,7 +4166,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3021 "Python/bytecodes.c"
+ #line 3018 "Python/bytecodes.c"
/* Builtin METH_FASTCALL functions, without keywords */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4211,7 +4198,7 @@
'invalid'). In those cases an exception is set, so we must
handle it.
*/
- #line 4215 "Python/generated_cases.c.h"
+ #line 4202 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4225,7 +4212,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3056 "Python/bytecodes.c"
+ #line 3053 "Python/bytecodes.c"
/* Builtin METH_FASTCALL | METH_KEYWORDS functions */
int is_meth = method != NULL;
int total_args = oparg;
@@ -4257,7 +4244,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4261 "Python/generated_cases.c.h"
+ #line 4248 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4271,7 +4258,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3091 "Python/bytecodes.c"
+ #line 3088 "Python/bytecodes.c"
assert(kwnames == NULL);
/* len(o) */
int is_meth = method != NULL;
@@ -4296,7 +4283,7 @@
Py_DECREF(callable);
Py_DECREF(arg);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4300 "Python/generated_cases.c.h"
+ #line 4287 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4309,7 +4296,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3118 "Python/bytecodes.c"
+ #line 3115 "Python/bytecodes.c"
assert(kwnames == NULL);
/* isinstance(o, o2) */
int is_meth = method != NULL;
@@ -4336,7 +4323,7 @@
Py_DECREF(cls);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4340 "Python/generated_cases.c.h"
+ #line 4327 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4348,7 +4335,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *self = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 3148 "Python/bytecodes.c"
+ #line 3145 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
assert(method != NULL);
@@ -4366,14 +4353,14 @@
SKIP_OVER(INLINE_CACHE_ENTRIES_CALL + 1);
assert(next_instr[-1].op.code == POP_TOP);
DISPATCH();
- #line 4370 "Python/generated_cases.c.h"
+ #line 4357 "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 3168 "Python/bytecodes.c"
+ #line 3165 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4404,7 +4391,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4408 "Python/generated_cases.c.h"
+ #line 4395 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4417,7 +4404,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3202 "Python/bytecodes.c"
+ #line 3199 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4446,7 +4433,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4450 "Python/generated_cases.c.h"
+ #line 4437 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4459,7 +4446,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3234 "Python/bytecodes.c"
+ #line 3231 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 0 || oparg == 1);
int is_meth = method != NULL;
@@ -4488,7 +4475,7 @@
Py_DECREF(self);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4492 "Python/generated_cases.c.h"
+ #line 4479 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4501,7 +4488,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3266 "Python/bytecodes.c"
+ #line 3263 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4529,7 +4516,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4533 "Python/generated_cases.c.h"
+ #line 4520 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4539,9 +4526,9 @@
}
TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
- #line 3297 "Python/bytecodes.c"
+ #line 3294 "Python/bytecodes.c"
GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
- #line 4545 "Python/generated_cases.c.h"
+ #line 4532 "Python/generated_cases.c.h"
}
TARGET(CALL_FUNCTION_EX) {
@@ -4550,7 +4537,7 @@
PyObject *callargs = stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))];
PyObject *func = stack_pointer[-(2 + ((oparg & 1) ? 1 : 0))];
PyObject *result;
- #line 3301 "Python/bytecodes.c"
+ #line 3298 "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));
@@ -4612,14 +4599,14 @@
}
result = PyObject_Call(func, callargs, kwargs);
}
- #line 4616 "Python/generated_cases.c.h"
+ #line 4603 "Python/generated_cases.c.h"
Py_DECREF(func);
Py_DECREF(callargs);
Py_XDECREF(kwargs);
- #line 3363 "Python/bytecodes.c"
+ #line 3360 "Python/bytecodes.c"
assert(PEEK(3 + (oparg & 1)) == NULL);
if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
- #line 4623 "Python/generated_cases.c.h"
+ #line 4610 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg & 1) ? 1 : 0));
STACK_SHRINK(2);
stack_pointer[-1] = result;
@@ -4630,7 +4617,7 @@
TARGET(MAKE_FUNCTION) {
PyObject *codeobj = stack_pointer[-1];
PyObject *func;
- #line 3369 "Python/bytecodes.c"
+ #line 3366 "Python/bytecodes.c"
PyFunctionObject *func_obj = (PyFunctionObject *)
PyFunction_New(codeobj, GLOBALS());
@@ -4642,7 +4629,7 @@
func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
func = (PyObject *)func_obj;
- #line 4646 "Python/generated_cases.c.h"
+ #line 4633 "Python/generated_cases.c.h"
stack_pointer[-1] = func;
DISPATCH();
}
@@ -4650,7 +4637,7 @@
TARGET(SET_FUNCTION_ATTRIBUTE) {
PyObject *func = stack_pointer[-1];
PyObject *attr = stack_pointer[-2];
- #line 3383 "Python/bytecodes.c"
+ #line 3380 "Python/bytecodes.c"
assert(PyFunction_Check(func));
PyFunctionObject *func_obj = (PyFunctionObject *)func;
switch(oparg) {
@@ -4675,14 +4662,14 @@
default:
Py_UNREACHABLE();
}
- #line 4679 "Python/generated_cases.c.h"
+ #line 4666 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = func;
DISPATCH();
}
TARGET(RETURN_GENERATOR) {
- #line 3410 "Python/bytecodes.c"
+ #line 3407 "Python/bytecodes.c"
assert(PyFunction_Check(frame->f_funcobj));
PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -4703,7 +4690,7 @@
frame = cframe.current_frame = prev;
_PyFrame_StackPush(frame, (PyObject *)gen);
goto resume_frame;
- #line 4707 "Python/generated_cases.c.h"
+ #line 4694 "Python/generated_cases.c.h"
}
TARGET(BUILD_SLICE) {
@@ -4711,15 +4698,15 @@
PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
PyObject *slice;
- #line 3433 "Python/bytecodes.c"
+ #line 3430 "Python/bytecodes.c"
slice = PySlice_New(start, stop, step);
- #line 4717 "Python/generated_cases.c.h"
+ #line 4704 "Python/generated_cases.c.h"
Py_DECREF(start);
Py_DECREF(stop);
Py_XDECREF(step);
- #line 3435 "Python/bytecodes.c"
+ #line 3432 "Python/bytecodes.c"
if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
- #line 4723 "Python/generated_cases.c.h"
+ #line 4710 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg == 3) ? 1 : 0));
STACK_SHRINK(1);
stack_pointer[-1] = slice;
@@ -4729,14 +4716,14 @@
TARGET(CONVERT_VALUE) {
PyObject *value = stack_pointer[-1];
PyObject *result;
- #line 3439 "Python/bytecodes.c"
+ #line 3436 "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 4740 "Python/generated_cases.c.h"
+ #line 4727 "Python/generated_cases.c.h"
stack_pointer[-1] = result;
DISPATCH();
}
@@ -4744,7 +4731,7 @@
TARGET(FORMAT_SIMPLE) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 3448 "Python/bytecodes.c"
+ #line 3445 "Python/bytecodes.c"
/* If value is a unicode object, then we know the result
* of format(value) is value itself. */
if (!PyUnicode_CheckExact(value)) {
@@ -4755,7 +4742,7 @@
else {
res = value;
}
- #line 4759 "Python/generated_cases.c.h"
+ #line 4746 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -4764,12 +4751,12 @@
PyObject *fmt_spec = stack_pointer[-1];
PyObject *value = stack_pointer[-2];
PyObject *res;
- #line 3461 "Python/bytecodes.c"
+ #line 3458 "Python/bytecodes.c"
res = PyObject_Format(value, fmt_spec);
Py_DECREF(value);
Py_DECREF(fmt_spec);
if (res == NULL) goto pop_2_error;
- #line 4773 "Python/generated_cases.c.h"
+ #line 4760 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -4778,10 +4765,10 @@
TARGET(COPY) {
PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
PyObject *top;
- #line 3468 "Python/bytecodes.c"
+ #line 3465 "Python/bytecodes.c"
assert(oparg > 0);
top = Py_NewRef(bottom);
- #line 4785 "Python/generated_cases.c.h"
+ #line 4772 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = top;
DISPATCH();
@@ -4793,7 +4780,7 @@
PyObject *rhs = stack_pointer[-1];
PyObject *lhs = stack_pointer[-2];
PyObject *res;
- #line 3473 "Python/bytecodes.c"
+ #line 3470 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -4808,12 +4795,12 @@
assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
assert(binary_ops[oparg]);
res = binary_ops[oparg](lhs, rhs);
- #line 4812 "Python/generated_cases.c.h"
+ #line 4799 "Python/generated_cases.c.h"
Py_DECREF(lhs);
Py_DECREF(rhs);
- #line 3488 "Python/bytecodes.c"
+ #line 3485 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 4817 "Python/generated_cases.c.h"
+ #line 4804 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -4823,16 +4810,16 @@
TARGET(SWAP) {
PyObject *top = stack_pointer[-1];
PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
- #line 3493 "Python/bytecodes.c"
+ #line 3490 "Python/bytecodes.c"
assert(oparg >= 2);
- #line 4829 "Python/generated_cases.c.h"
+ #line 4816 "Python/generated_cases.c.h"
stack_pointer[-1] = bottom;
stack_pointer[-(2 + (oparg-2))] = top;
DISPATCH();
}
TARGET(INSTRUMENTED_INSTRUCTION) {
- #line 3497 "Python/bytecodes.c"
+ #line 3494 "Python/bytecodes.c"
int next_opcode = _Py_call_instrumentation_instruction(
tstate, frame, next_instr-1);
if (next_opcode < 0) goto error;
@@ -4844,26 +4831,26 @@
assert(next_opcode > 0 && next_opcode < 256);
opcode = next_opcode;
DISPATCH_GOTO();
- #line 4848 "Python/generated_cases.c.h"
+ #line 4835 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_JUMP_FORWARD) {
- #line 3511 "Python/bytecodes.c"
+ #line 3508 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
- #line 4854 "Python/generated_cases.c.h"
+ #line 4841 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_JUMP_BACKWARD) {
- #line 3515 "Python/bytecodes.c"
+ #line 3512 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr+1-oparg, PY_MONITORING_EVENT_JUMP);
- #line 4861 "Python/generated_cases.c.h"
+ #line 4848 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) {
- #line 3520 "Python/bytecodes.c"
+ #line 3517 "Python/bytecodes.c"
PyObject *cond = POP();
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
@@ -4872,12 +4859,12 @@
assert(err == 0 || err == 1);
int offset = err*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4876 "Python/generated_cases.c.h"
+ #line 4863 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) {
- #line 3531 "Python/bytecodes.c"
+ #line 3528 "Python/bytecodes.c"
PyObject *cond = POP();
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
@@ -4886,12 +4873,12 @@
assert(err == 0 || err == 1);
int offset = (1-err)*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4890 "Python/generated_cases.c.h"
+ #line 4877 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) {
- #line 3542 "Python/bytecodes.c"
+ #line 3539 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4903,12 +4890,12 @@
offset = 0;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4907 "Python/generated_cases.c.h"
+ #line 4894 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) {
- #line 3556 "Python/bytecodes.c"
+ #line 3553 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4920,30 +4907,30 @@
offset = oparg;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4924 "Python/generated_cases.c.h"
+ #line 4911 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(EXTENDED_ARG) {
- #line 3570 "Python/bytecodes.c"
+ #line 3567 "Python/bytecodes.c"
assert(oparg);
opcode = next_instr->op.code;
oparg = oparg << 8 | next_instr->op.arg;
PRE_DISPATCH_GOTO();
DISPATCH_GOTO();
- #line 4935 "Python/generated_cases.c.h"
+ #line 4922 "Python/generated_cases.c.h"
}
TARGET(CACHE) {
- #line 3578 "Python/bytecodes.c"
+ #line 3575 "Python/bytecodes.c"
assert(0 && "Executing a cache.");
Py_UNREACHABLE();
- #line 4942 "Python/generated_cases.c.h"
+ #line 4929 "Python/generated_cases.c.h"
}
TARGET(RESERVED) {
- #line 3583 "Python/bytecodes.c"
+ #line 3580 "Python/bytecodes.c"
assert(0 && "Executing RESERVED instruction.");
Py_UNREACHABLE();
- #line 4949 "Python/generated_cases.c.h"
+ #line 4936 "Python/generated_cases.c.h"
}
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
index cfdc09294e9de..991006ceb182a 100644
--- a/Python/opcode_metadata.h
+++ b/Python/opcode_metadata.h
@@ -5,6 +5,7 @@
#define IS_PSEUDO_INSTR(OP) \
+ ((OP) == LOAD_CLOSURE) || \
((OP) == STORE_FAST_MAYBE_NULL) || \
((OP) == LOAD_SUPER_METHOD) || \
((OP) == LOAD_ZERO_SUPER_METHOD) || \
diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index 781d72fa7f533..8561d9d4a3638 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -135,7 +135,7 @@ static void *opcode_targets[256] = {
&&TARGET_BUILD_SLICE,
&&TARGET_JUMP_BACKWARD_NO_INTERRUPT,
&&TARGET_MAKE_CELL,
- &&TARGET_LOAD_CLOSURE,
+ &&TARGET_CALL_BUILTIN_FAST_WITH_KEYWORDS,
&&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_BUILTIN_FAST_WITH_KEYWORDS,
+ &&TARGET_CALL_NO_KW_LEN,
&&TARGET_COPY_FREE_VARS,
&&TARGET_YIELD_VALUE,
&&TARGET_RESUME,
&&TARGET_MATCH_CLASS,
- &&TARGET_CALL_NO_KW_LEN,
&&TARGET_CALL_NO_KW_ISINSTANCE,
&&TARGET_CALL_NO_KW_LIST_APPEND,
+ &&TARGET_CALL_NO_KW_METHOD_DESCRIPTOR_O,
&&TARGET_BUILD_CONST_KEY_MAP,
&&TARGET_BUILD_STRING,
&&TARGET_CONVERT_VALUE,
- &&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_LIST_EXTEND,
&&TARGET_SET_UPDATE,
&&TARGET_DICT_MERGE,
&&TARGET_DICT_UPDATE,
- &&TARGET_CALL_NO_KW_METHOD_DESCRIPTOR_FAST,
&&TARGET_CALL_NO_KW_ALLOC_AND_ENTER_INIT,
+ &&_unknown_opcode,
&&TARGET_LOAD_FAST_LOAD_FAST,
&&TARGET_STORE_FAST_LOAD_FAST,
&&TARGET_STORE_FAST_STORE_FAST,
More information about the Python-checkins
mailing list