[Python-checkins] GH-105229: Replace some superinstructions with single instruction equivalent. (GH-105230)
markshannon
webhook-mailer at python.org
Mon Jun 5 06:07:14 EDT 2023
https://github.com/python/cpython/commit/06893403668961fdbd5d9ece18162eb3470fc8dd
commit: 06893403668961fdbd5d9ece18162eb3470fc8dd
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2023-06-05T11:07:04+01:00
summary:
GH-105229: Replace some superinstructions with single instruction equivalent. (GH-105230)
files:
A Misc/NEWS.d/next/Core and Builtins/2023-06-02-01-27-35.gh-issue-105229.U05x4G.rst
M Include/internal/pycore_opcode.h
M Include/internal/pycore_opcode_utils.h
M Include/opcode.h
M Lib/dis.py
M Lib/importlib/_bootstrap_external.py
M Lib/opcode.py
M Lib/test/test_dis.py
M Lib/test/test_monitoring.py
M Lib/test/test_peepholer.py
M Python/bytecodes.c
M Python/flowgraph.c
M Python/generated_cases.c.h
M Python/instrumentation.c
M Python/opcode_metadata.h
M Python/opcode_targets.h
M Python/specialize.c
diff --git a/Include/internal/pycore_opcode.h b/Include/internal/pycore_opcode.h
index 15c8dcfdbe1c7..784b86ed49bde 100644
--- a/Include/internal/pycore_opcode.h
+++ b/Include/internal/pycore_opcode.h
@@ -177,8 +177,8 @@ const uint8_t _PyOpcode_Deopt[256] = {
[LOAD_FAST] = LOAD_FAST,
[LOAD_FAST_AND_CLEAR] = LOAD_FAST_AND_CLEAR,
[LOAD_FAST_CHECK] = LOAD_FAST_CHECK,
+ [LOAD_FAST_LOAD_FAST] = LOAD_FAST_LOAD_FAST,
[LOAD_FAST__LOAD_CONST] = LOAD_FAST,
- [LOAD_FAST__LOAD_FAST] = LOAD_FAST,
[LOAD_FROM_DICT_OR_DEREF] = LOAD_FROM_DICT_OR_DEREF,
[LOAD_FROM_DICT_OR_GLOBALS] = LOAD_FROM_DICT_OR_GLOBALS,
[LOAD_GLOBAL] = LOAD_GLOBAL,
@@ -223,8 +223,8 @@ const uint8_t _PyOpcode_Deopt[256] = {
[STORE_ATTR_WITH_HINT] = STORE_ATTR,
[STORE_DEREF] = STORE_DEREF,
[STORE_FAST] = STORE_FAST,
- [STORE_FAST__LOAD_FAST] = STORE_FAST,
- [STORE_FAST__STORE_FAST] = STORE_FAST,
+ [STORE_FAST_LOAD_FAST] = STORE_FAST_LOAD_FAST,
+ [STORE_FAST_STORE_FAST] = STORE_FAST_STORE_FAST,
[STORE_GLOBAL] = STORE_GLOBAL,
[STORE_NAME] = STORE_NAME,
[STORE_SLICE] = STORE_SLICE,
@@ -335,7 +335,7 @@ static const char *const _PyOpcode_OpName[267] = {
[SETUP_ANNOTATIONS] = "SETUP_ANNOTATIONS",
[LOAD_FAST__LOAD_CONST] = "LOAD_FAST__LOAD_CONST",
[LOAD_LOCALS] = "LOAD_LOCALS",
- [LOAD_FAST__LOAD_FAST] = "LOAD_FAST__LOAD_FAST",
+ [LOAD_GLOBAL_BUILTIN] = "LOAD_GLOBAL_BUILTIN",
[POP_EXCEPT] = "POP_EXCEPT",
[STORE_NAME] = "STORE_NAME",
[DELETE_NAME] = "DELETE_NAME",
@@ -358,9 +358,9 @@ static const char *const _PyOpcode_OpName[267] = {
[IMPORT_NAME] = "IMPORT_NAME",
[IMPORT_FROM] = "IMPORT_FROM",
[JUMP_FORWARD] = "JUMP_FORWARD",
- [LOAD_GLOBAL_BUILTIN] = "LOAD_GLOBAL_BUILTIN",
[LOAD_GLOBAL_MODULE] = "LOAD_GLOBAL_MODULE",
[STORE_ATTR_INSTANCE_VALUE] = "STORE_ATTR_INSTANCE_VALUE",
+ [STORE_ATTR_SLOT] = "STORE_ATTR_SLOT",
[POP_JUMP_IF_FALSE] = "POP_JUMP_IF_FALSE",
[POP_JUMP_IF_TRUE] = "POP_JUMP_IF_TRUE",
[LOAD_GLOBAL] = "LOAD_GLOBAL",
@@ -395,29 +395,29 @@ static const char *const _PyOpcode_OpName[267] = {
[LIST_APPEND] = "LIST_APPEND",
[SET_ADD] = "SET_ADD",
[MAP_ADD] = "MAP_ADD",
- [STORE_ATTR_SLOT] = "STORE_ATTR_SLOT",
+ [STORE_ATTR_WITH_HINT] = "STORE_ATTR_WITH_HINT",
[COPY_FREE_VARS] = "COPY_FREE_VARS",
[YIELD_VALUE] = "YIELD_VALUE",
[RESUME] = "RESUME",
[MATCH_CLASS] = "MATCH_CLASS",
- [STORE_ATTR_WITH_HINT] = "STORE_ATTR_WITH_HINT",
- [STORE_FAST__LOAD_FAST] = "STORE_FAST__LOAD_FAST",
+ [STORE_SUBSCR_DICT] = "STORE_SUBSCR_DICT",
+ [STORE_SUBSCR_LIST_INT] = "STORE_SUBSCR_LIST_INT",
[FORMAT_VALUE] = "FORMAT_VALUE",
[BUILD_CONST_KEY_MAP] = "BUILD_CONST_KEY_MAP",
[BUILD_STRING] = "BUILD_STRING",
- [STORE_FAST__STORE_FAST] = "STORE_FAST__STORE_FAST",
- [STORE_SUBSCR_DICT] = "STORE_SUBSCR_DICT",
- [STORE_SUBSCR_LIST_INT] = "STORE_SUBSCR_LIST_INT",
[UNPACK_SEQUENCE_LIST] = "UNPACK_SEQUENCE_LIST",
+ [UNPACK_SEQUENCE_TUPLE] = "UNPACK_SEQUENCE_TUPLE",
+ [UNPACK_SEQUENCE_TWO_TUPLE] = "UNPACK_SEQUENCE_TWO_TUPLE",
+ [SEND_GEN] = "SEND_GEN",
[LIST_EXTEND] = "LIST_EXTEND",
[SET_UPDATE] = "SET_UPDATE",
[DICT_MERGE] = "DICT_MERGE",
[DICT_UPDATE] = "DICT_UPDATE",
- [UNPACK_SEQUENCE_TUPLE] = "UNPACK_SEQUENCE_TUPLE",
- [UNPACK_SEQUENCE_TWO_TUPLE] = "UNPACK_SEQUENCE_TWO_TUPLE",
- [SEND_GEN] = "SEND_GEN",
- [169] = "<169>",
- [170] = "<170>",
+ [166] = "<166>",
+ [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",
[CALL] = "CALL",
[KW_NAMES] = "KW_NAMES",
[CALL_INTRINSIC_1] = "CALL_INTRINSIC_1",
@@ -518,8 +518,8 @@ static const char *const _PyOpcode_OpName[267] = {
#endif
#define EXTRA_CASES \
- case 169: \
- case 170: \
+ case 166: \
+ case 167: \
case 177: \
case 178: \
case 179: \
diff --git a/Include/internal/pycore_opcode_utils.h b/Include/internal/pycore_opcode_utils.h
index 9dfe7755b74d0..e6a8a8ea43868 100644
--- a/Include/internal/pycore_opcode_utils.h
+++ b/Include/internal/pycore_opcode_utils.h
@@ -56,11 +56,8 @@ extern "C" {
(opcode) == RERAISE)
#define IS_SUPERINSTRUCTION_OPCODE(opcode) \
- ((opcode) == LOAD_FAST__LOAD_FAST || \
- (opcode) == LOAD_FAST__LOAD_CONST || \
- (opcode) == LOAD_CONST__LOAD_FAST || \
- (opcode) == STORE_FAST__LOAD_FAST || \
- (opcode) == STORE_FAST__STORE_FAST)
+ ((opcode) == LOAD_FAST__LOAD_CONST || \
+ (opcode) == LOAD_CONST__LOAD_FAST)
#define LOG_BITS_PER_INT 5
diff --git a/Include/opcode.h b/Include/opcode.h
index bbf5756a35210..7aa6f84199332 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -114,6 +114,9 @@ extern "C" {
#define SET_UPDATE 163
#define DICT_MERGE 164
#define DICT_UPDATE 165
+#define LOAD_FAST_LOAD_FAST 168
+#define STORE_FAST_LOAD_FAST 169
+#define STORE_FAST_STORE_FAST 170
#define CALL 171
#define KW_NAMES 172
#define CALL_INTRINSIC_1 173
@@ -203,20 +206,17 @@ extern "C" {
#define LOAD_ATTR_METHOD_WITH_VALUES 82
#define LOAD_CONST__LOAD_FAST 84
#define LOAD_FAST__LOAD_CONST 86
-#define LOAD_FAST__LOAD_FAST 88
-#define LOAD_GLOBAL_BUILTIN 111
-#define LOAD_GLOBAL_MODULE 112
-#define STORE_ATTR_INSTANCE_VALUE 113
-#define STORE_ATTR_SLOT 148
-#define STORE_ATTR_WITH_HINT 153
-#define STORE_FAST__LOAD_FAST 154
-#define STORE_FAST__STORE_FAST 158
-#define STORE_SUBSCR_DICT 159
-#define STORE_SUBSCR_LIST_INT 160
-#define UNPACK_SEQUENCE_LIST 161
-#define UNPACK_SEQUENCE_TUPLE 166
-#define UNPACK_SEQUENCE_TWO_TUPLE 167
-#define SEND_GEN 168
+#define LOAD_GLOBAL_BUILTIN 88
+#define LOAD_GLOBAL_MODULE 111
+#define STORE_ATTR_INSTANCE_VALUE 112
+#define STORE_ATTR_SLOT 113
+#define STORE_ATTR_WITH_HINT 148
+#define STORE_SUBSCR_DICT 153
+#define STORE_SUBSCR_LIST_INT 154
+#define UNPACK_SEQUENCE_LIST 158
+#define UNPACK_SEQUENCE_TUPLE 159
+#define UNPACK_SEQUENCE_TWO_TUPLE 160
+#define SEND_GEN 161
#define HAS_ARG(op) ((((op) >= HAVE_ARGUMENT) && (!IS_PSEUDO_OPCODE(op)))\
|| ((op) == JUMP) \
diff --git a/Lib/dis.py b/Lib/dis.py
index 3a8e6ac3bf5ac..043f5e6707049 100644
--- a/Lib/dis.py
+++ b/Lib/dis.py
@@ -46,6 +46,9 @@
LOAD_SUPER_ATTR = opmap['LOAD_SUPER_ATTR']
CALL_INTRINSIC_1 = opmap['CALL_INTRINSIC_1']
CALL_INTRINSIC_2 = opmap['CALL_INTRINSIC_2']
+LOAD_FAST_LOAD_FAST = opmap['LOAD_FAST_LOAD_FAST']
+STORE_FAST_LOAD_FAST = opmap['STORE_FAST_LOAD_FAST']
+STORE_FAST_STORE_FAST = opmap['STORE_FAST_STORE_FAST']
CACHE = opmap["CACHE"]
@@ -493,6 +496,13 @@ def _get_instructions_bytes(code, varname_from_oparg=None,
argval = offset + 2 + signed_arg*2
argval += 2 * caches
argrepr = "to " + repr(argval)
+ elif deop in (LOAD_FAST_LOAD_FAST, STORE_FAST_LOAD_FAST, STORE_FAST_STORE_FAST):
+ arg1 = arg >> 4
+ arg2 = arg & 15
+ val1, argrepr1 = _get_name_info(arg1, varname_from_oparg)
+ val2, argrepr2 = _get_name_info(arg2, varname_from_oparg)
+ argrepr = argrepr1 + ", " + argrepr2
+ argval = val1, val2
elif deop in haslocal or deop in hasfree:
argval, argrepr = _get_name_info(arg, varname_from_oparg)
elif deop in hascompare:
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index cca0f82be4952..b627c04814c3b 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@ -446,6 +446,7 @@ def _write_atomic(path, data, mode=0o666):
# Python 3.12b1 3530 (Shrink the LOAD_SUPER_ATTR caches)
# Python 3.12b1 3531 (Add PEP 695 changes)
# Python 3.13a1 3550 (Plugin optimizer support)
+# Python 3.13a1 3551 (Compact superinstructions)
# Python 3.14 will start with 3600
@@ -462,7 +463,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 = (3550).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3551).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 b33302949f249..27d55b0a905db 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -222,6 +222,9 @@ def pseudo_op(name, op, real_ops):
def_op('DICT_MERGE', 164)
def_op('DICT_UPDATE', 165)
+def_op('LOAD_FAST_LOAD_FAST', 168)
+def_op('STORE_FAST_LOAD_FAST', 169)
+def_op('STORE_FAST_STORE_FAST', 170)
def_op('CALL', 171)
def_op('KW_NAMES', 172)
hasconst.append(172)
@@ -411,7 +414,6 @@ def pseudo_op(name, op, real_ops):
],
"LOAD_FAST": [
"LOAD_FAST__LOAD_CONST",
- "LOAD_FAST__LOAD_FAST",
],
"LOAD_GLOBAL": [
"LOAD_GLOBAL_BUILTIN",
@@ -422,10 +424,6 @@ def pseudo_op(name, op, real_ops):
"STORE_ATTR_SLOT",
"STORE_ATTR_WITH_HINT",
],
- "STORE_FAST": [
- "STORE_FAST__LOAD_FAST",
- "STORE_FAST__STORE_FAST",
- ],
"STORE_SUBSCR": [
"STORE_SUBSCR_DICT",
"STORE_SUBSCR_LIST_INT",
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index affba12985548..28da3fd8cf5e2 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -760,15 +760,12 @@ def load_test(x, y=0):
dis_load_test_quickened_code = """\
%3d 0 RESUME 0
-%3d 2 LOAD_FAST__LOAD_FAST 0 (x)
- 4 LOAD_FAST 1 (y)
- 6 STORE_FAST__STORE_FAST 3 (b)
- 8 STORE_FAST__LOAD_FAST 2 (a)
-
-%3d 10 LOAD_FAST__LOAD_FAST 2 (a)
- 12 LOAD_FAST 3 (b)
- 14 BUILD_TUPLE 2
- 16 RETURN_VALUE
+%3d 2 LOAD_FAST_LOAD_FAST 1 (x, y)
+ 4 STORE_FAST_STORE_FAST 50 (b, a)
+
+%3d 6 LOAD_FAST_LOAD_FAST 35 (a, b)
+ 8 BUILD_TUPLE 2
+ 10 RETURN_VALUE
""" % (load_test.__code__.co_firstlineno,
load_test.__code__.co_firstlineno + 1,
load_test.__code__.co_firstlineno + 2)
@@ -811,9 +808,8 @@ def extended_arg_quick():
%3d 2 LOAD_CONST 1 (Ellipsis)
4 EXTENDED_ARG 1
6 UNPACK_EX 256
- 8 STORE_FAST 0 (_)
- 10 STORE_FAST 0 (_)
- 12 RETURN_CONST 0 (None)
+ 8 STORE_FAST_STORE_FAST 0 (_, _)
+ 10 RETURN_CONST 0 (None)
"""% (extended_arg_quick.__code__.co_firstlineno,
extended_arg_quick.__code__.co_firstlineno + 1,)
@@ -1026,26 +1022,28 @@ def expected(count, w):
s = ['''\
1 %*d RESUME 0
-''' % (w, 0)]
+ 2 %*d LOAD_FAST 0 (x)
+ %*d LOAD_CONST 1 (1)
+ %*d BINARY_OP 0 (+)
+''' % (w, 0, w, 2, w, 4, w, 6)]
s += ['''\
- %*d LOAD_FAST 0 (x)
+ %*d STORE_FAST_LOAD_FAST 0 (x, x)
%*d LOAD_CONST 1 (1)
%*d BINARY_OP 0 (+)
- %*d STORE_FAST 0 (x)
-''' % (w, 10*i + 2, w, 10*i + 4, w, 10*i + 6, w, 10*i + 10)
- for i in range(count)]
+''' % (w, 8*i + 10, w, 8*i + 12, w, 8*i + 14)
+ for i in range(count-1)]
s += ['''\
+ %*d STORE_FAST 0 (x)
3 %*d LOAD_FAST 0 (x)
%*d RETURN_VALUE
-''' % (w, 10*count + 2, w, 10*count + 4)]
- s[1] = ' 2' + s[1][3:]
+''' % (w, 8*count + 2, w, 8*count + 4, w, 8*count + 6)]
return ''.join(s)
for i in range(1, 5):
self.do_disassembly_test(func(i), expected(i, 4), True)
- self.do_disassembly_test(func(999), expected(999, 4), True)
- self.do_disassembly_test(func(1000), expected(1000, 5), True)
+ self.do_disassembly_test(func(1200), expected(1200, 4), True)
+ self.do_disassembly_test(func(1300), expected(1300, 5), True)
def test_disassemble_str(self):
self.do_disassembly_test(expr_str, dis_expr_str)
@@ -1646,11 +1644,10 @@ def _prepare_test_cases():
Instruction(opname='LOAD_DEREF', opcode=137, arg=3, argval='b', argrepr='b', offset=16, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='LOAD_DEREF', opcode=137, arg=4, argval='c', argrepr='c', offset=18, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='LOAD_DEREF', opcode=137, arg=5, argval='d', argrepr='d', offset=20, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='e', argrepr='e', offset=22, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=1, argval='f', argrepr='f', offset=24, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=6, argval=6, argrepr='', offset=26, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=34, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RETURN_CONST', opcode=121, arg=0, argval=None, argrepr='None', offset=36, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST_LOAD_FAST', opcode=168, arg=1, argval=('e', 'f'), argrepr='e, f', offset=22, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL', opcode=171, arg=6, argval=6, argrepr='', offset=24, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=32, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RETURN_CONST', opcode=121, arg=0, argval=None, argrepr='None', offset=34, starts_line=None, is_jump_target=False, positions=None),
]
diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py
index ef4a79aefd646..f854c58284666 100644
--- a/Lib/test/test_monitoring.py
+++ b/Lib/test/test_monitoring.py
@@ -1158,8 +1158,8 @@ def func():
('line', 'func', 5),
('line', 'meth', 1),
('jump', 'func', 5, 5),
- ('jump', 'func', 5, '[offset=114]'),
- ('branch', 'func', '[offset=120]', '[offset=122]'),
+ ('jump', 'func', 5, '[offset=112]'),
+ ('branch', 'func', '[offset=118]', '[offset=120]'),
('line', 'check_events', 11)])
self.check_events(func, recorders = FLOW_AND_LINE_RECORDERS, expected = [
@@ -1174,8 +1174,8 @@ def func():
('line', 'meth', 1),
('return', None),
('jump', 'func', 5, 5),
- ('jump', 'func', 5, '[offset=114]'),
- ('branch', 'func', '[offset=120]', '[offset=122]'),
+ ('jump', 'func', 5, '[offset=112]'),
+ ('branch', 'func', '[offset=118]', '[offset=120]'),
('return', None),
('line', 'check_events', 11)])
diff --git a/Lib/test/test_peepholer.py b/Lib/test/test_peepholer.py
index 255e928042142..c57016bb108f0 100644
--- a/Lib/test/test_peepholer.py
+++ b/Lib/test/test_peepholer.py
@@ -686,7 +686,7 @@ def test_load_fast_known_simple(self):
def f():
x = 1
y = x + x
- self.assertInBytecode(f, 'LOAD_FAST')
+ self.assertInBytecode(f, 'LOAD_FAST_LOAD_FAST')
def test_load_fast_unknown_simple(self):
def f():
@@ -790,7 +790,10 @@ def f():
print(a00, a01, a62, a63)
print(a64, a65, a78, a79)
- for i in 0, 1, 62, 63:
+ self.assertInBytecode(f, 'LOAD_FAST_LOAD_FAST', ("a00", "a01"))
+ self.assertNotInBytecode(f, 'LOAD_FAST_CHECK', "a00")
+ self.assertNotInBytecode(f, 'LOAD_FAST_CHECK', "a01")
+ for i in 62, 63:
# First 64 locals: analyze completely
self.assertInBytecode(f, 'LOAD_FAST', f"a{i:02}")
self.assertNotInBytecode(f, 'LOAD_FAST_CHECK', f"a{i:02}")
@@ -1071,7 +1074,16 @@ def test_no_unsafe_static_swap(self):
('POP_TOP', 0, 4),
('RETURN_VALUE', 5)
]
- self.cfg_optimization_test(insts, insts, consts=list(range(3)), nlocals=1)
+ expected_insts = [
+ ('LOAD_CONST', 0, 1),
+ ('LOAD_CONST', 1, 2),
+ ('LOAD_CONST', 2, 3),
+ ('SWAP', 3, 4),
+ ('STORE_FAST_STORE_FAST', 17, 4),
+ ('POP_TOP', 0, 4),
+ ('RETURN_VALUE', 5)
+ ]
+ self.cfg_optimization_test(insts, expected_insts, consts=list(range(3)), nlocals=1)
if __name__ == "__main__":
unittest.main()
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-06-02-01-27-35.gh-issue-105229.U05x4G.rst b/Misc/NEWS.d/next/Core and Builtins/2023-06-02-01-27-35.gh-issue-105229.U05x4G.rst
new file mode 100644
index 0000000000000..df0c54691afb1
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2023-06-02-01-27-35.gh-issue-105229.U05x4G.rst
@@ -0,0 +1 @@
+Replace some dynamic superinstructions with single instruction equivalents.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index 9fcf69b34153f..bd40369997c69 100644
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -201,6 +201,15 @@ dummy_func(
GETLOCAL(oparg) = NULL;
}
+ inst(LOAD_FAST_LOAD_FAST, ( -- value1, value2)) {
+ uint32_t oparg1 = oparg >> 4;
+ uint32_t oparg2 = oparg & 15;
+ value1 = GETLOCAL(oparg1);
+ value2 = GETLOCAL(oparg2);
+ Py_INCREF(value1);
+ Py_INCREF(value2);
+ }
+
inst(LOAD_CONST, (-- value)) {
value = GETITEM(frame->f_code->co_consts, oparg);
Py_INCREF(value);
@@ -210,10 +219,22 @@ dummy_func(
SETLOCAL(oparg, value);
}
- super(LOAD_FAST__LOAD_FAST) = LOAD_FAST + LOAD_FAST;
+ inst(STORE_FAST_LOAD_FAST, (value1 -- value2)) {
+ uint32_t oparg1 = oparg >> 4;
+ uint32_t oparg2 = oparg & 15;
+ SETLOCAL(oparg1, value1);
+ value2 = GETLOCAL(oparg2);
+ Py_INCREF(value2);
+ }
+
+ inst(STORE_FAST_STORE_FAST, (value2, value1 --)) {
+ uint32_t oparg1 = oparg >> 4;
+ uint32_t oparg2 = oparg & 15;
+ SETLOCAL(oparg1, value1);
+ SETLOCAL(oparg2, value2);
+ }
+
super(LOAD_FAST__LOAD_CONST) = LOAD_FAST + LOAD_CONST;
- super(STORE_FAST__LOAD_FAST) = STORE_FAST + LOAD_FAST;
- super(STORE_FAST__STORE_FAST) = STORE_FAST + STORE_FAST;
super(LOAD_CONST__LOAD_FAST) = LOAD_CONST + LOAD_FAST;
inst(POP_TOP, (value --)) {
@@ -386,8 +407,7 @@ dummy_func(
// At the end we just skip over the STORE_FAST.
op(_BINARY_OP_INPLACE_ADD_UNICODE, (left, right --)) {
_Py_CODEUNIT true_next = next_instr[INLINE_CACHE_ENTRIES_BINARY_OP];
- assert(true_next.op.code == STORE_FAST ||
- true_next.op.code == STORE_FAST__LOAD_FAST);
+ assert(true_next.op.code == STORE_FAST);
PyObject **target_local = &GETLOCAL(true_next.op.arg);
DEOPT_IF(*target_local != left, BINARY_OP);
STAT_INC(BINARY_OP, hit);
@@ -3484,5 +3504,3 @@ dummy_func(
}
// Future families go below this point //
-
-family(store_fast) = { STORE_FAST, STORE_FAST__LOAD_FAST, STORE_FAST__STORE_FAST };
diff --git a/Python/flowgraph.c b/Python/flowgraph.c
index f8039a4985d94..2fd9a85b6d957 100644
--- a/Python/flowgraph.c
+++ b/Python/flowgraph.c
@@ -1586,6 +1586,56 @@ optimize_cfg(cfg_builder *g, PyObject *consts, PyObject *const_cache)
return SUCCESS;
}
+static void
+make_super_instruction(cfg_instr *inst1, cfg_instr *inst2, int super_op)
+{
+ int32_t line1 = inst1->i_loc.lineno;
+ int32_t line2 = inst2->i_loc.lineno;
+ /* Skip if instructions are on different lines */
+ if (line1 >= 0 && line2 >= 0 && line1 != line2) {
+ return;
+ }
+ if (inst1->i_oparg >= 16 || inst2->i_oparg >= 16) {
+ return;
+ }
+ INSTR_SET_OP1(inst1, super_op, (inst1->i_oparg << 4) | inst2->i_oparg);
+ INSTR_SET_OP0(inst2, NOP);
+}
+
+static void
+insert_superinstructions(cfg_builder *g)
+{
+ for (basicblock *b = g->g_entryblock; b != NULL; b = b->b_next) {
+
+ for (int i = 0; i < b->b_iused; i++) {
+ cfg_instr *inst = &b->b_instr[i];
+ int nextop = i+1 < b->b_iused ? b->b_instr[i+1].i_opcode : 0;
+ switch(inst->i_opcode) {
+ case LOAD_FAST:
+ if (nextop == LOAD_FAST) {
+ make_super_instruction(inst, &b->b_instr[i + 1], LOAD_FAST_LOAD_FAST);
+ }
+ break;
+ case STORE_FAST:
+ switch (nextop) {
+ case LOAD_FAST:
+ make_super_instruction(inst, &b->b_instr[i + 1], STORE_FAST_LOAD_FAST);
+ break;
+ case STORE_FAST:
+ make_super_instruction(inst, &b->b_instr[i + 1], STORE_FAST_STORE_FAST);
+ break;
+ }
+ break;
+ }
+ }
+ }
+ for (basicblock *b = g->g_entryblock; b != NULL; b = b->b_next) {
+ remove_redundant_nops(b);
+ }
+ eliminate_empty_basic_blocks(g);
+ assert(no_redundant_nops(g));
+}
+
// helper functions for add_checks_for_loads_of_unknown_variables
static inline void
maybe_push(basicblock *b, uint64_t unsafe_mask, basicblock ***sp)
@@ -2181,6 +2231,7 @@ _PyCfg_OptimizeCodeUnit(cfg_builder *g, PyObject *consts, PyObject *const_cache,
RETURN_IF_ERROR(
add_checks_for_loads_of_uninitialized_variables(
g->g_entryblock, nlocals, nparams));
+ insert_superinstructions(g);
RETURN_IF_ERROR(push_cold_blocks_to_end(g, code_flags));
RETURN_IF_ERROR(resolve_line_numbers(g, firstlineno));
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index a47d5ba88a1ab..31559ec0c12c2 100644
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -104,13 +104,30 @@
DISPATCH();
}
+ TARGET(LOAD_FAST_LOAD_FAST) {
+ PyObject *value1;
+ PyObject *value2;
+ #line 205 "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"
+ STACK_GROW(2);
+ stack_pointer[-1] = value2;
+ stack_pointer[-2] = value1;
+ DISPATCH();
+ }
+
TARGET(LOAD_CONST) {
PREDICTED(LOAD_CONST);
PyObject *value;
- #line 205 "Python/bytecodes.c"
+ #line 214 "Python/bytecodes.c"
value = GETITEM(frame->f_code->co_consts, oparg);
Py_INCREF(value);
- #line 114 "Python/generated_cases.c.h"
+ #line 131 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -118,38 +135,37 @@
TARGET(STORE_FAST) {
PyObject *value = stack_pointer[-1];
- #line 210 "Python/bytecodes.c"
+ #line 219 "Python/bytecodes.c"
SETLOCAL(oparg, value);
- #line 124 "Python/generated_cases.c.h"
+ #line 141 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
- TARGET(LOAD_FAST__LOAD_FAST) {
- PyObject *_tmp_1;
- PyObject *_tmp_2;
- {
- PyObject *value;
- #line 193 "Python/bytecodes.c"
- value = GETLOCAL(oparg);
- assert(value != NULL);
- Py_INCREF(value);
- #line 138 "Python/generated_cases.c.h"
- _tmp_2 = value;
- }
- oparg = (next_instr++)->op.arg;
- {
- PyObject *value;
- #line 193 "Python/bytecodes.c"
- value = GETLOCAL(oparg);
- assert(value != NULL);
- Py_INCREF(value);
- #line 148 "Python/generated_cases.c.h"
- _tmp_1 = value;
- }
- STACK_GROW(2);
- stack_pointer[-1] = _tmp_1;
- stack_pointer[-2] = _tmp_2;
+ TARGET(STORE_FAST_LOAD_FAST) {
+ PyObject *value1 = stack_pointer[-1];
+ PyObject *value2;
+ #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 155 "Python/generated_cases.c.h"
+ stack_pointer[-1] = value2;
+ DISPATCH();
+ }
+
+ TARGET(STORE_FAST_STORE_FAST) {
+ PyObject *value1 = stack_pointer[-1];
+ PyObject *value2 = stack_pointer[-2];
+ #line 231 "Python/bytecodes.c"
+ uint32_t oparg1 = oparg >> 4;
+ uint32_t oparg2 = oparg & 15;
+ SETLOCAL(oparg1, value1);
+ SETLOCAL(oparg2, value2);
+ #line 168 "Python/generated_cases.c.h"
+ STACK_SHRINK(2);
DISPATCH();
}
@@ -162,16 +178,16 @@
value = GETLOCAL(oparg);
assert(value != NULL);
Py_INCREF(value);
- #line 166 "Python/generated_cases.c.h"
+ #line 182 "Python/generated_cases.c.h"
_tmp_2 = value;
}
oparg = (next_instr++)->op.arg;
{
PyObject *value;
- #line 205 "Python/bytecodes.c"
+ #line 214 "Python/bytecodes.c"
value = GETITEM(frame->f_code->co_consts, oparg);
Py_INCREF(value);
- #line 175 "Python/generated_cases.c.h"
+ #line 191 "Python/generated_cases.c.h"
_tmp_1 = value;
}
STACK_GROW(2);
@@ -180,57 +196,15 @@
DISPATCH();
}
- TARGET(STORE_FAST__LOAD_FAST) {
- PyObject *_tmp_1 = stack_pointer[-1];
- {
- PyObject *value = _tmp_1;
- #line 210 "Python/bytecodes.c"
- SETLOCAL(oparg, value);
- #line 190 "Python/generated_cases.c.h"
- }
- oparg = (next_instr++)->op.arg;
- {
- PyObject *value;
- #line 193 "Python/bytecodes.c"
- value = GETLOCAL(oparg);
- assert(value != NULL);
- Py_INCREF(value);
- #line 199 "Python/generated_cases.c.h"
- _tmp_1 = value;
- }
- stack_pointer[-1] = _tmp_1;
- DISPATCH();
- }
-
- TARGET(STORE_FAST__STORE_FAST) {
- PyObject *_tmp_1 = stack_pointer[-1];
- PyObject *_tmp_2 = stack_pointer[-2];
- {
- PyObject *value = _tmp_1;
- #line 210 "Python/bytecodes.c"
- SETLOCAL(oparg, value);
- #line 213 "Python/generated_cases.c.h"
- }
- oparg = (next_instr++)->op.arg;
- {
- PyObject *value = _tmp_2;
- #line 210 "Python/bytecodes.c"
- SETLOCAL(oparg, value);
- #line 220 "Python/generated_cases.c.h"
- }
- STACK_SHRINK(2);
- DISPATCH();
- }
-
TARGET(LOAD_CONST__LOAD_FAST) {
PyObject *_tmp_1;
PyObject *_tmp_2;
{
PyObject *value;
- #line 205 "Python/bytecodes.c"
+ #line 214 "Python/bytecodes.c"
value = GETITEM(frame->f_code->co_consts, oparg);
Py_INCREF(value);
- #line 234 "Python/generated_cases.c.h"
+ #line 208 "Python/generated_cases.c.h"
_tmp_2 = value;
}
oparg = (next_instr++)->op.arg;
@@ -240,7 +214,7 @@
value = GETLOCAL(oparg);
assert(value != NULL);
Py_INCREF(value);
- #line 244 "Python/generated_cases.c.h"
+ #line 218 "Python/generated_cases.c.h"
_tmp_1 = value;
}
STACK_GROW(2);
@@ -251,8 +225,8 @@
TARGET(POP_TOP) {
PyObject *value = stack_pointer[-1];
- #line 220 "Python/bytecodes.c"
- #line 256 "Python/generated_cases.c.h"
+ #line 241 "Python/bytecodes.c"
+ #line 230 "Python/generated_cases.c.h"
Py_DECREF(value);
STACK_SHRINK(1);
DISPATCH();
@@ -260,9 +234,9 @@
TARGET(PUSH_NULL) {
PyObject *res;
- #line 224 "Python/bytecodes.c"
+ #line 245 "Python/bytecodes.c"
res = NULL;
- #line 266 "Python/generated_cases.c.h"
+ #line 240 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -273,14 +247,14 @@
PyObject *_tmp_2 = stack_pointer[-2];
{
PyObject *value = _tmp_1;
- #line 220 "Python/bytecodes.c"
- #line 278 "Python/generated_cases.c.h"
+ #line 241 "Python/bytecodes.c"
+ #line 252 "Python/generated_cases.c.h"
Py_DECREF(value);
}
{
PyObject *value = _tmp_2;
- #line 220 "Python/bytecodes.c"
- #line 284 "Python/generated_cases.c.h"
+ #line 241 "Python/bytecodes.c"
+ #line 258 "Python/generated_cases.c.h"
Py_DECREF(value);
}
STACK_SHRINK(2);
@@ -290,7 +264,7 @@
TARGET(INSTRUMENTED_END_FOR) {
PyObject *value = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 230 "Python/bytecodes.c"
+ #line 251 "Python/bytecodes.c"
/* Need to create a fake StopIteration error here,
* to conform to PEP 380 */
if (PyGen_Check(receiver)) {
@@ -300,7 +274,7 @@
}
PyErr_SetRaisedException(NULL);
}
- #line 304 "Python/generated_cases.c.h"
+ #line 278 "Python/generated_cases.c.h"
Py_DECREF(receiver);
Py_DECREF(value);
STACK_SHRINK(2);
@@ -310,9 +284,9 @@
TARGET(END_SEND) {
PyObject *value = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 243 "Python/bytecodes.c"
+ #line 264 "Python/bytecodes.c"
Py_DECREF(receiver);
- #line 316 "Python/generated_cases.c.h"
+ #line 290 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -321,7 +295,7 @@
TARGET(INSTRUMENTED_END_SEND) {
PyObject *value = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 247 "Python/bytecodes.c"
+ #line 268 "Python/bytecodes.c"
if (PyGen_Check(receiver) || PyCoro_CheckExact(receiver)) {
PyErr_SetObject(PyExc_StopIteration, value);
if (monitor_stop_iteration(tstate, frame, next_instr-1)) {
@@ -330,7 +304,7 @@
PyErr_SetRaisedException(NULL);
}
Py_DECREF(receiver);
- #line 334 "Python/generated_cases.c.h"
+ #line 308 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -339,13 +313,13 @@
TARGET(UNARY_NEGATIVE) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 258 "Python/bytecodes.c"
+ #line 279 "Python/bytecodes.c"
res = PyNumber_Negative(value);
- #line 345 "Python/generated_cases.c.h"
+ #line 319 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 260 "Python/bytecodes.c"
+ #line 281 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 349 "Python/generated_cases.c.h"
+ #line 323 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -353,11 +327,11 @@
TARGET(UNARY_NOT) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 264 "Python/bytecodes.c"
+ #line 285 "Python/bytecodes.c"
int err = PyObject_IsTrue(value);
- #line 359 "Python/generated_cases.c.h"
+ #line 333 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 266 "Python/bytecodes.c"
+ #line 287 "Python/bytecodes.c"
if (err < 0) goto pop_1_error;
if (err == 0) {
res = Py_True;
@@ -365,7 +339,7 @@
else {
res = Py_False;
}
- #line 369 "Python/generated_cases.c.h"
+ #line 343 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -373,13 +347,13 @@
TARGET(UNARY_INVERT) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 276 "Python/bytecodes.c"
+ #line 297 "Python/bytecodes.c"
res = PyNumber_Invert(value);
- #line 379 "Python/generated_cases.c.h"
+ #line 353 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 278 "Python/bytecodes.c"
+ #line 299 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 383 "Python/generated_cases.c.h"
+ #line 357 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -390,10 +364,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 294 "Python/bytecodes.c"
+ #line 315 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- #line 397 "Python/generated_cases.c.h"
+ #line 371 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -401,13 +375,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 299 "Python/bytecodes.c"
+ #line 320 "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 411 "Python/generated_cases.c.h"
+ #line 385 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -422,10 +396,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 294 "Python/bytecodes.c"
+ #line 315 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- #line 429 "Python/generated_cases.c.h"
+ #line 403 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -433,13 +407,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 307 "Python/bytecodes.c"
+ #line 328 "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 443 "Python/generated_cases.c.h"
+ #line 417 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -454,10 +428,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 294 "Python/bytecodes.c"
+ #line 315 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
- #line 461 "Python/generated_cases.c.h"
+ #line 435 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -465,13 +439,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 315 "Python/bytecodes.c"
+ #line 336 "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 475 "Python/generated_cases.c.h"
+ #line 449 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -486,10 +460,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 330 "Python/bytecodes.c"
+ #line 351 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- #line 493 "Python/generated_cases.c.h"
+ #line 467 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -497,13 +471,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 335 "Python/bytecodes.c"
+ #line 356 "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 507 "Python/generated_cases.c.h"
+ #line 481 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -518,10 +492,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 330 "Python/bytecodes.c"
+ #line 351 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- #line 525 "Python/generated_cases.c.h"
+ #line 499 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -529,13 +503,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 343 "Python/bytecodes.c"
+ #line 364 "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 539 "Python/generated_cases.c.h"
+ #line 513 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -550,10 +524,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 330 "Python/bytecodes.c"
+ #line 351 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
- #line 557 "Python/generated_cases.c.h"
+ #line 531 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -561,13 +535,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 351 "Python/bytecodes.c"
+ #line 372 "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 571 "Python/generated_cases.c.h"
+ #line 545 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -582,10 +556,10 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 366 "Python/bytecodes.c"
+ #line 387 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
- #line 589 "Python/generated_cases.c.h"
+ #line 563 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
@@ -593,13 +567,13 @@
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
PyObject *res;
- #line 371 "Python/bytecodes.c"
+ #line 392 "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 603 "Python/generated_cases.c.h"
+ #line 577 "Python/generated_cases.c.h"
_tmp_2 = res;
}
next_instr += 1;
@@ -614,20 +588,19 @@
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 366 "Python/bytecodes.c"
+ #line 387 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
- #line 621 "Python/generated_cases.c.h"
+ #line 595 "Python/generated_cases.c.h"
_tmp_2 = left;
_tmp_1 = right;
}
{
PyObject *right = _tmp_1;
PyObject *left = _tmp_2;
- #line 388 "Python/bytecodes.c"
+ #line 409 "Python/bytecodes.c"
_Py_CODEUNIT true_next = next_instr[INLINE_CACHE_ENTRIES_BINARY_OP];
- assert(true_next.op.code == STORE_FAST ||
- true_next.op.code == STORE_FAST__LOAD_FAST);
+ assert(true_next.op.code == STORE_FAST);
PyObject **target_local = &GETLOCAL(true_next.op.arg);
DEOPT_IF(*target_local != left, BINARY_OP);
STAT_INC(BINARY_OP, hit);
@@ -649,7 +622,7 @@
if (*target_local == NULL) goto pop_2_error;
// The STORE_FAST is already done.
JUMPBY(INLINE_CACHE_ENTRIES_BINARY_OP + 1);
- #line 653 "Python/generated_cases.c.h"
+ #line 626 "Python/generated_cases.c.h"
}
STACK_SHRINK(2);
DISPATCH();
@@ -661,7 +634,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
PyObject *res;
- #line 426 "Python/bytecodes.c"
+ #line 446 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinarySubscrCache *cache = (_PyBinarySubscrCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -673,12 +646,12 @@
DECREMENT_ADAPTIVE_COUNTER(cache->counter);
#endif /* ENABLE_SPECIALIZATION */
res = PyObject_GetItem(container, sub);
- #line 677 "Python/generated_cases.c.h"
+ #line 650 "Python/generated_cases.c.h"
Py_DECREF(container);
Py_DECREF(sub);
- #line 438 "Python/bytecodes.c"
+ #line 458 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 682 "Python/generated_cases.c.h"
+ #line 655 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -690,7 +663,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *res;
- #line 442 "Python/bytecodes.c"
+ #line 462 "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.
@@ -703,7 +676,7 @@
}
Py_DECREF(container);
if (res == NULL) goto pop_3_error;
- #line 707 "Python/generated_cases.c.h"
+ #line 680 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = res;
DISPATCH();
@@ -714,7 +687,7 @@
PyObject *start = stack_pointer[-2];
PyObject *container = stack_pointer[-3];
PyObject *v = stack_pointer[-4];
- #line 457 "Python/bytecodes.c"
+ #line 477 "Python/bytecodes.c"
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
int err;
if (slice == NULL) {
@@ -727,7 +700,7 @@
Py_DECREF(v);
Py_DECREF(container);
if (err) goto pop_4_error;
- #line 731 "Python/generated_cases.c.h"
+ #line 704 "Python/generated_cases.c.h"
STACK_SHRINK(4);
DISPATCH();
}
@@ -736,7 +709,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *res;
- #line 472 "Python/bytecodes.c"
+ #line 492 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), BINARY_SUBSCR);
@@ -750,7 +723,7 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(list);
- #line 754 "Python/generated_cases.c.h"
+ #line 727 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -761,7 +734,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *tuple = stack_pointer[-2];
PyObject *res;
- #line 488 "Python/bytecodes.c"
+ #line 508 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), BINARY_SUBSCR);
DEOPT_IF(!PyTuple_CheckExact(tuple), BINARY_SUBSCR);
@@ -775,7 +748,7 @@
Py_INCREF(res);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(tuple);
- #line 779 "Python/generated_cases.c.h"
+ #line 752 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -786,7 +759,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *res;
- #line 504 "Python/bytecodes.c"
+ #line 524 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(dict), BINARY_SUBSCR);
STAT_INC(BINARY_SUBSCR, hit);
res = PyDict_GetItemWithError(dict, sub);
@@ -794,14 +767,14 @@
if (!_PyErr_Occurred(tstate)) {
_PyErr_SetKeyError(sub);
}
- #line 798 "Python/generated_cases.c.h"
+ #line 771 "Python/generated_cases.c.h"
Py_DECREF(dict);
Py_DECREF(sub);
- #line 512 "Python/bytecodes.c"
+ #line 532 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
Py_INCREF(res); // Do this before DECREF'ing dict, sub
- #line 805 "Python/generated_cases.c.h"
+ #line 778 "Python/generated_cases.c.h"
Py_DECREF(dict);
Py_DECREF(sub);
STACK_SHRINK(1);
@@ -813,7 +786,7 @@
TARGET(BINARY_SUBSCR_GETITEM) {
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
- #line 519 "Python/bytecodes.c"
+ #line 539 "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);
@@ -836,15 +809,15 @@
JUMPBY(INLINE_CACHE_ENTRIES_BINARY_SUBSCR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 840 "Python/generated_cases.c.h"
+ #line 813 "Python/generated_cases.c.h"
}
TARGET(LIST_APPEND) {
PyObject *v = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 544 "Python/bytecodes.c"
+ #line 564 "Python/bytecodes.c"
if (_PyList_AppendTakeRef((PyListObject *)list, v) < 0) goto pop_1_error;
- #line 848 "Python/generated_cases.c.h"
+ #line 821 "Python/generated_cases.c.h"
STACK_SHRINK(1);
PREDICT(JUMP_BACKWARD);
DISPATCH();
@@ -853,13 +826,13 @@
TARGET(SET_ADD) {
PyObject *v = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 549 "Python/bytecodes.c"
+ #line 569 "Python/bytecodes.c"
int err = PySet_Add(set, v);
- #line 859 "Python/generated_cases.c.h"
+ #line 832 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 551 "Python/bytecodes.c"
+ #line 571 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 863 "Python/generated_cases.c.h"
+ #line 836 "Python/generated_cases.c.h"
STACK_SHRINK(1);
PREDICT(JUMP_BACKWARD);
DISPATCH();
@@ -872,7 +845,7 @@
PyObject *container = stack_pointer[-2];
PyObject *v = stack_pointer[-3];
uint16_t counter = read_u16(&next_instr[0].cache);
- #line 562 "Python/bytecodes.c"
+ #line 582 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
next_instr--;
@@ -887,13 +860,13 @@
#endif /* ENABLE_SPECIALIZATION */
/* container[sub] = v */
int err = PyObject_SetItem(container, sub, v);
- #line 891 "Python/generated_cases.c.h"
+ #line 864 "Python/generated_cases.c.h"
Py_DECREF(v);
Py_DECREF(container);
Py_DECREF(sub);
- #line 577 "Python/bytecodes.c"
+ #line 597 "Python/bytecodes.c"
if (err) goto pop_3_error;
- #line 897 "Python/generated_cases.c.h"
+ #line 870 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -903,7 +876,7 @@
PyObject *sub = stack_pointer[-1];
PyObject *list = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 581 "Python/bytecodes.c"
+ #line 601 "Python/bytecodes.c"
DEOPT_IF(!PyLong_CheckExact(sub), STORE_SUBSCR);
DEOPT_IF(!PyList_CheckExact(list), STORE_SUBSCR);
@@ -920,7 +893,7 @@
Py_DECREF(old_value);
_Py_DECREF_SPECIALIZED(sub, (destructor)PyObject_Free);
Py_DECREF(list);
- #line 924 "Python/generated_cases.c.h"
+ #line 897 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -930,13 +903,13 @@
PyObject *sub = stack_pointer[-1];
PyObject *dict = stack_pointer[-2];
PyObject *value = stack_pointer[-3];
- #line 600 "Python/bytecodes.c"
+ #line 620 "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 940 "Python/generated_cases.c.h"
+ #line 913 "Python/generated_cases.c.h"
STACK_SHRINK(3);
next_instr += 1;
DISPATCH();
@@ -945,15 +918,15 @@
TARGET(DELETE_SUBSCR) {
PyObject *sub = stack_pointer[-1];
PyObject *container = stack_pointer[-2];
- #line 608 "Python/bytecodes.c"
+ #line 628 "Python/bytecodes.c"
/* del container[sub] */
int err = PyObject_DelItem(container, sub);
- #line 952 "Python/generated_cases.c.h"
+ #line 925 "Python/generated_cases.c.h"
Py_DECREF(container);
Py_DECREF(sub);
- #line 611 "Python/bytecodes.c"
+ #line 631 "Python/bytecodes.c"
if (err) goto pop_2_error;
- #line 957 "Python/generated_cases.c.h"
+ #line 930 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
@@ -961,14 +934,14 @@
TARGET(CALL_INTRINSIC_1) {
PyObject *value = stack_pointer[-1];
PyObject *res;
- #line 615 "Python/bytecodes.c"
+ #line 635 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_1);
res = _PyIntrinsics_UnaryFunctions[oparg](tstate, value);
- #line 968 "Python/generated_cases.c.h"
+ #line 941 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 618 "Python/bytecodes.c"
+ #line 638 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
- #line 972 "Python/generated_cases.c.h"
+ #line 945 "Python/generated_cases.c.h"
stack_pointer[-1] = res;
DISPATCH();
}
@@ -977,15 +950,15 @@
PyObject *value1 = stack_pointer[-1];
PyObject *value2 = stack_pointer[-2];
PyObject *res;
- #line 622 "Python/bytecodes.c"
+ #line 642 "Python/bytecodes.c"
assert(oparg <= MAX_INTRINSIC_2);
res = _PyIntrinsics_BinaryFunctions[oparg](tstate, value2, value1);
- #line 984 "Python/generated_cases.c.h"
+ #line 957 "Python/generated_cases.c.h"
Py_DECREF(value2);
Py_DECREF(value1);
- #line 625 "Python/bytecodes.c"
+ #line 645 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 989 "Python/generated_cases.c.h"
+ #line 962 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -993,7 +966,7 @@
TARGET(RAISE_VARARGS) {
PyObject **args = (stack_pointer - oparg);
- #line 629 "Python/bytecodes.c"
+ #line 649 "Python/bytecodes.c"
PyObject *cause = NULL, *exc = NULL;
switch (oparg) {
case 2:
@@ -1011,12 +984,12 @@
break;
}
if (true) { STACK_SHRINK(oparg); goto error; }
- #line 1015 "Python/generated_cases.c.h"
+ #line 988 "Python/generated_cases.c.h"
}
TARGET(INTERPRETER_EXIT) {
PyObject *retval = stack_pointer[-1];
- #line 649 "Python/bytecodes.c"
+ #line 669 "Python/bytecodes.c"
assert(frame == &entry_frame);
assert(_PyFrame_IsIncomplete(frame));
STACK_SHRINK(1); // Since we're not going to DISPATCH()
@@ -1027,12 +1000,12 @@
assert(!_PyErr_Occurred(tstate));
_Py_LeaveRecursiveCallTstate(tstate);
return retval;
- #line 1031 "Python/generated_cases.c.h"
+ #line 1004 "Python/generated_cases.c.h"
}
TARGET(RETURN_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 662 "Python/bytecodes.c"
+ #line 682 "Python/bytecodes.c"
STACK_SHRINK(1);
assert(EMPTY());
_PyFrame_SetStackPointer(frame, stack_pointer);
@@ -1045,12 +1018,12 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1049 "Python/generated_cases.c.h"
+ #line 1022 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_RETURN_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 677 "Python/bytecodes.c"
+ #line 697 "Python/bytecodes.c"
int err = _Py_call_instrumentation_arg(
tstate, PY_MONITORING_EVENT_PY_RETURN,
frame, next_instr-1, retval);
@@ -1067,11 +1040,11 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1071 "Python/generated_cases.c.h"
+ #line 1044 "Python/generated_cases.c.h"
}
TARGET(RETURN_CONST) {
- #line 696 "Python/bytecodes.c"
+ #line 716 "Python/bytecodes.c"
PyObject *retval = GETITEM(frame->f_code->co_consts, oparg);
Py_INCREF(retval);
assert(EMPTY());
@@ -1085,11 +1058,11 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1089 "Python/generated_cases.c.h"
+ #line 1062 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_RETURN_CONST) {
- #line 712 "Python/bytecodes.c"
+ #line 732 "Python/bytecodes.c"
PyObject *retval = GETITEM(frame->f_code->co_consts, oparg);
int err = _Py_call_instrumentation_arg(
tstate, PY_MONITORING_EVENT_PY_RETURN,
@@ -1107,13 +1080,13 @@
frame->prev_instr += frame->return_offset;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1111 "Python/generated_cases.c.h"
+ #line 1084 "Python/generated_cases.c.h"
}
TARGET(GET_AITER) {
PyObject *obj = stack_pointer[-1];
PyObject *iter;
- #line 732 "Python/bytecodes.c"
+ #line 752 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyTypeObject *type = Py_TYPE(obj);
@@ -1126,16 +1099,16 @@
"'async for' requires an object with "
"__aiter__ method, got %.100s",
type->tp_name);
- #line 1130 "Python/generated_cases.c.h"
+ #line 1103 "Python/generated_cases.c.h"
Py_DECREF(obj);
- #line 745 "Python/bytecodes.c"
+ #line 765 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
iter = (*getter)(obj);
- #line 1137 "Python/generated_cases.c.h"
+ #line 1110 "Python/generated_cases.c.h"
Py_DECREF(obj);
- #line 750 "Python/bytecodes.c"
+ #line 770 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
if (Py_TYPE(iter)->tp_as_async == NULL ||
@@ -1148,7 +1121,7 @@
Py_DECREF(iter);
if (true) goto pop_1_error;
}
- #line 1152 "Python/generated_cases.c.h"
+ #line 1125 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -1156,7 +1129,7 @@
TARGET(GET_ANEXT) {
PyObject *aiter = stack_pointer[-1];
PyObject *awaitable;
- #line 765 "Python/bytecodes.c"
+ #line 785 "Python/bytecodes.c"
unaryfunc getter = NULL;
PyObject *next_iter = NULL;
PyTypeObject *type = Py_TYPE(aiter);
@@ -1200,7 +1173,7 @@
}
}
- #line 1204 "Python/generated_cases.c.h"
+ #line 1177 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = awaitable;
PREDICT(LOAD_CONST);
@@ -1211,16 +1184,16 @@
PREDICTED(GET_AWAITABLE);
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 812 "Python/bytecodes.c"
+ #line 832 "Python/bytecodes.c"
iter = _PyCoro_GetAwaitableIter(iterable);
if (iter == NULL) {
format_awaitable_error(tstate, Py_TYPE(iterable), oparg);
}
- #line 1222 "Python/generated_cases.c.h"
+ #line 1195 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 819 "Python/bytecodes.c"
+ #line 839 "Python/bytecodes.c"
if (iter != NULL && PyCoro_CheckExact(iter)) {
PyObject *yf = _PyGen_yf((PyGenObject*)iter);
@@ -1238,7 +1211,7 @@
if (iter == NULL) goto pop_1_error;
- #line 1242 "Python/generated_cases.c.h"
+ #line 1215 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
PREDICT(LOAD_CONST);
DISPATCH();
@@ -1250,7 +1223,7 @@
PyObject *v = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
PyObject *retval;
- #line 845 "Python/bytecodes.c"
+ #line 865 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PySendCache *cache = (_PySendCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1297,7 +1270,7 @@
}
}
Py_DECREF(v);
- #line 1301 "Python/generated_cases.c.h"
+ #line 1274 "Python/generated_cases.c.h"
stack_pointer[-1] = retval;
next_instr += 1;
DISPATCH();
@@ -1306,7 +1279,7 @@
TARGET(SEND_GEN) {
PyObject *v = stack_pointer[-1];
PyObject *receiver = stack_pointer[-2];
- #line 894 "Python/bytecodes.c"
+ #line 914 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, SEND);
PyGenObject *gen = (PyGenObject *)receiver;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type &&
@@ -1322,12 +1295,12 @@
tstate->exc_info = &gen->gi_exc_state;
JUMPBY(INLINE_CACHE_ENTRIES_SEND);
DISPATCH_INLINED(gen_frame);
- #line 1326 "Python/generated_cases.c.h"
+ #line 1299 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_YIELD_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 912 "Python/bytecodes.c"
+ #line 932 "Python/bytecodes.c"
assert(frame != &entry_frame);
PyGenObject *gen = _PyFrame_GetGenerator(frame);
gen->gi_frame_state = FRAME_SUSPENDED;
@@ -1344,12 +1317,12 @@
gen_frame->previous = NULL;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1348 "Python/generated_cases.c.h"
+ #line 1321 "Python/generated_cases.c.h"
}
TARGET(YIELD_VALUE) {
PyObject *retval = stack_pointer[-1];
- #line 931 "Python/bytecodes.c"
+ #line 951 "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.
@@ -1365,15 +1338,15 @@
gen_frame->previous = NULL;
_PyFrame_StackPush(frame, retval);
goto resume_frame;
- #line 1369 "Python/generated_cases.c.h"
+ #line 1342 "Python/generated_cases.c.h"
}
TARGET(POP_EXCEPT) {
PyObject *exc_value = stack_pointer[-1];
- #line 949 "Python/bytecodes.c"
+ #line 969 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
Py_XSETREF(exc_info->exc_value, exc_value);
- #line 1377 "Python/generated_cases.c.h"
+ #line 1350 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -1381,7 +1354,7 @@
TARGET(RERAISE) {
PyObject *exc = stack_pointer[-1];
PyObject **values = (stack_pointer - (1 + oparg));
- #line 954 "Python/bytecodes.c"
+ #line 974 "Python/bytecodes.c"
assert(oparg >= 0 && oparg <= 2);
if (oparg) {
PyObject *lasti = values[0];
@@ -1399,26 +1372,26 @@
Py_INCREF(exc);
_PyErr_SetRaisedException(tstate, exc);
goto exception_unwind;
- #line 1403 "Python/generated_cases.c.h"
+ #line 1376 "Python/generated_cases.c.h"
}
TARGET(END_ASYNC_FOR) {
PyObject *exc = stack_pointer[-1];
PyObject *awaitable = stack_pointer[-2];
- #line 974 "Python/bytecodes.c"
+ #line 994 "Python/bytecodes.c"
assert(exc && PyExceptionInstance_Check(exc));
if (PyErr_GivenExceptionMatches(exc, PyExc_StopAsyncIteration)) {
- #line 1412 "Python/generated_cases.c.h"
+ #line 1385 "Python/generated_cases.c.h"
Py_DECREF(awaitable);
Py_DECREF(exc);
- #line 977 "Python/bytecodes.c"
+ #line 997 "Python/bytecodes.c"
}
else {
Py_INCREF(exc);
_PyErr_SetRaisedException(tstate, exc);
goto exception_unwind;
}
- #line 1422 "Python/generated_cases.c.h"
+ #line 1395 "Python/generated_cases.c.h"
STACK_SHRINK(2);
DISPATCH();
}
@@ -1429,23 +1402,23 @@
PyObject *sub_iter = stack_pointer[-3];
PyObject *none;
PyObject *value;
- #line 986 "Python/bytecodes.c"
+ #line 1006 "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 1438 "Python/generated_cases.c.h"
+ #line 1411 "Python/generated_cases.c.h"
Py_DECREF(sub_iter);
Py_DECREF(last_sent_val);
Py_DECREF(exc_value);
- #line 991 "Python/bytecodes.c"
+ #line 1011 "Python/bytecodes.c"
none = Py_None;
}
else {
_PyErr_SetRaisedException(tstate, Py_NewRef(exc_value));
goto exception_unwind;
}
- #line 1449 "Python/generated_cases.c.h"
+ #line 1422 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = value;
stack_pointer[-2] = none;
@@ -1454,9 +1427,9 @@
TARGET(LOAD_ASSERTION_ERROR) {
PyObject *value;
- #line 1000 "Python/bytecodes.c"
+ #line 1020 "Python/bytecodes.c"
value = Py_NewRef(PyExc_AssertionError);
- #line 1460 "Python/generated_cases.c.h"
+ #line 1433 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -1464,7 +1437,7 @@
TARGET(LOAD_BUILD_CLASS) {
PyObject *bc;
- #line 1004 "Python/bytecodes.c"
+ #line 1024 "Python/bytecodes.c"
if (PyDict_CheckExact(BUILTINS())) {
bc = _PyDict_GetItemWithError(BUILTINS(),
&_Py_ID(__build_class__));
@@ -1486,7 +1459,7 @@
if (true) goto error;
}
}
- #line 1490 "Python/generated_cases.c.h"
+ #line 1463 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = bc;
DISPATCH();
@@ -1494,33 +1467,33 @@
TARGET(STORE_NAME) {
PyObject *v = stack_pointer[-1];
- #line 1029 "Python/bytecodes.c"
+ #line 1049 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
PyObject *ns = LOCALS();
int err;
if (ns == NULL) {
_PyErr_Format(tstate, PyExc_SystemError,
"no locals found when storing %R", name);
- #line 1505 "Python/generated_cases.c.h"
+ #line 1478 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1036 "Python/bytecodes.c"
+ #line 1056 "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 1514 "Python/generated_cases.c.h"
+ #line 1487 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1043 "Python/bytecodes.c"
+ #line 1063 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1518 "Python/generated_cases.c.h"
+ #line 1491 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(DELETE_NAME) {
- #line 1047 "Python/bytecodes.c"
+ #line 1067 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
PyObject *ns = LOCALS();
int err;
@@ -1537,7 +1510,7 @@
name);
goto error;
}
- #line 1541 "Python/generated_cases.c.h"
+ #line 1514 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1545,7 +1518,7 @@
PREDICTED(UNPACK_SEQUENCE);
static_assert(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE == 1, "incorrect cache size");
PyObject *seq = stack_pointer[-1];
- #line 1073 "Python/bytecodes.c"
+ #line 1093 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyUnpackSequenceCache *cache = (_PyUnpackSequenceCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1558,11 +1531,11 @@
#endif /* ENABLE_SPECIALIZATION */
PyObject **top = stack_pointer + oparg - 1;
int res = unpack_iterable(tstate, seq, oparg, -1, top);
- #line 1562 "Python/generated_cases.c.h"
+ #line 1535 "Python/generated_cases.c.h"
Py_DECREF(seq);
- #line 1086 "Python/bytecodes.c"
+ #line 1106 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
- #line 1566 "Python/generated_cases.c.h"
+ #line 1539 "Python/generated_cases.c.h"
STACK_SHRINK(1);
STACK_GROW(oparg);
next_instr += 1;
@@ -1572,14 +1545,14 @@
TARGET(UNPACK_SEQUENCE_TWO_TUPLE) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1090 "Python/bytecodes.c"
+ #line 1110 "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 1583 "Python/generated_cases.c.h"
+ #line 1556 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1590,7 +1563,7 @@
TARGET(UNPACK_SEQUENCE_TUPLE) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1100 "Python/bytecodes.c"
+ #line 1120 "Python/bytecodes.c"
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -1598,7 +1571,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 1602 "Python/generated_cases.c.h"
+ #line 1575 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1609,7 +1582,7 @@
TARGET(UNPACK_SEQUENCE_LIST) {
PyObject *seq = stack_pointer[-1];
PyObject **values = stack_pointer - (1);
- #line 1111 "Python/bytecodes.c"
+ #line 1131 "Python/bytecodes.c"
DEOPT_IF(!PyList_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyList_GET_SIZE(seq) != oparg, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit);
@@ -1617,7 +1590,7 @@
for (int i = oparg; --i >= 0; ) {
*values++ = Py_NewRef(items[i]);
}
- #line 1621 "Python/generated_cases.c.h"
+ #line 1594 "Python/generated_cases.c.h"
Py_DECREF(seq);
STACK_SHRINK(1);
STACK_GROW(oparg);
@@ -1627,15 +1600,15 @@
TARGET(UNPACK_EX) {
PyObject *seq = stack_pointer[-1];
- #line 1122 "Python/bytecodes.c"
+ #line 1142 "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 1635 "Python/generated_cases.c.h"
+ #line 1608 "Python/generated_cases.c.h"
Py_DECREF(seq);
- #line 1126 "Python/bytecodes.c"
+ #line 1146 "Python/bytecodes.c"
if (res == 0) goto pop_1_error;
- #line 1639 "Python/generated_cases.c.h"
+ #line 1612 "Python/generated_cases.c.h"
STACK_GROW((oparg & 0xFF) + (oparg >> 8));
DISPATCH();
}
@@ -1646,7 +1619,7 @@
PyObject *owner = stack_pointer[-1];
PyObject *v = stack_pointer[-2];
uint16_t counter = read_u16(&next_instr[0].cache);
- #line 1137 "Python/bytecodes.c"
+ #line 1157 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
if (ADAPTIVE_COUNTER_IS_ZERO(counter)) {
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
@@ -1662,12 +1635,12 @@
#endif /* ENABLE_SPECIALIZATION */
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err = PyObject_SetAttr(owner, name, v);
- #line 1666 "Python/generated_cases.c.h"
+ #line 1639 "Python/generated_cases.c.h"
Py_DECREF(v);
Py_DECREF(owner);
- #line 1153 "Python/bytecodes.c"
+ #line 1173 "Python/bytecodes.c"
if (err) goto pop_2_error;
- #line 1671 "Python/generated_cases.c.h"
+ #line 1644 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -1675,34 +1648,34 @@
TARGET(DELETE_ATTR) {
PyObject *owner = stack_pointer[-1];
- #line 1157 "Python/bytecodes.c"
+ #line 1177 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err = PyObject_SetAttr(owner, name, (PyObject *)NULL);
- #line 1682 "Python/generated_cases.c.h"
+ #line 1655 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1160 "Python/bytecodes.c"
+ #line 1180 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1686 "Python/generated_cases.c.h"
+ #line 1659 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(STORE_GLOBAL) {
PyObject *v = stack_pointer[-1];
- #line 1164 "Python/bytecodes.c"
+ #line 1184 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err = PyDict_SetItem(GLOBALS(), name, v);
- #line 1696 "Python/generated_cases.c.h"
+ #line 1669 "Python/generated_cases.c.h"
Py_DECREF(v);
- #line 1167 "Python/bytecodes.c"
+ #line 1187 "Python/bytecodes.c"
if (err) goto pop_1_error;
- #line 1700 "Python/generated_cases.c.h"
+ #line 1673 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(DELETE_GLOBAL) {
- #line 1171 "Python/bytecodes.c"
+ #line 1191 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
int err;
err = PyDict_DelItem(GLOBALS(), name);
@@ -1714,7 +1687,7 @@
}
goto error;
}
- #line 1718 "Python/generated_cases.c.h"
+ #line 1691 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -1722,7 +1695,7 @@
PyObject *_tmp_1;
{
PyObject *locals;
- #line 1185 "Python/bytecodes.c"
+ #line 1205 "Python/bytecodes.c"
locals = LOCALS();
if (locals == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -1730,7 +1703,7 @@
if (true) goto error;
}
Py_INCREF(locals);
- #line 1734 "Python/generated_cases.c.h"
+ #line 1707 "Python/generated_cases.c.h"
_tmp_1 = locals;
}
STACK_GROW(1);
@@ -1742,7 +1715,7 @@
PyObject *_tmp_1;
{
PyObject *locals;
- #line 1185 "Python/bytecodes.c"
+ #line 1205 "Python/bytecodes.c"
locals = LOCALS();
if (locals == NULL) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -1750,13 +1723,13 @@
if (true) goto error;
}
Py_INCREF(locals);
- #line 1754 "Python/generated_cases.c.h"
+ #line 1727 "Python/generated_cases.c.h"
_tmp_1 = locals;
}
{
PyObject *mod_or_class_dict = _tmp_1;
PyObject *v;
- #line 1197 "Python/bytecodes.c"
+ #line 1217 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
if (PyDict_CheckExact(mod_or_class_dict)) {
v = PyDict_GetItemWithError(mod_or_class_dict, name);
@@ -1813,7 +1786,7 @@
}
}
}
- #line 1817 "Python/generated_cases.c.h"
+ #line 1790 "Python/generated_cases.c.h"
_tmp_1 = v;
}
STACK_GROW(1);
@@ -1826,7 +1799,7 @@
{
PyObject *mod_or_class_dict = _tmp_1;
PyObject *v;
- #line 1197 "Python/bytecodes.c"
+ #line 1217 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
if (PyDict_CheckExact(mod_or_class_dict)) {
v = PyDict_GetItemWithError(mod_or_class_dict, name);
@@ -1883,7 +1856,7 @@
}
}
}
- #line 1887 "Python/generated_cases.c.h"
+ #line 1860 "Python/generated_cases.c.h"
_tmp_1 = v;
}
stack_pointer[-1] = _tmp_1;
@@ -1895,7 +1868,7 @@
static_assert(INLINE_CACHE_ENTRIES_LOAD_GLOBAL == 4, "incorrect cache size");
PyObject *null = NULL;
PyObject *v;
- #line 1266 "Python/bytecodes.c"
+ #line 1286 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyLoadGlobalCache *cache = (_PyLoadGlobalCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -1947,7 +1920,7 @@
}
}
null = NULL;
- #line 1951 "Python/generated_cases.c.h"
+ #line 1924 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = v;
@@ -1961,7 +1934,7 @@
PyObject *res;
uint16_t index = read_u16(&next_instr[1].cache);
uint16_t version = read_u16(&next_instr[2].cache);
- #line 1320 "Python/bytecodes.c"
+ #line 1340 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
PyDictObject *dict = (PyDictObject *)GLOBALS();
DEOPT_IF(dict->ma_keys->dk_version != version, LOAD_GLOBAL);
@@ -1972,7 +1945,7 @@
Py_INCREF(res);
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
- #line 1976 "Python/generated_cases.c.h"
+ #line 1949 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -1987,7 +1960,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 1333 "Python/bytecodes.c"
+ #line 1353 "Python/bytecodes.c"
DEOPT_IF(!PyDict_CheckExact(GLOBALS()), LOAD_GLOBAL);
DEOPT_IF(!PyDict_CheckExact(BUILTINS()), LOAD_GLOBAL);
PyDictObject *mdict = (PyDictObject *)GLOBALS();
@@ -2002,7 +1975,7 @@
Py_INCREF(res);
STAT_INC(LOAD_GLOBAL, hit);
null = NULL;
- #line 2006 "Python/generated_cases.c.h"
+ #line 1979 "Python/generated_cases.c.h"
STACK_GROW(1);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2012,16 +1985,16 @@
}
TARGET(DELETE_FAST) {
- #line 1350 "Python/bytecodes.c"
+ #line 1370 "Python/bytecodes.c"
PyObject *v = GETLOCAL(oparg);
if (v == NULL) goto unbound_local_error;
SETLOCAL(oparg, NULL);
- #line 2020 "Python/generated_cases.c.h"
+ #line 1993 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(MAKE_CELL) {
- #line 1356 "Python/bytecodes.c"
+ #line 1376 "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);
@@ -2030,12 +2003,12 @@
goto resume_with_error;
}
SETLOCAL(oparg, cell);
- #line 2034 "Python/generated_cases.c.h"
+ #line 2007 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(DELETE_DEREF) {
- #line 1367 "Python/bytecodes.c"
+ #line 1387 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
// Can't use ERROR_IF here.
@@ -2046,14 +2019,14 @@
}
PyCell_SET(cell, NULL);
Py_DECREF(oldobj);
- #line 2050 "Python/generated_cases.c.h"
+ #line 2023 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(LOAD_FROM_DICT_OR_DEREF) {
PyObject *class_dict = stack_pointer[-1];
PyObject *value;
- #line 1380 "Python/bytecodes.c"
+ #line 1400 "Python/bytecodes.c"
PyObject *name;
assert(class_dict);
assert(oparg >= 0 && oparg < frame->f_code->co_nlocalsplus);
@@ -2088,14 +2061,14 @@
}
Py_INCREF(value);
}
- #line 2092 "Python/generated_cases.c.h"
+ #line 2065 "Python/generated_cases.c.h"
stack_pointer[-1] = value;
DISPATCH();
}
TARGET(LOAD_DEREF) {
PyObject *value;
- #line 1417 "Python/bytecodes.c"
+ #line 1437 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
value = PyCell_GET(cell);
if (value == NULL) {
@@ -2103,7 +2076,7 @@
if (true) goto error;
}
Py_INCREF(value);
- #line 2107 "Python/generated_cases.c.h"
+ #line 2080 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = value;
DISPATCH();
@@ -2111,18 +2084,18 @@
TARGET(STORE_DEREF) {
PyObject *v = stack_pointer[-1];
- #line 1427 "Python/bytecodes.c"
+ #line 1447 "Python/bytecodes.c"
PyObject *cell = GETLOCAL(oparg);
PyObject *oldobj = PyCell_GET(cell);
PyCell_SET(cell, v);
Py_XDECREF(oldobj);
- #line 2120 "Python/generated_cases.c.h"
+ #line 2093 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(COPY_FREE_VARS) {
- #line 1434 "Python/bytecodes.c"
+ #line 1454 "Python/bytecodes.c"
/* Copy closure variables to free variables */
PyCodeObject *co = frame->f_code;
assert(PyFunction_Check(frame->f_funcobj));
@@ -2133,22 +2106,22 @@
PyObject *o = PyTuple_GET_ITEM(closure, i);
frame->localsplus[offset + i] = Py_NewRef(o);
}
- #line 2137 "Python/generated_cases.c.h"
+ #line 2110 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(BUILD_STRING) {
PyObject **pieces = (stack_pointer - oparg);
PyObject *str;
- #line 1447 "Python/bytecodes.c"
+ #line 1467 "Python/bytecodes.c"
str = _PyUnicode_JoinArray(&_Py_STR(empty), pieces, oparg);
- #line 2146 "Python/generated_cases.c.h"
+ #line 2119 "Python/generated_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(pieces[_i]);
}
- #line 1449 "Python/bytecodes.c"
+ #line 1469 "Python/bytecodes.c"
if (str == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2152 "Python/generated_cases.c.h"
+ #line 2125 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = str;
@@ -2158,10 +2131,10 @@
TARGET(BUILD_TUPLE) {
PyObject **values = (stack_pointer - oparg);
PyObject *tup;
- #line 1453 "Python/bytecodes.c"
+ #line 1473 "Python/bytecodes.c"
tup = _PyTuple_FromArraySteal(values, oparg);
if (tup == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2165 "Python/generated_cases.c.h"
+ #line 2138 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = tup;
@@ -2171,10 +2144,10 @@
TARGET(BUILD_LIST) {
PyObject **values = (stack_pointer - oparg);
PyObject *list;
- #line 1458 "Python/bytecodes.c"
+ #line 1478 "Python/bytecodes.c"
list = _PyList_FromArraySteal(values, oparg);
if (list == NULL) { STACK_SHRINK(oparg); goto error; }
- #line 2178 "Python/generated_cases.c.h"
+ #line 2151 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = list;
@@ -2184,7 +2157,7 @@
TARGET(LIST_EXTEND) {
PyObject *iterable = stack_pointer[-1];
PyObject *list = stack_pointer[-(2 + (oparg-1))];
- #line 1463 "Python/bytecodes.c"
+ #line 1483 "Python/bytecodes.c"
PyObject *none_val = _PyList_Extend((PyListObject *)list, iterable);
if (none_val == NULL) {
if (_PyErr_ExceptionMatches(tstate, PyExc_TypeError) &&
@@ -2195,13 +2168,13 @@
"Value after * must be an iterable, not %.200s",
Py_TYPE(iterable)->tp_name);
}
- #line 2199 "Python/generated_cases.c.h"
+ #line 2172 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 1474 "Python/bytecodes.c"
+ #line 1494 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
assert(Py_IsNone(none_val));
- #line 2205 "Python/generated_cases.c.h"
+ #line 2178 "Python/generated_cases.c.h"
Py_DECREF(iterable);
STACK_SHRINK(1);
DISPATCH();
@@ -2210,13 +2183,13 @@
TARGET(SET_UPDATE) {
PyObject *iterable = stack_pointer[-1];
PyObject *set = stack_pointer[-(2 + (oparg-1))];
- #line 1481 "Python/bytecodes.c"
+ #line 1501 "Python/bytecodes.c"
int err = _PySet_Update(set, iterable);
- #line 2216 "Python/generated_cases.c.h"
+ #line 2189 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 1483 "Python/bytecodes.c"
+ #line 1503 "Python/bytecodes.c"
if (err < 0) goto pop_1_error;
- #line 2220 "Python/generated_cases.c.h"
+ #line 2193 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
@@ -2224,7 +2197,7 @@
TARGET(BUILD_SET) {
PyObject **values = (stack_pointer - oparg);
PyObject *set;
- #line 1487 "Python/bytecodes.c"
+ #line 1507 "Python/bytecodes.c"
set = PySet_New(NULL);
if (set == NULL)
goto error;
@@ -2239,7 +2212,7 @@
Py_DECREF(set);
if (true) { STACK_SHRINK(oparg); goto error; }
}
- #line 2243 "Python/generated_cases.c.h"
+ #line 2216 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_GROW(1);
stack_pointer[-1] = set;
@@ -2249,7 +2222,7 @@
TARGET(BUILD_MAP) {
PyObject **values = (stack_pointer - oparg*2);
PyObject *map;
- #line 1504 "Python/bytecodes.c"
+ #line 1524 "Python/bytecodes.c"
map = _PyDict_FromItems(
values, 2,
values+1, 2,
@@ -2257,13 +2230,13 @@
if (map == NULL)
goto error;
- #line 2261 "Python/generated_cases.c.h"
+ #line 2234 "Python/generated_cases.c.h"
for (int _i = oparg*2; --_i >= 0;) {
Py_DECREF(values[_i]);
}
- #line 1512 "Python/bytecodes.c"
+ #line 1532 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg*2); goto error; }
- #line 2267 "Python/generated_cases.c.h"
+ #line 2240 "Python/generated_cases.c.h"
STACK_SHRINK(oparg*2);
STACK_GROW(1);
stack_pointer[-1] = map;
@@ -2271,7 +2244,7 @@
}
TARGET(SETUP_ANNOTATIONS) {
- #line 1516 "Python/bytecodes.c"
+ #line 1536 "Python/bytecodes.c"
int err;
PyObject *ann_dict;
if (LOCALS() == NULL) {
@@ -2311,7 +2284,7 @@
Py_DECREF(ann_dict);
}
}
- #line 2315 "Python/generated_cases.c.h"
+ #line 2288 "Python/generated_cases.c.h"
DISPATCH();
}
@@ -2319,7 +2292,7 @@
PyObject *keys = stack_pointer[-1];
PyObject **values = (stack_pointer - (1 + oparg));
PyObject *map;
- #line 1558 "Python/bytecodes.c"
+ #line 1578 "Python/bytecodes.c"
if (!PyTuple_CheckExact(keys) ||
PyTuple_GET_SIZE(keys) != (Py_ssize_t)oparg) {
_PyErr_SetString(tstate, PyExc_SystemError,
@@ -2329,14 +2302,14 @@
map = _PyDict_FromItems(
&PyTuple_GET_ITEM(keys, 0), 1,
values, 1, oparg);
- #line 2333 "Python/generated_cases.c.h"
+ #line 2306 "Python/generated_cases.c.h"
for (int _i = oparg; --_i >= 0;) {
Py_DECREF(values[_i]);
}
Py_DECREF(keys);
- #line 1568 "Python/bytecodes.c"
+ #line 1588 "Python/bytecodes.c"
if (map == NULL) { STACK_SHRINK(oparg); goto pop_1_error; }
- #line 2340 "Python/generated_cases.c.h"
+ #line 2313 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
stack_pointer[-1] = map;
DISPATCH();
@@ -2344,7 +2317,7 @@
TARGET(DICT_UPDATE) {
PyObject *update = stack_pointer[-1];
- #line 1572 "Python/bytecodes.c"
+ #line 1592 "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)) {
@@ -2352,12 +2325,12 @@
"'%.200s' object is not a mapping",
Py_TYPE(update)->tp_name);
}
- #line 2356 "Python/generated_cases.c.h"
+ #line 2329 "Python/generated_cases.c.h"
Py_DECREF(update);
- #line 1580 "Python/bytecodes.c"
+ #line 1600 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 2361 "Python/generated_cases.c.h"
+ #line 2334 "Python/generated_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
DISPATCH();
@@ -2365,17 +2338,17 @@
TARGET(DICT_MERGE) {
PyObject *update = stack_pointer[-1];
- #line 1586 "Python/bytecodes.c"
+ #line 1606 "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 2374 "Python/generated_cases.c.h"
+ #line 2347 "Python/generated_cases.c.h"
Py_DECREF(update);
- #line 1591 "Python/bytecodes.c"
+ #line 1611 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
- #line 2379 "Python/generated_cases.c.h"
+ #line 2352 "Python/generated_cases.c.h"
Py_DECREF(update);
STACK_SHRINK(1);
PREDICT(CALL_FUNCTION_EX);
@@ -2385,26 +2358,26 @@
TARGET(MAP_ADD) {
PyObject *value = stack_pointer[-1];
PyObject *key = stack_pointer[-2];
- #line 1598 "Python/bytecodes.c"
+ #line 1618 "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 2395 "Python/generated_cases.c.h"
+ #line 2368 "Python/generated_cases.c.h"
STACK_SHRINK(2);
PREDICT(JUMP_BACKWARD);
DISPATCH();
}
TARGET(INSTRUMENTED_LOAD_SUPER_ATTR) {
- #line 1607 "Python/bytecodes.c"
+ #line 1627 "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 2408 "Python/generated_cases.c.h"
+ #line 2381 "Python/generated_cases.c.h"
}
TARGET(LOAD_SUPER_ATTR) {
@@ -2415,7 +2388,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1621 "Python/bytecodes.c"
+ #line 1641 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg >> 2);
int load_method = oparg & 1;
#if ENABLE_SPECIALIZATION
@@ -2457,16 +2430,16 @@
}
}
}
- #line 2461 "Python/generated_cases.c.h"
+ #line 2434 "Python/generated_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1663 "Python/bytecodes.c"
+ #line 1683 "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 2470 "Python/generated_cases.c.h"
+ #line 2443 "Python/generated_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2481,20 +2454,20 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2 = NULL;
PyObject *res;
- #line 1670 "Python/bytecodes.c"
+ #line 1690 "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->f_code->co_names, oparg >> 2);
res = _PySuper_Lookup((PyTypeObject *)class, self, name, NULL);
- #line 2492 "Python/generated_cases.c.h"
+ #line 2465 "Python/generated_cases.c.h"
Py_DECREF(global_super);
Py_DECREF(class);
Py_DECREF(self);
- #line 1677 "Python/bytecodes.c"
+ #line 1697 "Python/bytecodes.c"
if (res == NULL) goto pop_3_error;
- #line 2498 "Python/generated_cases.c.h"
+ #line 2471 "Python/generated_cases.c.h"
STACK_SHRINK(2);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2509,7 +2482,7 @@
PyObject *global_super = stack_pointer[-3];
PyObject *res2;
PyObject *res;
- #line 1681 "Python/bytecodes.c"
+ #line 1701 "Python/bytecodes.c"
assert(oparg & 1);
DEOPT_IF(global_super != (PyObject *)&PySuper_Type, LOAD_SUPER_ATTR);
DEOPT_IF(!PyType_Check(class), LOAD_SUPER_ATTR);
@@ -2532,7 +2505,7 @@
res = res2;
res2 = NULL;
}
- #line 2536 "Python/generated_cases.c.h"
+ #line 2509 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
stack_pointer[-2] = res2;
@@ -2546,7 +2519,7 @@
PyObject *owner = stack_pointer[-1];
PyObject *res2 = NULL;
PyObject *res;
- #line 1720 "Python/bytecodes.c"
+ #line 1740 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyAttrCache *cache = (_PyAttrCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2580,9 +2553,9 @@
NULL | meth | arg1 | ... | argN
*/
- #line 2584 "Python/generated_cases.c.h"
+ #line 2557 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1754 "Python/bytecodes.c"
+ #line 1774 "Python/bytecodes.c"
if (meth == NULL) goto pop_1_error;
res2 = NULL;
res = meth;
@@ -2591,12 +2564,12 @@
else {
/* Classic, pushes one value. */
res = PyObject_GetAttr(owner, name);
- #line 2595 "Python/generated_cases.c.h"
+ #line 2568 "Python/generated_cases.c.h"
Py_DECREF(owner);
- #line 1763 "Python/bytecodes.c"
+ #line 1783 "Python/bytecodes.c"
if (res == NULL) goto pop_1_error;
}
- #line 2600 "Python/generated_cases.c.h"
+ #line 2573 "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; }
@@ -2610,7 +2583,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1768 "Python/bytecodes.c"
+ #line 1788 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2623,7 +2596,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2627 "Python/generated_cases.c.h"
+ #line 2600 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2638,7 +2611,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1784 "Python/bytecodes.c"
+ #line 1804 "Python/bytecodes.c"
DEOPT_IF(!PyModule_CheckExact(owner), LOAD_ATTR);
PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner)->md_dict;
assert(dict != NULL);
@@ -2651,7 +2624,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2655 "Python/generated_cases.c.h"
+ #line 2628 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2666,7 +2639,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1800 "Python/bytecodes.c"
+ #line 1820 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2693,7 +2666,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2697 "Python/generated_cases.c.h"
+ #line 2670 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2708,7 +2681,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
uint16_t index = read_u16(&next_instr[3].cache);
- #line 1830 "Python/bytecodes.c"
+ #line 1850 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, LOAD_ATTR);
@@ -2718,7 +2691,7 @@
STAT_INC(LOAD_ATTR, hit);
Py_INCREF(res);
res2 = NULL;
- #line 2722 "Python/generated_cases.c.h"
+ #line 2695 "Python/generated_cases.c.h"
Py_DECREF(owner);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2733,7 +2706,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 1843 "Python/bytecodes.c"
+ #line 1863 "Python/bytecodes.c"
DEOPT_IF(!PyType_Check(cls), LOAD_ATTR);
DEOPT_IF(((PyTypeObject *)cls)->tp_version_tag != type_version,
@@ -2745,7 +2718,7 @@
res = descr;
assert(res != NULL);
Py_INCREF(res);
- #line 2749 "Python/generated_cases.c.h"
+ #line 2722 "Python/generated_cases.c.h"
Py_DECREF(cls);
STACK_GROW(((oparg & 1) ? 1 : 0));
stack_pointer[-1] = res;
@@ -2759,7 +2732,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 1858 "Python/bytecodes.c"
+ #line 1878 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, LOAD_ATTR);
PyTypeObject *cls = Py_TYPE(owner);
@@ -2783,7 +2756,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2787 "Python/generated_cases.c.h"
+ #line 2760 "Python/generated_cases.c.h"
}
TARGET(LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN) {
@@ -2791,7 +2764,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 1884 "Python/bytecodes.c"
+ #line 1904 "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);
@@ -2817,7 +2790,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_LOAD_ATTR);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 2821 "Python/generated_cases.c.h"
+ #line 2794 "Python/generated_cases.c.h"
}
TARGET(STORE_ATTR_INSTANCE_VALUE) {
@@ -2825,7 +2798,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 1912 "Python/bytecodes.c"
+ #line 1932 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2843,7 +2816,7 @@
Py_DECREF(old_value);
}
Py_DECREF(owner);
- #line 2847 "Python/generated_cases.c.h"
+ #line 2820 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2854,7 +2827,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 1932 "Python/bytecodes.c"
+ #line 1952 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2893,7 +2866,7 @@
/* PEP 509 */
dict->ma_version_tag = new_version;
Py_DECREF(owner);
- #line 2897 "Python/generated_cases.c.h"
+ #line 2870 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2904,7 +2877,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 1973 "Python/bytecodes.c"
+ #line 1993 "Python/bytecodes.c"
PyTypeObject *tp = Py_TYPE(owner);
assert(type_version != 0);
DEOPT_IF(tp->tp_version_tag != type_version, STORE_ATTR);
@@ -2914,7 +2887,7 @@
*(PyObject **)addr = value;
Py_XDECREF(old_value);
Py_DECREF(owner);
- #line 2918 "Python/generated_cases.c.h"
+ #line 2891 "Python/generated_cases.c.h"
STACK_SHRINK(2);
next_instr += 4;
DISPATCH();
@@ -2926,7 +2899,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 1992 "Python/bytecodes.c"
+ #line 2012 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyCompareOpCache *cache = (_PyCompareOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -2939,12 +2912,12 @@
#endif /* ENABLE_SPECIALIZATION */
assert((oparg >> 4) <= Py_GE);
res = PyObject_RichCompare(left, right, oparg>>4);
- #line 2943 "Python/generated_cases.c.h"
+ #line 2916 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2005 "Python/bytecodes.c"
+ #line 2025 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 2948 "Python/generated_cases.c.h"
+ #line 2921 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2955,7 +2928,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2009 "Python/bytecodes.c"
+ #line 2029 "Python/bytecodes.c"
DEOPT_IF(!PyFloat_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyFloat_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -2966,7 +2939,7 @@
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 2970 "Python/generated_cases.c.h"
+ #line 2943 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -2977,7 +2950,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2023 "Python/bytecodes.c"
+ #line 2043 "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);
@@ -2992,7 +2965,7 @@
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
res = (sign_ish & oparg) ? Py_True : Py_False;
- #line 2996 "Python/generated_cases.c.h"
+ #line 2969 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -3003,7 +2976,7 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *res;
- #line 2041 "Python/bytecodes.c"
+ #line 2061 "Python/bytecodes.c"
DEOPT_IF(!PyUnicode_CheckExact(left), COMPARE_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), COMPARE_OP);
STAT_INC(COMPARE_OP, hit);
@@ -3015,7 +2988,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 3019 "Python/generated_cases.c.h"
+ #line 2992 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -3026,14 +2999,14 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2055 "Python/bytecodes.c"
+ #line 2075 "Python/bytecodes.c"
int res = Py_Is(left, right) ^ oparg;
- #line 3032 "Python/generated_cases.c.h"
+ #line 3005 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2057 "Python/bytecodes.c"
+ #line 2077 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 3037 "Python/generated_cases.c.h"
+ #line 3010 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -3043,15 +3016,15 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2061 "Python/bytecodes.c"
+ #line 2081 "Python/bytecodes.c"
int res = PySequence_Contains(right, left);
- #line 3049 "Python/generated_cases.c.h"
+ #line 3022 "Python/generated_cases.c.h"
Py_DECREF(left);
Py_DECREF(right);
- #line 2063 "Python/bytecodes.c"
+ #line 2083 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
b = (res ^ oparg) ? Py_True : Py_False;
- #line 3055 "Python/generated_cases.c.h"
+ #line 3028 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = b;
DISPATCH();
@@ -3062,12 +3035,12 @@
PyObject *exc_value = stack_pointer[-2];
PyObject *rest;
PyObject *match;
- #line 2068 "Python/bytecodes.c"
+ #line 2088 "Python/bytecodes.c"
if (check_except_star_type_valid(tstate, match_type) < 0) {
- #line 3068 "Python/generated_cases.c.h"
+ #line 3041 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2070 "Python/bytecodes.c"
+ #line 2090 "Python/bytecodes.c"
if (true) goto pop_2_error;
}
@@ -3075,10 +3048,10 @@
rest = NULL;
int res = exception_group_match(exc_value, match_type,
&match, &rest);
- #line 3079 "Python/generated_cases.c.h"
+ #line 3052 "Python/generated_cases.c.h"
Py_DECREF(exc_value);
Py_DECREF(match_type);
- #line 2078 "Python/bytecodes.c"
+ #line 2098 "Python/bytecodes.c"
if (res < 0) goto pop_2_error;
assert((match == NULL) == (rest == NULL));
@@ -3087,7 +3060,7 @@
if (!Py_IsNone(match)) {
PyErr_SetHandledException(match);
}
- #line 3091 "Python/generated_cases.c.h"
+ #line 3064 "Python/generated_cases.c.h"
stack_pointer[-1] = match;
stack_pointer[-2] = rest;
DISPATCH();
@@ -3097,21 +3070,21 @@
PyObject *right = stack_pointer[-1];
PyObject *left = stack_pointer[-2];
PyObject *b;
- #line 2089 "Python/bytecodes.c"
+ #line 2109 "Python/bytecodes.c"
assert(PyExceptionInstance_Check(left));
if (check_except_type_valid(tstate, right) < 0) {
- #line 3104 "Python/generated_cases.c.h"
+ #line 3077 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2092 "Python/bytecodes.c"
+ #line 2112 "Python/bytecodes.c"
if (true) goto pop_1_error;
}
int res = PyErr_GivenExceptionMatches(left, right);
- #line 3111 "Python/generated_cases.c.h"
+ #line 3084 "Python/generated_cases.c.h"
Py_DECREF(right);
- #line 2097 "Python/bytecodes.c"
+ #line 2117 "Python/bytecodes.c"
b = res ? Py_True : Py_False;
- #line 3115 "Python/generated_cases.c.h"
+ #line 3088 "Python/generated_cases.c.h"
stack_pointer[-1] = b;
DISPATCH();
}
@@ -3120,15 +3093,15 @@
PyObject *fromlist = stack_pointer[-1];
PyObject *level = stack_pointer[-2];
PyObject *res;
- #line 2101 "Python/bytecodes.c"
+ #line 2121 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
res = import_name(tstate, frame, name, fromlist, level);
- #line 3127 "Python/generated_cases.c.h"
+ #line 3100 "Python/generated_cases.c.h"
Py_DECREF(level);
Py_DECREF(fromlist);
- #line 2104 "Python/bytecodes.c"
+ #line 2124 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 3132 "Python/generated_cases.c.h"
+ #line 3105 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3137,26 +3110,26 @@
TARGET(IMPORT_FROM) {
PyObject *from = stack_pointer[-1];
PyObject *res;
- #line 2108 "Python/bytecodes.c"
+ #line 2128 "Python/bytecodes.c"
PyObject *name = GETITEM(frame->f_code->co_names, oparg);
res = import_from(tstate, from, name);
if (res == NULL) goto error;
- #line 3145 "Python/generated_cases.c.h"
+ #line 3118 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
}
TARGET(JUMP_FORWARD) {
- #line 2114 "Python/bytecodes.c"
+ #line 2134 "Python/bytecodes.c"
JUMPBY(oparg);
- #line 3154 "Python/generated_cases.c.h"
+ #line 3127 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(JUMP_BACKWARD) {
PREDICTED(JUMP_BACKWARD);
- #line 2118 "Python/bytecodes.c"
+ #line 2138 "Python/bytecodes.c"
_Py_CODEUNIT *here = next_instr - 1;
assert(oparg <= INSTR_OFFSET());
JUMPBY(1-oparg);
@@ -3173,13 +3146,13 @@
goto resume_frame;
}
#endif /* ENABLE_SPECIALIZATION */
- #line 3177 "Python/generated_cases.c.h"
+ #line 3150 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
TARGET(ENTER_EXECUTOR) {
- #line 2138 "Python/bytecodes.c"
+ #line 2158 "Python/bytecodes.c"
_PyExecutorObject *executor = (_PyExecutorObject *)frame->f_code->co_executors->executors[oparg];
Py_INCREF(executor);
frame = executor->execute(executor, frame, stack_pointer);
@@ -3188,21 +3161,21 @@
goto error;
}
goto resume_frame;
- #line 3192 "Python/generated_cases.c.h"
+ #line 3165 "Python/generated_cases.c.h"
}
TARGET(POP_JUMP_IF_FALSE) {
PREDICTED(POP_JUMP_IF_FALSE);
PyObject *cond = stack_pointer[-1];
- #line 2149 "Python/bytecodes.c"
+ #line 2169 "Python/bytecodes.c"
if (Py_IsFalse(cond)) {
JUMPBY(oparg);
}
else if (!Py_IsTrue(cond)) {
int err = PyObject_IsTrue(cond);
- #line 3204 "Python/generated_cases.c.h"
+ #line 3177 "Python/generated_cases.c.h"
Py_DECREF(cond);
- #line 2155 "Python/bytecodes.c"
+ #line 2175 "Python/bytecodes.c"
if (err == 0) {
JUMPBY(oparg);
}
@@ -3210,22 +3183,22 @@
if (err < 0) goto pop_1_error;
}
}
- #line 3214 "Python/generated_cases.c.h"
+ #line 3187 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_TRUE) {
PyObject *cond = stack_pointer[-1];
- #line 2165 "Python/bytecodes.c"
+ #line 2185 "Python/bytecodes.c"
if (Py_IsTrue(cond)) {
JUMPBY(oparg);
}
else if (!Py_IsFalse(cond)) {
int err = PyObject_IsTrue(cond);
- #line 3227 "Python/generated_cases.c.h"
+ #line 3200 "Python/generated_cases.c.h"
Py_DECREF(cond);
- #line 2171 "Python/bytecodes.c"
+ #line 2191 "Python/bytecodes.c"
if (err > 0) {
JUMPBY(oparg);
}
@@ -3233,63 +3206,63 @@
if (err < 0) goto pop_1_error;
}
}
- #line 3237 "Python/generated_cases.c.h"
+ #line 3210 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NOT_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2181 "Python/bytecodes.c"
+ #line 2201 "Python/bytecodes.c"
if (!Py_IsNone(value)) {
- #line 3246 "Python/generated_cases.c.h"
+ #line 3219 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2183 "Python/bytecodes.c"
+ #line 2203 "Python/bytecodes.c"
JUMPBY(oparg);
}
- #line 3251 "Python/generated_cases.c.h"
+ #line 3224 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(POP_JUMP_IF_NONE) {
PyObject *value = stack_pointer[-1];
- #line 2188 "Python/bytecodes.c"
+ #line 2208 "Python/bytecodes.c"
if (Py_IsNone(value)) {
JUMPBY(oparg);
}
else {
- #line 3263 "Python/generated_cases.c.h"
+ #line 3236 "Python/generated_cases.c.h"
Py_DECREF(value);
- #line 2193 "Python/bytecodes.c"
+ #line 2213 "Python/bytecodes.c"
}
- #line 3267 "Python/generated_cases.c.h"
+ #line 3240 "Python/generated_cases.c.h"
STACK_SHRINK(1);
DISPATCH();
}
TARGET(JUMP_BACKWARD_NO_INTERRUPT) {
- #line 2197 "Python/bytecodes.c"
+ #line 2217 "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 3280 "Python/generated_cases.c.h"
+ #line 3253 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(GET_LEN) {
PyObject *obj = stack_pointer[-1];
PyObject *len_o;
- #line 2206 "Python/bytecodes.c"
+ #line 2226 "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 3293 "Python/generated_cases.c.h"
+ #line 3266 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = len_o;
DISPATCH();
@@ -3300,16 +3273,16 @@
PyObject *type = stack_pointer[-2];
PyObject *subject = stack_pointer[-3];
PyObject *attrs;
- #line 2214 "Python/bytecodes.c"
+ #line 2234 "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 3309 "Python/generated_cases.c.h"
+ #line 3282 "Python/generated_cases.c.h"
Py_DECREF(subject);
Py_DECREF(type);
Py_DECREF(names);
- #line 2219 "Python/bytecodes.c"
+ #line 2239 "Python/bytecodes.c"
if (attrs) {
assert(PyTuple_CheckExact(attrs)); // Success!
}
@@ -3317,7 +3290,7 @@
if (_PyErr_Occurred(tstate)) goto pop_3_error;
attrs = Py_None; // Failure!
}
- #line 3321 "Python/generated_cases.c.h"
+ #line 3294 "Python/generated_cases.c.h"
STACK_SHRINK(2);
stack_pointer[-1] = attrs;
DISPATCH();
@@ -3326,10 +3299,10 @@
TARGET(MATCH_MAPPING) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2229 "Python/bytecodes.c"
+ #line 2249 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
res = match ? Py_True : Py_False;
- #line 3333 "Python/generated_cases.c.h"
+ #line 3306 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
PREDICT(POP_JUMP_IF_FALSE);
@@ -3339,10 +3312,10 @@
TARGET(MATCH_SEQUENCE) {
PyObject *subject = stack_pointer[-1];
PyObject *res;
- #line 2235 "Python/bytecodes.c"
+ #line 2255 "Python/bytecodes.c"
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
res = match ? Py_True : Py_False;
- #line 3346 "Python/generated_cases.c.h"
+ #line 3319 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
PREDICT(POP_JUMP_IF_FALSE);
@@ -3353,11 +3326,11 @@
PyObject *keys = stack_pointer[-1];
PyObject *subject = stack_pointer[-2];
PyObject *values_or_none;
- #line 2241 "Python/bytecodes.c"
+ #line 2261 "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 3361 "Python/generated_cases.c.h"
+ #line 3334 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = values_or_none;
DISPATCH();
@@ -3366,14 +3339,14 @@
TARGET(GET_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2247 "Python/bytecodes.c"
+ #line 2267 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
iter = PyObject_GetIter(iterable);
- #line 3373 "Python/generated_cases.c.h"
+ #line 3346 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2250 "Python/bytecodes.c"
+ #line 2270 "Python/bytecodes.c"
if (iter == NULL) goto pop_1_error;
- #line 3377 "Python/generated_cases.c.h"
+ #line 3350 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
DISPATCH();
}
@@ -3381,7 +3354,7 @@
TARGET(GET_YIELD_FROM_ITER) {
PyObject *iterable = stack_pointer[-1];
PyObject *iter;
- #line 2254 "Python/bytecodes.c"
+ #line 2274 "Python/bytecodes.c"
/* before: [obj]; after [getiter(obj)] */
if (PyCoro_CheckExact(iterable)) {
/* `iterable` is a coroutine */
@@ -3404,11 +3377,11 @@
if (iter == NULL) {
goto error;
}
- #line 3408 "Python/generated_cases.c.h"
+ #line 3381 "Python/generated_cases.c.h"
Py_DECREF(iterable);
- #line 2277 "Python/bytecodes.c"
+ #line 2297 "Python/bytecodes.c"
}
- #line 3412 "Python/generated_cases.c.h"
+ #line 3385 "Python/generated_cases.c.h"
stack_pointer[-1] = iter;
PREDICT(LOAD_CONST);
DISPATCH();
@@ -3419,7 +3392,7 @@
static_assert(INLINE_CACHE_ENTRIES_FOR_ITER == 1, "incorrect cache size");
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2296 "Python/bytecodes.c"
+ #line 2316 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyForIterCache *cache = (_PyForIterCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -3450,7 +3423,7 @@
DISPATCH();
}
// Common case: no jump, leave it to the code generator
- #line 3454 "Python/generated_cases.c.h"
+ #line 3427 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3458,7 +3431,7 @@
}
TARGET(INSTRUMENTED_FOR_ITER) {
- #line 2329 "Python/bytecodes.c"
+ #line 2349 "Python/bytecodes.c"
_Py_CODEUNIT *here = next_instr-1;
_Py_CODEUNIT *target;
PyObject *iter = TOP();
@@ -3484,14 +3457,14 @@
target = next_instr + INLINE_CACHE_ENTRIES_FOR_ITER + oparg + 1;
}
INSTRUMENTED_JUMP(here, target, PY_MONITORING_EVENT_BRANCH);
- #line 3488 "Python/generated_cases.c.h"
+ #line 3461 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(FOR_ITER_LIST) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2357 "Python/bytecodes.c"
+ #line 2377 "Python/bytecodes.c"
DEOPT_IF(Py_TYPE(iter) != &PyListIter_Type, FOR_ITER);
_PyListIterObject *it = (_PyListIterObject *)iter;
STAT_INC(FOR_ITER, hit);
@@ -3511,7 +3484,7 @@
DISPATCH();
end_for_iter_list:
// Common case: no jump, leave it to the code generator
- #line 3515 "Python/generated_cases.c.h"
+ #line 3488 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3521,7 +3494,7 @@
TARGET(FOR_ITER_TUPLE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2379 "Python/bytecodes.c"
+ #line 2399 "Python/bytecodes.c"
_PyTupleIterObject *it = (_PyTupleIterObject *)iter;
DEOPT_IF(Py_TYPE(it) != &PyTupleIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3541,7 +3514,7 @@
DISPATCH();
end_for_iter_tuple:
// Common case: no jump, leave it to the code generator
- #line 3545 "Python/generated_cases.c.h"
+ #line 3518 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3551,7 +3524,7 @@
TARGET(FOR_ITER_RANGE) {
PyObject *iter = stack_pointer[-1];
PyObject *next;
- #line 2401 "Python/bytecodes.c"
+ #line 2421 "Python/bytecodes.c"
_PyRangeIterObject *r = (_PyRangeIterObject *)iter;
DEOPT_IF(Py_TYPE(r) != &PyRangeIter_Type, FOR_ITER);
STAT_INC(FOR_ITER, hit);
@@ -3569,7 +3542,7 @@
if (next == NULL) {
goto error;
}
- #line 3573 "Python/generated_cases.c.h"
+ #line 3546 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = next;
next_instr += 1;
@@ -3578,7 +3551,7 @@
TARGET(FOR_ITER_GEN) {
PyObject *iter = stack_pointer[-1];
- #line 2421 "Python/bytecodes.c"
+ #line 2441 "Python/bytecodes.c"
DEOPT_IF(tstate->interp->eval_frame, FOR_ITER);
PyGenObject *gen = (PyGenObject *)iter;
DEOPT_IF(Py_TYPE(gen) != &PyGen_Type, FOR_ITER);
@@ -3594,14 +3567,14 @@
assert(next_instr[oparg].op.code == END_FOR ||
next_instr[oparg].op.code == INSTRUMENTED_END_FOR);
DISPATCH_INLINED(gen_frame);
- #line 3598 "Python/generated_cases.c.h"
+ #line 3571 "Python/generated_cases.c.h"
}
TARGET(BEFORE_ASYNC_WITH) {
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2439 "Python/bytecodes.c"
+ #line 2459 "Python/bytecodes.c"
PyObject *enter = _PyObject_LookupSpecial(mgr, &_Py_ID(__aenter__));
if (enter == NULL) {
if (!_PyErr_Occurred(tstate)) {
@@ -3624,16 +3597,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3628 "Python/generated_cases.c.h"
+ #line 3601 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2462 "Python/bytecodes.c"
+ #line 2482 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3637 "Python/generated_cases.c.h"
+ #line 3610 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3645,7 +3618,7 @@
PyObject *mgr = stack_pointer[-1];
PyObject *exit;
PyObject *res;
- #line 2472 "Python/bytecodes.c"
+ #line 2492 "Python/bytecodes.c"
/* pop the context manager, push its __exit__ and the
* value returned from calling its __enter__
*/
@@ -3671,16 +3644,16 @@
Py_DECREF(enter);
goto error;
}
- #line 3675 "Python/generated_cases.c.h"
+ #line 3648 "Python/generated_cases.c.h"
Py_DECREF(mgr);
- #line 2498 "Python/bytecodes.c"
+ #line 2518 "Python/bytecodes.c"
res = _PyObject_CallNoArgs(enter);
Py_DECREF(enter);
if (res == NULL) {
Py_DECREF(exit);
if (true) goto pop_1_error;
}
- #line 3684 "Python/generated_cases.c.h"
+ #line 3657 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
stack_pointer[-2] = exit;
@@ -3692,7 +3665,7 @@
PyObject *lasti = stack_pointer[-3];
PyObject *exit_func = stack_pointer[-4];
PyObject *res;
- #line 2507 "Python/bytecodes.c"
+ #line 2527 "Python/bytecodes.c"
/* At the top of the stack are 4 values:
- val: TOP = exc_info()
- unused: SECOND = previous exception
@@ -3713,7 +3686,7 @@
res = PyObject_Vectorcall(exit_func, stack + 1,
3 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL);
if (res == NULL) goto error;
- #line 3717 "Python/generated_cases.c.h"
+ #line 3690 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = res;
DISPATCH();
@@ -3722,7 +3695,7 @@
TARGET(PUSH_EXC_INFO) {
PyObject *new_exc = stack_pointer[-1];
PyObject *prev_exc;
- #line 2530 "Python/bytecodes.c"
+ #line 2550 "Python/bytecodes.c"
_PyErr_StackItem *exc_info = tstate->exc_info;
if (exc_info->exc_value != NULL) {
prev_exc = exc_info->exc_value;
@@ -3732,7 +3705,7 @@
}
assert(PyExceptionInstance_Check(new_exc));
exc_info->exc_value = Py_NewRef(new_exc);
- #line 3736 "Python/generated_cases.c.h"
+ #line 3709 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = new_exc;
stack_pointer[-2] = prev_exc;
@@ -3746,7 +3719,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 2542 "Python/bytecodes.c"
+ #line 2562 "Python/bytecodes.c"
/* Cached method object */
PyTypeObject *self_cls = Py_TYPE(self);
assert(type_version != 0);
@@ -3763,7 +3736,7 @@
assert(_PyType_HasFeature(Py_TYPE(res2), Py_TPFLAGS_METHOD_DESCRIPTOR));
res = self;
assert(oparg & 1);
- #line 3767 "Python/generated_cases.c.h"
+ #line 3740 "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; }
@@ -3777,7 +3750,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2561 "Python/bytecodes.c"
+ #line 2581 "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);
@@ -3787,7 +3760,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3791 "Python/generated_cases.c.h"
+ #line 3764 "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; }
@@ -3801,7 +3774,7 @@
PyObject *res;
uint32_t type_version = read_u32(&next_instr[1].cache);
PyObject *descr = read_obj(&next_instr[5].cache);
- #line 2573 "Python/bytecodes.c"
+ #line 2593 "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;
@@ -3815,7 +3788,7 @@
res2 = Py_NewRef(descr);
res = self;
assert(oparg & 1);
- #line 3819 "Python/generated_cases.c.h"
+ #line 3792 "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; }
@@ -3824,16 +3797,16 @@
}
TARGET(KW_NAMES) {
- #line 2589 "Python/bytecodes.c"
+ #line 2609 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg < PyTuple_GET_SIZE(frame->f_code->co_consts));
kwnames = GETITEM(frame->f_code->co_consts, oparg);
- #line 3832 "Python/generated_cases.c.h"
+ #line 3805 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_CALL) {
- #line 2595 "Python/bytecodes.c"
+ #line 2615 "Python/bytecodes.c"
int is_meth = PEEK(oparg+2) != NULL;
int total_args = oparg + is_meth;
PyObject *function = PEEK(total_args + 1);
@@ -3846,7 +3819,7 @@
_PyCallCache *cache = (_PyCallCache *)next_instr;
INCREMENT_ADAPTIVE_COUNTER(cache->counter);
GO_TO_INSTRUCTION(CALL);
- #line 3850 "Python/generated_cases.c.h"
+ #line 3823 "Python/generated_cases.c.h"
}
TARGET(CALL) {
@@ -3856,7 +3829,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2640 "Python/bytecodes.c"
+ #line 2660 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -3938,7 +3911,7 @@
Py_DECREF(args[i]);
}
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 3942 "Python/generated_cases.c.h"
+ #line 3915 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -3950,7 +3923,7 @@
TARGET(CALL_BOUND_METHOD_EXACT_ARGS) {
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 2728 "Python/bytecodes.c"
+ #line 2748 "Python/bytecodes.c"
DEOPT_IF(method != NULL, CALL);
DEOPT_IF(Py_TYPE(callable) != &PyMethod_Type, CALL);
STAT_INC(CALL, hit);
@@ -3960,7 +3933,7 @@
PEEK(oparg + 2) = Py_NewRef(meth); // method
Py_DECREF(callable);
GO_TO_INSTRUCTION(CALL_PY_EXACT_ARGS);
- #line 3964 "Python/generated_cases.c.h"
+ #line 3937 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_EXACT_ARGS) {
@@ -3969,7 +3942,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2740 "Python/bytecodes.c"
+ #line 2760 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -3995,7 +3968,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 3999 "Python/generated_cases.c.h"
+ #line 3972 "Python/generated_cases.c.h"
}
TARGET(CALL_PY_WITH_DEFAULTS) {
@@ -4003,7 +3976,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
uint32_t func_version = read_u32(&next_instr[1].cache);
- #line 2768 "Python/bytecodes.c"
+ #line 2788 "Python/bytecodes.c"
assert(kwnames == NULL);
DEOPT_IF(tstate->interp->eval_frame, CALL);
int is_meth = method != NULL;
@@ -4039,7 +4012,7 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL);
frame->return_offset = 0;
DISPATCH_INLINED(new_frame);
- #line 4043 "Python/generated_cases.c.h"
+ #line 4016 "Python/generated_cases.c.h"
}
TARGET(CALL_NO_KW_TYPE_1) {
@@ -4047,7 +4020,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2806 "Python/bytecodes.c"
+ #line 2826 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -4057,7 +4030,7 @@
res = Py_NewRef(Py_TYPE(obj));
Py_DECREF(obj);
Py_DECREF(&PyType_Type); // I.e., callable
- #line 4061 "Python/generated_cases.c.h"
+ #line 4034 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4070,7 +4043,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2818 "Python/bytecodes.c"
+ #line 2838 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -4081,7 +4054,7 @@
Py_DECREF(arg);
Py_DECREF(&PyUnicode_Type); // I.e., callable
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4085 "Python/generated_cases.c.h"
+ #line 4058 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4095,7 +4068,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *null = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2832 "Python/bytecodes.c"
+ #line 2852 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
DEOPT_IF(null != NULL, CALL);
@@ -4106,7 +4079,7 @@
Py_DECREF(arg);
Py_DECREF(&PyTuple_Type); // I.e., tuple
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4110 "Python/generated_cases.c.h"
+ #line 4083 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4120,7 +4093,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2846 "Python/bytecodes.c"
+ #line 2866 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4142,7 +4115,7 @@
}
Py_DECREF(tp);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4146 "Python/generated_cases.c.h"
+ #line 4119 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4156,7 +4129,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2871 "Python/bytecodes.c"
+ #line 2891 "Python/bytecodes.c"
/* Builtin METH_O functions */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4184,7 +4157,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4188 "Python/generated_cases.c.h"
+ #line 4161 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4198,7 +4171,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2902 "Python/bytecodes.c"
+ #line 2922 "Python/bytecodes.c"
/* Builtin METH_FASTCALL functions, without keywords */
assert(kwnames == NULL);
int is_meth = method != NULL;
@@ -4230,7 +4203,7 @@
'invalid'). In those cases an exception is set, so we must
handle it.
*/
- #line 4234 "Python/generated_cases.c.h"
+ #line 4207 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4244,7 +4217,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2937 "Python/bytecodes.c"
+ #line 2957 "Python/bytecodes.c"
/* Builtin METH_FASTCALL | METH_KEYWORDS functions */
int is_meth = method != NULL;
int total_args = oparg;
@@ -4276,7 +4249,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4280 "Python/generated_cases.c.h"
+ #line 4253 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4290,7 +4263,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2972 "Python/bytecodes.c"
+ #line 2992 "Python/bytecodes.c"
assert(kwnames == NULL);
/* len(o) */
int is_meth = method != NULL;
@@ -4315,7 +4288,7 @@
Py_DECREF(callable);
Py_DECREF(arg);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4319 "Python/generated_cases.c.h"
+ #line 4292 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4328,7 +4301,7 @@
PyObject *callable = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 2999 "Python/bytecodes.c"
+ #line 3019 "Python/bytecodes.c"
assert(kwnames == NULL);
/* isinstance(o, o2) */
int is_meth = method != NULL;
@@ -4355,7 +4328,7 @@
Py_DECREF(cls);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4359 "Python/generated_cases.c.h"
+ #line 4332 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4367,7 +4340,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *self = stack_pointer[-(1 + oparg)];
PyObject *method = stack_pointer[-(2 + oparg)];
- #line 3029 "Python/bytecodes.c"
+ #line 3049 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 1);
assert(method != NULL);
@@ -4385,14 +4358,14 @@
JUMPBY(INLINE_CACHE_ENTRIES_CALL + 1);
assert(next_instr[-1].op.code == POP_TOP);
DISPATCH();
- #line 4389 "Python/generated_cases.c.h"
+ #line 4362 "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 3049 "Python/bytecodes.c"
+ #line 3069 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4423,7 +4396,7 @@
Py_DECREF(arg);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4427 "Python/generated_cases.c.h"
+ #line 4400 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4436,7 +4409,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3083 "Python/bytecodes.c"
+ #line 3103 "Python/bytecodes.c"
int is_meth = method != NULL;
int total_args = oparg;
if (is_meth) {
@@ -4465,7 +4438,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4469 "Python/generated_cases.c.h"
+ #line 4442 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4478,7 +4451,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3115 "Python/bytecodes.c"
+ #line 3135 "Python/bytecodes.c"
assert(kwnames == NULL);
assert(oparg == 0 || oparg == 1);
int is_meth = method != NULL;
@@ -4507,7 +4480,7 @@
Py_DECREF(self);
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4511 "Python/generated_cases.c.h"
+ #line 4484 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4520,7 +4493,7 @@
PyObject **args = (stack_pointer - oparg);
PyObject *method = stack_pointer[-(2 + oparg)];
PyObject *res;
- #line 3147 "Python/bytecodes.c"
+ #line 3167 "Python/bytecodes.c"
assert(kwnames == NULL);
int is_meth = method != NULL;
int total_args = oparg;
@@ -4548,7 +4521,7 @@
}
Py_DECREF(callable);
if (res == NULL) { STACK_SHRINK(oparg); goto pop_2_error; }
- #line 4552 "Python/generated_cases.c.h"
+ #line 4525 "Python/generated_cases.c.h"
STACK_SHRINK(oparg);
STACK_SHRINK(1);
stack_pointer[-1] = res;
@@ -4558,9 +4531,9 @@
}
TARGET(INSTRUMENTED_CALL_FUNCTION_EX) {
- #line 3178 "Python/bytecodes.c"
+ #line 3198 "Python/bytecodes.c"
GO_TO_INSTRUCTION(CALL_FUNCTION_EX);
- #line 4564 "Python/generated_cases.c.h"
+ #line 4537 "Python/generated_cases.c.h"
}
TARGET(CALL_FUNCTION_EX) {
@@ -4569,7 +4542,7 @@
PyObject *callargs = stack_pointer[-(1 + ((oparg & 1) ? 1 : 0))];
PyObject *func = stack_pointer[-(2 + ((oparg & 1) ? 1 : 0))];
PyObject *result;
- #line 3182 "Python/bytecodes.c"
+ #line 3202 "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));
@@ -4631,14 +4604,14 @@
}
result = PyObject_Call(func, callargs, kwargs);
}
- #line 4635 "Python/generated_cases.c.h"
+ #line 4608 "Python/generated_cases.c.h"
Py_DECREF(func);
Py_DECREF(callargs);
Py_XDECREF(kwargs);
- #line 3244 "Python/bytecodes.c"
+ #line 3264 "Python/bytecodes.c"
assert(PEEK(3 + (oparg & 1)) == NULL);
if (result == NULL) { STACK_SHRINK(((oparg & 1) ? 1 : 0)); goto pop_3_error; }
- #line 4642 "Python/generated_cases.c.h"
+ #line 4615 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg & 1) ? 1 : 0));
STACK_SHRINK(2);
stack_pointer[-1] = result;
@@ -4653,7 +4626,7 @@
PyObject *kwdefaults = (oparg & MAKE_FUNCTION_KWDEFAULTS) ? stack_pointer[-(1 + ((oparg & MAKE_FUNCTION_CLOSURE) ? 1 : 0) + ((oparg & MAKE_FUNCTION_ANNOTATIONS) ? 1 : 0) + ((oparg & MAKE_FUNCTION_KWDEFAULTS) ? 1 : 0))] : NULL;
PyObject *defaults = (oparg & MAKE_FUNCTION_DEFAULTS) ? stack_pointer[-(1 + ((oparg & MAKE_FUNCTION_CLOSURE) ? 1 : 0) + ((oparg & MAKE_FUNCTION_ANNOTATIONS) ? 1 : 0) + ((oparg & MAKE_FUNCTION_KWDEFAULTS) ? 1 : 0) + ((oparg & MAKE_FUNCTION_DEFAULTS) ? 1 : 0))] : NULL;
PyObject *func;
- #line 3254 "Python/bytecodes.c"
+ #line 3274 "Python/bytecodes.c"
PyFunctionObject *func_obj = (PyFunctionObject *)
PyFunction_New(codeobj, GLOBALS());
@@ -4682,14 +4655,14 @@
func_obj->func_version = ((PyCodeObject *)codeobj)->co_version;
func = (PyObject *)func_obj;
- #line 4686 "Python/generated_cases.c.h"
+ #line 4659 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg & MAKE_FUNCTION_DEFAULTS) ? 1 : 0) + ((oparg & MAKE_FUNCTION_KWDEFAULTS) ? 1 : 0) + ((oparg & MAKE_FUNCTION_ANNOTATIONS) ? 1 : 0) + ((oparg & MAKE_FUNCTION_CLOSURE) ? 1 : 0));
stack_pointer[-1] = func;
DISPATCH();
}
TARGET(RETURN_GENERATOR) {
- #line 3285 "Python/bytecodes.c"
+ #line 3305 "Python/bytecodes.c"
assert(PyFunction_Check(frame->f_funcobj));
PyFunctionObject *func = (PyFunctionObject *)frame->f_funcobj;
PyGenObject *gen = (PyGenObject *)_Py_MakeCoro(func);
@@ -4710,7 +4683,7 @@
frame = cframe.current_frame = prev;
_PyFrame_StackPush(frame, (PyObject *)gen);
goto resume_frame;
- #line 4714 "Python/generated_cases.c.h"
+ #line 4687 "Python/generated_cases.c.h"
}
TARGET(BUILD_SLICE) {
@@ -4718,15 +4691,15 @@
PyObject *stop = stack_pointer[-(1 + ((oparg == 3) ? 1 : 0))];
PyObject *start = stack_pointer[-(2 + ((oparg == 3) ? 1 : 0))];
PyObject *slice;
- #line 3308 "Python/bytecodes.c"
+ #line 3328 "Python/bytecodes.c"
slice = PySlice_New(start, stop, step);
- #line 4724 "Python/generated_cases.c.h"
+ #line 4697 "Python/generated_cases.c.h"
Py_DECREF(start);
Py_DECREF(stop);
Py_XDECREF(step);
- #line 3310 "Python/bytecodes.c"
+ #line 3330 "Python/bytecodes.c"
if (slice == NULL) { STACK_SHRINK(((oparg == 3) ? 1 : 0)); goto pop_2_error; }
- #line 4730 "Python/generated_cases.c.h"
+ #line 4703 "Python/generated_cases.c.h"
STACK_SHRINK(((oparg == 3) ? 1 : 0));
STACK_SHRINK(1);
stack_pointer[-1] = slice;
@@ -4737,7 +4710,7 @@
PyObject *fmt_spec = ((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? stack_pointer[-((((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0))] : NULL;
PyObject *value = stack_pointer[-(1 + (((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0))];
PyObject *result;
- #line 3314 "Python/bytecodes.c"
+ #line 3334 "Python/bytecodes.c"
/* Handles f-string value formatting. */
PyObject *(*conv_fn)(PyObject *);
int which_conversion = oparg & FVC_MASK;
@@ -4772,7 +4745,7 @@
Py_DECREF(value);
Py_XDECREF(fmt_spec);
if (result == NULL) { STACK_SHRINK((((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0)); goto pop_1_error; }
- #line 4776 "Python/generated_cases.c.h"
+ #line 4749 "Python/generated_cases.c.h"
STACK_SHRINK((((oparg & FVS_MASK) == FVS_HAVE_SPEC) ? 1 : 0));
stack_pointer[-1] = result;
DISPATCH();
@@ -4781,10 +4754,10 @@
TARGET(COPY) {
PyObject *bottom = stack_pointer[-(1 + (oparg-1))];
PyObject *top;
- #line 3351 "Python/bytecodes.c"
+ #line 3371 "Python/bytecodes.c"
assert(oparg > 0);
top = Py_NewRef(bottom);
- #line 4788 "Python/generated_cases.c.h"
+ #line 4761 "Python/generated_cases.c.h"
STACK_GROW(1);
stack_pointer[-1] = top;
DISPATCH();
@@ -4796,7 +4769,7 @@
PyObject *rhs = stack_pointer[-1];
PyObject *lhs = stack_pointer[-2];
PyObject *res;
- #line 3356 "Python/bytecodes.c"
+ #line 3376 "Python/bytecodes.c"
#if ENABLE_SPECIALIZATION
_PyBinaryOpCache *cache = (_PyBinaryOpCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
@@ -4811,12 +4784,12 @@
assert((unsigned)oparg < Py_ARRAY_LENGTH(binary_ops));
assert(binary_ops[oparg]);
res = binary_ops[oparg](lhs, rhs);
- #line 4815 "Python/generated_cases.c.h"
+ #line 4788 "Python/generated_cases.c.h"
Py_DECREF(lhs);
Py_DECREF(rhs);
- #line 3371 "Python/bytecodes.c"
+ #line 3391 "Python/bytecodes.c"
if (res == NULL) goto pop_2_error;
- #line 4820 "Python/generated_cases.c.h"
+ #line 4793 "Python/generated_cases.c.h"
STACK_SHRINK(1);
stack_pointer[-1] = res;
next_instr += 1;
@@ -4826,16 +4799,16 @@
TARGET(SWAP) {
PyObject *top = stack_pointer[-1];
PyObject *bottom = stack_pointer[-(2 + (oparg-2))];
- #line 3376 "Python/bytecodes.c"
+ #line 3396 "Python/bytecodes.c"
assert(oparg >= 2);
- #line 4832 "Python/generated_cases.c.h"
+ #line 4805 "Python/generated_cases.c.h"
stack_pointer[-1] = bottom;
stack_pointer[-(2 + (oparg-2))] = top;
DISPATCH();
}
TARGET(INSTRUMENTED_INSTRUCTION) {
- #line 3380 "Python/bytecodes.c"
+ #line 3400 "Python/bytecodes.c"
int next_opcode = _Py_call_instrumentation_instruction(
tstate, frame, next_instr-1);
if (next_opcode < 0) goto error;
@@ -4847,26 +4820,26 @@
assert(next_opcode > 0 && next_opcode < 256);
opcode = next_opcode;
DISPATCH_GOTO();
- #line 4851 "Python/generated_cases.c.h"
+ #line 4824 "Python/generated_cases.c.h"
}
TARGET(INSTRUMENTED_JUMP_FORWARD) {
- #line 3394 "Python/bytecodes.c"
+ #line 3414 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr+oparg, PY_MONITORING_EVENT_JUMP);
- #line 4857 "Python/generated_cases.c.h"
+ #line 4830 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_JUMP_BACKWARD) {
- #line 3398 "Python/bytecodes.c"
+ #line 3418 "Python/bytecodes.c"
INSTRUMENTED_JUMP(next_instr-1, next_instr+1-oparg, PY_MONITORING_EVENT_JUMP);
- #line 4864 "Python/generated_cases.c.h"
+ #line 4837 "Python/generated_cases.c.h"
CHECK_EVAL_BREAKER();
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_TRUE) {
- #line 3403 "Python/bytecodes.c"
+ #line 3423 "Python/bytecodes.c"
PyObject *cond = POP();
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
@@ -4875,12 +4848,12 @@
assert(err == 0 || err == 1);
int offset = err*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4879 "Python/generated_cases.c.h"
+ #line 4852 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_FALSE) {
- #line 3414 "Python/bytecodes.c"
+ #line 3434 "Python/bytecodes.c"
PyObject *cond = POP();
int err = PyObject_IsTrue(cond);
Py_DECREF(cond);
@@ -4889,12 +4862,12 @@
assert(err == 0 || err == 1);
int offset = (1-err)*oparg;
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4893 "Python/generated_cases.c.h"
+ #line 4866 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NONE) {
- #line 3425 "Python/bytecodes.c"
+ #line 3445 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4906,12 +4879,12 @@
offset = 0;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4910 "Python/generated_cases.c.h"
+ #line 4883 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(INSTRUMENTED_POP_JUMP_IF_NOT_NONE) {
- #line 3439 "Python/bytecodes.c"
+ #line 3459 "Python/bytecodes.c"
PyObject *value = POP();
_Py_CODEUNIT *here = next_instr-1;
int offset;
@@ -4923,30 +4896,30 @@
offset = oparg;
}
INSTRUMENTED_JUMP(here, next_instr + offset, PY_MONITORING_EVENT_BRANCH);
- #line 4927 "Python/generated_cases.c.h"
+ #line 4900 "Python/generated_cases.c.h"
DISPATCH();
}
TARGET(EXTENDED_ARG) {
- #line 3453 "Python/bytecodes.c"
+ #line 3473 "Python/bytecodes.c"
assert(oparg);
opcode = next_instr->op.code;
oparg = oparg << 8 | next_instr->op.arg;
PRE_DISPATCH_GOTO();
DISPATCH_GOTO();
- #line 4938 "Python/generated_cases.c.h"
+ #line 4911 "Python/generated_cases.c.h"
}
TARGET(CACHE) {
- #line 3461 "Python/bytecodes.c"
+ #line 3481 "Python/bytecodes.c"
assert(0 && "Executing a cache.");
Py_UNREACHABLE();
- #line 4945 "Python/generated_cases.c.h"
+ #line 4918 "Python/generated_cases.c.h"
}
TARGET(RESERVED) {
- #line 3466 "Python/bytecodes.c"
+ #line 3486 "Python/bytecodes.c"
assert(0 && "Executing RESERVED instruction.");
Py_UNREACHABLE();
- #line 4952 "Python/generated_cases.c.h"
+ #line 4925 "Python/generated_cases.c.h"
}
diff --git a/Python/instrumentation.c b/Python/instrumentation.c
index c3249463197d9..d8e47bfdc1782 100644
--- a/Python/instrumentation.c
+++ b/Python/instrumentation.c
@@ -1488,10 +1488,7 @@ update_instrumentation_data(PyCodeObject *code, PyInterpreterState *interp)
}
static const uint8_t super_instructions[256] = {
- [LOAD_FAST__LOAD_FAST] = 1,
[LOAD_FAST__LOAD_CONST] = 1,
- [STORE_FAST__LOAD_FAST] = 1,
- [STORE_FAST__STORE_FAST] = 1,
[LOAD_CONST__LOAD_FAST] = 1,
};
diff --git a/Python/opcode_metadata.h b/Python/opcode_metadata.h
index 8c0ba7d7f43a7..ce9c2e7b25a3a 100644
--- a/Python/opcode_metadata.h
+++ b/Python/opcode_metadata.h
@@ -23,18 +23,18 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
return 0;
case LOAD_FAST_AND_CLEAR:
return 0;
+ case LOAD_FAST_LOAD_FAST:
+ return 0;
case LOAD_CONST:
return 0;
case STORE_FAST:
return 1;
- case LOAD_FAST__LOAD_FAST:
- return 0+0;
+ case STORE_FAST_LOAD_FAST:
+ return 1;
+ case STORE_FAST_STORE_FAST:
+ return 2;
case LOAD_FAST__LOAD_CONST:
return 0+0;
- case STORE_FAST__LOAD_FAST:
- return 1+0;
- case STORE_FAST__STORE_FAST:
- return 1+1;
case LOAD_CONST__LOAD_FAST:
return 0+0;
case POP_TOP:
@@ -421,18 +421,18 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
return 1;
case LOAD_FAST_AND_CLEAR:
return 1;
+ case LOAD_FAST_LOAD_FAST:
+ return 2;
case LOAD_CONST:
return 1;
case STORE_FAST:
return 0;
- case LOAD_FAST__LOAD_FAST:
- return 1+1;
+ case STORE_FAST_LOAD_FAST:
+ return 1;
+ case STORE_FAST_STORE_FAST:
+ return 0;
case LOAD_FAST__LOAD_CONST:
return 1+1;
- case STORE_FAST__LOAD_FAST:
- return 0+1;
- case STORE_FAST__STORE_FAST:
- return 0+0;
case LOAD_CONST__LOAD_FAST:
return 1+1;
case POP_TOP:
@@ -816,12 +816,12 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[256] = {
[LOAD_FAST_CHECK] = { true, INSTR_FMT_IB },
[LOAD_FAST] = { true, INSTR_FMT_IB },
[LOAD_FAST_AND_CLEAR] = { true, INSTR_FMT_IB },
+ [LOAD_FAST_LOAD_FAST] = { true, INSTR_FMT_IB },
[LOAD_CONST] = { true, INSTR_FMT_IB },
[STORE_FAST] = { true, INSTR_FMT_IB },
- [LOAD_FAST__LOAD_FAST] = { true, INSTR_FMT_IBIB },
+ [STORE_FAST_LOAD_FAST] = { true, INSTR_FMT_IB },
+ [STORE_FAST_STORE_FAST] = { true, INSTR_FMT_IB },
[LOAD_FAST__LOAD_CONST] = { true, INSTR_FMT_IBIB },
- [STORE_FAST__LOAD_FAST] = { true, INSTR_FMT_IBIB },
- [STORE_FAST__STORE_FAST] = { true, INSTR_FMT_IBIB },
[LOAD_CONST__LOAD_FAST] = { true, INSTR_FMT_IBIB },
[POP_TOP] = { true, INSTR_FMT_IX },
[PUSH_NULL] = { true, INSTR_FMT_IX },
diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index 9c46f4816369c..8835ad984c19b 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -87,7 +87,7 @@ static void *opcode_targets[256] = {
&&TARGET_SETUP_ANNOTATIONS,
&&TARGET_LOAD_FAST__LOAD_CONST,
&&TARGET_LOAD_LOCALS,
- &&TARGET_LOAD_FAST__LOAD_FAST,
+ &&TARGET_LOAD_GLOBAL_BUILTIN,
&&TARGET_POP_EXCEPT,
&&TARGET_STORE_NAME,
&&TARGET_DELETE_NAME,
@@ -110,9 +110,9 @@ static void *opcode_targets[256] = {
&&TARGET_IMPORT_NAME,
&&TARGET_IMPORT_FROM,
&&TARGET_JUMP_FORWARD,
- &&TARGET_LOAD_GLOBAL_BUILTIN,
&&TARGET_LOAD_GLOBAL_MODULE,
&&TARGET_STORE_ATTR_INSTANCE_VALUE,
+ &&TARGET_STORE_ATTR_SLOT,
&&TARGET_POP_JUMP_IF_FALSE,
&&TARGET_POP_JUMP_IF_TRUE,
&&TARGET_LOAD_GLOBAL,
@@ -147,29 +147,29 @@ static void *opcode_targets[256] = {
&&TARGET_LIST_APPEND,
&&TARGET_SET_ADD,
&&TARGET_MAP_ADD,
- &&TARGET_STORE_ATTR_SLOT,
+ &&TARGET_STORE_ATTR_WITH_HINT,
&&TARGET_COPY_FREE_VARS,
&&TARGET_YIELD_VALUE,
&&TARGET_RESUME,
&&TARGET_MATCH_CLASS,
- &&TARGET_STORE_ATTR_WITH_HINT,
- &&TARGET_STORE_FAST__LOAD_FAST,
+ &&TARGET_STORE_SUBSCR_DICT,
+ &&TARGET_STORE_SUBSCR_LIST_INT,
&&TARGET_FORMAT_VALUE,
&&TARGET_BUILD_CONST_KEY_MAP,
&&TARGET_BUILD_STRING,
- &&TARGET_STORE_FAST__STORE_FAST,
- &&TARGET_STORE_SUBSCR_DICT,
- &&TARGET_STORE_SUBSCR_LIST_INT,
&&TARGET_UNPACK_SEQUENCE_LIST,
+ &&TARGET_UNPACK_SEQUENCE_TUPLE,
+ &&TARGET_UNPACK_SEQUENCE_TWO_TUPLE,
+ &&TARGET_SEND_GEN,
&&TARGET_LIST_EXTEND,
&&TARGET_SET_UPDATE,
&&TARGET_DICT_MERGE,
&&TARGET_DICT_UPDATE,
- &&TARGET_UNPACK_SEQUENCE_TUPLE,
- &&TARGET_UNPACK_SEQUENCE_TWO_TUPLE,
- &&TARGET_SEND_GEN,
&&_unknown_opcode,
&&_unknown_opcode,
+ &&TARGET_LOAD_FAST_LOAD_FAST,
+ &&TARGET_STORE_FAST_LOAD_FAST,
+ &&TARGET_STORE_FAST_STORE_FAST,
&&TARGET_CALL,
&&TARGET_KW_NAMES,
&&TARGET_CALL_INTRINSIC_1,
diff --git a/Python/specialize.c b/Python/specialize.c
index f1684913b1bc3..e5c6d68fc8ff3 100644
--- a/Python/specialize.c
+++ b/Python/specialize.c
@@ -289,15 +289,6 @@ _PyCode_Quicken(PyCodeObject *code)
case LOAD_FAST << 8 | LOAD_CONST:
instructions[i - 1].op.code = LOAD_FAST__LOAD_CONST;
break;
- case LOAD_FAST << 8 | LOAD_FAST:
- instructions[i - 1].op.code = LOAD_FAST__LOAD_FAST;
- break;
- case STORE_FAST << 8 | LOAD_FAST:
- instructions[i - 1].op.code = STORE_FAST__LOAD_FAST;
- break;
- case STORE_FAST << 8 | STORE_FAST:
- instructions[i - 1].op.code = STORE_FAST__STORE_FAST;
- break;
}
}
#endif /* ENABLE_SPECIALIZATION */
@@ -1914,8 +1905,7 @@ _Py_Specialize_BinaryOp(PyObject *lhs, PyObject *rhs, _Py_CODEUNIT *instr,
}
if (PyUnicode_CheckExact(lhs)) {
_Py_CODEUNIT next = instr[INLINE_CACHE_ENTRIES_BINARY_OP + 1];
- bool to_store = (next.op.code == STORE_FAST ||
- next.op.code == STORE_FAST__LOAD_FAST);
+ bool to_store = (next.op.code == STORE_FAST);
if (to_store && locals[next.op.arg] == lhs) {
instr->op.code = BINARY_OP_INPLACE_ADD_UNICODE;
goto success;
More information about the Python-checkins
mailing list