[Python-checkins] bpo-45923: Handle call events in bytecode (GH-30364)
markshannon
webhook-mailer at python.org
Thu Jan 6 08:09:33 EST 2022
https://github.com/python/cpython/commit/e028ae99ecee671c0e8a3eabb829b5b2acfc4441
commit: e028ae99ecee671c0e8a3eabb829b5b2acfc4441
branch: main
author: Mark Shannon <mark at hotpy.org>
committer: markshannon <mark at hotpy.org>
date: 2022-01-06T13:09:25Z
summary:
bpo-45923: Handle call events in bytecode (GH-30364)
* Add a RESUME instruction to handle "call" events.
files:
A Misc/NEWS.d/next/Core and Builtins/2022-01-04-14-08-10.bpo-45923.rBp7r1.rst
M Doc/library/dis.rst
M Include/opcode.h
M Lib/importlib/_bootstrap_external.py
M Lib/opcode.py
M Lib/test/test_code.py
M Lib/test/test_compile.py
M Lib/test/test_dis.py
M PC/launcher.c
M Programs/test_frozenmain.h
M Python/ceval.c
M Python/compile.c
M Python/opcode_targets.h
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 7afa62f95bc64..6bbe4ecbe8a1f 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -1206,6 +1206,20 @@ All of the following opcodes use their arguments.
.. versionadded:: 3.11
+.. opcode:: RESUME (where)
+
+ A no-op. Performs internal tracing, debugging and optimization checks.
+
+ The ``where`` operand marks where the ``RESUME`` occurs:
+
+ * ``0`` The start of a function
+ * ``1`` After a ``yield`` expression
+ * ``2`` After a ``yield from`` expression
+ * ``3`` After an ``await`` expression
+
+ .. versionadded:: 3.11
+
+
.. opcode:: HAVE_ARGUMENT
This is not really an opcode. It identifies the dividing line between
diff --git a/Include/opcode.h b/Include/opcode.h
index e4deeec932cea..5cc885597ac35 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -101,6 +101,7 @@ extern "C" {
#define MAP_ADD 147
#define LOAD_CLASSDEREF 148
#define COPY_FREE_VARS 149
+#define RESUME 151
#define MATCH_CLASS 152
#define FORMAT_VALUE 155
#define BUILD_CONST_KEY_MAP 156
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index 8e21be5916d31..5aea0c4f92477 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@ -379,16 +379,21 @@ def _write_atomic(path, data, mode=0o666):
# Python 3.11a4 3471 (bpo-46202: remove pop POP_EXCEPT_AND_RERAISE)
# Python 3.11a4 3472 (bpo-46009: replace GEN_START with POP_TOP)
# Python 3.11a4 3473 (Add POP_JUMP_IF_NOT_NONE/POP_JUMP_IF_NONE opcodes)
+# Python 3.11a4 3474 (Add RESUME opcode)
+
+# Python 3.12 will start with magic number 3500
#
# MAGIC must change whenever the bytecode emitted by the compiler may no
# longer be understood by older implementations of the eval loop (usually
# due to the addition of new opcodes).
#
+# Starting with Python 3.11, Python 3.n starts with magic number 2900+50n.
+#
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
# in PC/launcher.c must also be updated.
-MAGIC_NUMBER = (3473).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3474).to_bytes(2, 'little') + b'\r\n'
_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c
_PYCACHE = '__pycache__'
diff --git a/Lib/opcode.py b/Lib/opcode.py
index 6030743b35c5b..7f39a7bfe2e8c 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -178,6 +178,7 @@ def jabs_op(name, op):
hasfree.append(148)
def_op('COPY_FREE_VARS', 149)
+def_op('RESUME', 151)
def_op('MATCH_CLASS', 152)
def_op('FORMAT_VALUE', 155)
diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 88f6c782a68e4..9319f200e34fb 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -367,7 +367,7 @@ def test_co_positions_artificial_instructions(self):
# get assigned the first_lineno but they don't have other positions.
# There is no easy way of inferring them at that stage, so for now
# we don't support it.
- self.assertTrue(positions.count(None) in [0, 4])
+ self.assertIn(positions.count(None), [0, 3, 4])
if not any(positions):
artificial_instructions.append(instr)
@@ -378,6 +378,7 @@ def test_co_positions_artificial_instructions(self):
for instruction in artificial_instructions
],
[
+ ('RESUME', 0),
("PUSH_EXC_INFO", None),
("LOAD_CONST", None), # artificial 'None'
("STORE_NAME", "e"), # XX: we know the location for this
@@ -419,7 +420,9 @@ def test_co_positions_empty_linetable(self):
def func():
x = 1
new_code = func.__code__.replace(co_linetable=b'')
- for line, end_line, column, end_column in new_code.co_positions():
+ positions = new_code.co_positions()
+ next(positions) # Skip RESUME at start
+ for line, end_line, column, end_column in positions:
self.assertIsNone(line)
self.assertEqual(end_line, new_code.co_firstlineno + 1)
@@ -428,7 +431,9 @@ def test_co_positions_empty_endlinetable(self):
def func():
x = 1
new_code = func.__code__.replace(co_endlinetable=b'')
- for line, end_line, column, end_column in new_code.co_positions():
+ positions = new_code.co_positions()
+ next(positions) # Skip RESUME at start
+ for line, end_line, column, end_column in positions:
self.assertEqual(line, new_code.co_firstlineno + 1)
self.assertIsNone(end_line)
@@ -437,7 +442,9 @@ def test_co_positions_empty_columntable(self):
def func():
x = 1
new_code = func.__code__.replace(co_columntable=b'')
- for line, end_line, column, end_column in new_code.co_positions():
+ positions = new_code.co_positions()
+ next(positions) # Skip RESUME at start
+ for line, end_line, column, end_column in positions:
self.assertEqual(line, new_code.co_firstlineno + 1)
self.assertEqual(end_line, new_code.co_firstlineno + 1)
self.assertIsNone(column)
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 11615b32232e8..e237156c75f8b 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -158,7 +158,7 @@ def test_leading_newlines(self):
s256 = "".join(["\n"] * 256 + ["spam"])
co = compile(s256, 'fn', 'exec')
self.assertEqual(co.co_firstlineno, 1)
- self.assertEqual(list(co.co_lines()), [(0, 8, 257)])
+ self.assertEqual(list(co.co_lines()), [(0, 2, None), (2, 10, 257)])
def test_literals_with_leading_zeroes(self):
for arg in ["077787", "0xj", "0x.", "0e", "090000000000000",
@@ -759,7 +759,7 @@ def unused_block_while_else():
for func in funcs:
opcodes = list(dis.get_instructions(func))
- self.assertLessEqual(len(opcodes), 3)
+ self.assertLessEqual(len(opcodes), 4)
self.assertEqual('LOAD_CONST', opcodes[-2].opname)
self.assertEqual(None, opcodes[-2].argval)
self.assertEqual('RETURN_VALUE', opcodes[-1].opname)
@@ -778,10 +778,10 @@ def continue_in_while():
# Check that we did not raise but we also don't generate bytecode
for func in funcs:
opcodes = list(dis.get_instructions(func))
- self.assertEqual(2, len(opcodes))
- self.assertEqual('LOAD_CONST', opcodes[0].opname)
- self.assertEqual(None, opcodes[0].argval)
- self.assertEqual('RETURN_VALUE', opcodes[1].opname)
+ self.assertEqual(3, len(opcodes))
+ self.assertEqual('LOAD_CONST', opcodes[1].opname)
+ self.assertEqual(None, opcodes[1].argval)
+ self.assertEqual('RETURN_VALUE', opcodes[2].opname)
def test_consts_in_conditionals(self):
def and_true(x):
@@ -802,9 +802,9 @@ def or_false(x):
for func in funcs:
with self.subTest(func=func):
opcodes = list(dis.get_instructions(func))
- self.assertEqual(2, len(opcodes))
- self.assertIn('LOAD_', opcodes[0].opname)
- self.assertEqual('RETURN_VALUE', opcodes[1].opname)
+ self.assertLessEqual(len(opcodes), 3)
+ self.assertIn('LOAD_', opcodes[-2].opname)
+ self.assertEqual('RETURN_VALUE', opcodes[-1].opname)
def test_imported_load_method(self):
sources = [
@@ -906,7 +906,7 @@ def load_attr():
o.
a
)
- load_attr_lines = [ 2, 3, 1 ]
+ load_attr_lines = [ 0, 2, 3, 1 ]
def load_method():
return (
@@ -915,7 +915,7 @@ def load_method():
0
)
)
- load_method_lines = [ 2, 3, 4, 3, 1 ]
+ load_method_lines = [ 0, 2, 3, 4, 3, 1 ]
def store_attr():
(
@@ -924,7 +924,7 @@ def store_attr():
) = (
v
)
- store_attr_lines = [ 5, 2, 3 ]
+ store_attr_lines = [ 0, 5, 2, 3 ]
def aug_store_attr():
(
@@ -933,7 +933,7 @@ def aug_store_attr():
) += (
v
)
- aug_store_attr_lines = [ 2, 3, 5, 1, 3 ]
+ aug_store_attr_lines = [ 0, 2, 3, 5, 1, 3 ]
funcs = [ load_attr, load_method, store_attr, aug_store_attr]
func_lines = [ load_attr_lines, load_method_lines,
@@ -942,7 +942,8 @@ def aug_store_attr():
for func, lines in zip(funcs, func_lines, strict=True):
with self.subTest(func=func):
code_lines = [ line-func.__code__.co_firstlineno
- for (_, _, line) in func.__code__.co_lines() ]
+ for (_, _, line) in func.__code__.co_lines()
+ if line is not None ]
self.assertEqual(lines, code_lines)
def test_line_number_genexp(self):
@@ -966,7 +967,7 @@ async def test(aseq):
async for i in aseq:
body
- expected_lines = [None, 1, 2, 1]
+ expected_lines = [None, 0, 1, 2, 1]
code_lines = [ None if line is None else line-test.__code__.co_firstlineno
for (_, _, line) in test.__code__.co_lines() ]
self.assertEqual(expected_lines, code_lines)
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 7857458e240a5..c4473a4c261ad 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -38,43 +38,50 @@ def cm(cls, x):
cls.x = x == 1
dis_c_instance_method = """\
-%3d 0 LOAD_FAST 1 (x)
- 2 LOAD_CONST 1 (1)
- 4 COMPARE_OP 2 (==)
- 6 LOAD_FAST 0 (self)
- 8 STORE_ATTR 0 (x)
- 10 LOAD_CONST 0 (None)
- 12 RETURN_VALUE
-""" % (_C.__init__.__code__.co_firstlineno + 1,)
+%3d 0 RESUME 0
+
+%3d 2 LOAD_FAST 1 (x)
+ 4 LOAD_CONST 1 (1)
+ 6 COMPARE_OP 2 (==)
+ 8 LOAD_FAST 0 (self)
+ 10 STORE_ATTR 0 (x)
+ 12 LOAD_CONST 0 (None)
+ 14 RETURN_VALUE
+""" % (_C.__init__.__code__.co_firstlineno, _C.__init__.__code__.co_firstlineno + 1,)
dis_c_instance_method_bytes = """\
- 0 LOAD_FAST 1
- 2 LOAD_CONST 1
- 4 COMPARE_OP 2 (==)
- 6 LOAD_FAST 0
- 8 STORE_ATTR 0
- 10 LOAD_CONST 0
- 12 RETURN_VALUE
+ 0 RESUME 0
+ 2 LOAD_FAST 1
+ 4 LOAD_CONST 1
+ 6 COMPARE_OP 2 (==)
+ 8 LOAD_FAST 0
+ 10 STORE_ATTR 0
+ 12 LOAD_CONST 0
+ 14 RETURN_VALUE
"""
dis_c_class_method = """\
-%3d 0 LOAD_FAST 1 (x)
- 2 LOAD_CONST 1 (1)
- 4 COMPARE_OP 2 (==)
- 6 LOAD_FAST 0 (cls)
- 8 STORE_ATTR 0 (x)
- 10 LOAD_CONST 0 (None)
- 12 RETURN_VALUE
-""" % (_C.cm.__code__.co_firstlineno + 2,)
+%3d 0 RESUME 0
+
+%3d 2 LOAD_FAST 1 (x)
+ 4 LOAD_CONST 1 (1)
+ 6 COMPARE_OP 2 (==)
+ 8 LOAD_FAST 0 (cls)
+ 10 STORE_ATTR 0 (x)
+ 12 LOAD_CONST 0 (None)
+ 14 RETURN_VALUE
+""" % (_C.cm.__code__.co_firstlineno, _C.cm.__code__.co_firstlineno + 2,)
dis_c_static_method = """\
-%3d 0 LOAD_FAST 0 (x)
- 2 LOAD_CONST 1 (1)
- 4 COMPARE_OP 2 (==)
- 6 STORE_FAST 0 (x)
- 8 LOAD_CONST 0 (None)
- 10 RETURN_VALUE
-""" % (_C.sm.__code__.co_firstlineno + 2,)
+%3d 0 RESUME 0
+
+%3d 2 LOAD_FAST 0 (x)
+ 4 LOAD_CONST 1 (1)
+ 6 COMPARE_OP 2 (==)
+ 8 STORE_FAST 0 (x)
+ 10 LOAD_CONST 0 (None)
+ 12 RETURN_VALUE
+""" % (_C.sm.__code__.co_firstlineno, _C.sm.__code__.co_firstlineno + 2,)
# Class disassembling info has an extra newline at end.
dis_c = """\
@@ -93,24 +100,28 @@ def _f(a):
return 1
dis_f = """\
-%3d 0 LOAD_GLOBAL 0 (print)
- 2 LOAD_FAST 0 (a)
- 4 CALL_NO_KW 1
- 6 POP_TOP
-
-%3d 8 LOAD_CONST 1 (1)
- 10 RETURN_VALUE
-""" % (_f.__code__.co_firstlineno + 1,
+%3d 0 RESUME 0
+
+%3d 2 LOAD_GLOBAL 0 (print)
+ 4 LOAD_FAST 0 (a)
+ 6 CALL_NO_KW 1
+ 8 POP_TOP
+
+%3d 10 LOAD_CONST 1 (1)
+ 12 RETURN_VALUE
+""" % (_f.__code__.co_firstlineno,
+ _f.__code__.co_firstlineno + 1,
_f.__code__.co_firstlineno + 2)
dis_f_co_code = """\
- 0 LOAD_GLOBAL 0
- 2 LOAD_FAST 0
- 4 CALL_NO_KW 1
- 6 POP_TOP
- 8 LOAD_CONST 1
- 10 RETURN_VALUE
+ 0 RESUME 0
+ 2 LOAD_GLOBAL 0
+ 4 LOAD_FAST 0
+ 6 CALL_NO_KW 1
+ 8 POP_TOP
+ 10 LOAD_CONST 1
+ 12 RETURN_VALUE
"""
@@ -120,21 +131,24 @@ def bug708901():
pass
dis_bug708901 = """\
-%3d 0 LOAD_GLOBAL 0 (range)
- 2 LOAD_CONST 1 (1)
+%3d 0 RESUME 0
+
+%3d 2 LOAD_GLOBAL 0 (range)
+ 4 LOAD_CONST 1 (1)
-%3d 4 LOAD_CONST 2 (10)
+%3d 6 LOAD_CONST 2 (10)
-%3d 6 CALL_NO_KW 2
- 8 GET_ITER
- >> 10 FOR_ITER 2 (to 16)
- 12 STORE_FAST 0 (res)
+%3d 8 CALL_NO_KW 2
+ 10 GET_ITER
+ >> 12 FOR_ITER 2 (to 18)
+ 14 STORE_FAST 0 (res)
-%3d 14 JUMP_ABSOLUTE 5 (to 10)
+%3d 16 JUMP_ABSOLUTE 6 (to 12)
-%3d >> 16 LOAD_CONST 0 (None)
- 18 RETURN_VALUE
-""" % (bug708901.__code__.co_firstlineno + 1,
+%3d >> 18 LOAD_CONST 0 (None)
+ 20 RETURN_VALUE
+""" % (bug708901.__code__.co_firstlineno,
+ bug708901.__code__.co_firstlineno + 1,
bug708901.__code__.co_firstlineno + 2,
bug708901.__code__.co_firstlineno + 1,
bug708901.__code__.co_firstlineno + 3,
@@ -147,19 +161,22 @@ def bug1333982(x=[]):
pass
dis_bug1333982 = """\
-%3d 0 LOAD_ASSERTION_ERROR
- 2 LOAD_CONST 2 (<code object <listcomp> at 0x..., file "%s", line %d>)
- 4 MAKE_FUNCTION 0
- 6 LOAD_FAST 0 (x)
- 8 GET_ITER
- 10 CALL_NO_KW 1
-
-%3d 12 LOAD_CONST 3 (1)
-
-%3d 14 BINARY_OP 0 (+)
- 16 CALL_NO_KW 1
- 18 RAISE_VARARGS 1
-""" % (bug1333982.__code__.co_firstlineno + 1,
+%3d 0 RESUME 0
+
+%3d 2 LOAD_ASSERTION_ERROR
+ 4 LOAD_CONST 2 (<code object <listcomp> at 0x..., file "%s", line %d>)
+ 6 MAKE_FUNCTION 0
+ 8 LOAD_FAST 0 (x)
+ 10 GET_ITER
+ 12 CALL_NO_KW 1
+
+%3d 14 LOAD_CONST 3 (1)
+
+%3d 16 BINARY_OP 0 (+)
+ 18 CALL_NO_KW 1
+ 20 RAISE_VARARGS 1
+""" % (bug1333982.__code__.co_firstlineno,
+ bug1333982.__code__.co_firstlineno + 1,
__file__,
bug1333982.__code__.co_firstlineno + 1,
bug1333982.__code__.co_firstlineno + 2,
@@ -175,8 +192,9 @@ def bug42562():
dis_bug42562 = """\
- 0 LOAD_CONST 0 (None)
- 2 RETURN_VALUE
+ 0 RESUME 0
+ 2 LOAD_CONST 0 (None)
+ 4 RETURN_VALUE
"""
# Extended arg followed by NOP
@@ -197,48 +215,58 @@ def bug42562():
"""
_BIG_LINENO_FORMAT = """\
-%3d 0 LOAD_GLOBAL 0 (spam)
- 2 POP_TOP
- 4 LOAD_CONST 0 (None)
- 6 RETURN_VALUE
+ 1 0 RESUME 0
+
+%3d 2 LOAD_GLOBAL 0 (spam)
+ 4 POP_TOP
+ 6 LOAD_CONST 0 (None)
+ 8 RETURN_VALUE
"""
_BIG_LINENO_FORMAT2 = """\
-%4d 0 LOAD_GLOBAL 0 (spam)
- 2 POP_TOP
- 4 LOAD_CONST 0 (None)
- 6 RETURN_VALUE
+ 1 0 RESUME 0
+
+%4d 2 LOAD_GLOBAL 0 (spam)
+ 4 POP_TOP
+ 6 LOAD_CONST 0 (None)
+ 8 RETURN_VALUE
"""
dis_module_expected_results = """\
Disassembly of f:
- 4 0 LOAD_CONST 0 (None)
- 2 RETURN_VALUE
+ 4 0 RESUME 0
+ 2 LOAD_CONST 0 (None)
+ 4 RETURN_VALUE
Disassembly of g:
- 5 0 LOAD_CONST 0 (None)
- 2 RETURN_VALUE
+ 5 0 RESUME 0
+ 2 LOAD_CONST 0 (None)
+ 4 RETURN_VALUE
"""
expr_str = "x + 1"
dis_expr_str = """\
- 1 0 LOAD_NAME 0 (x)
- 2 LOAD_CONST 0 (1)
- 4 BINARY_OP 0 (+)
- 6 RETURN_VALUE
+ 0 RESUME 0
+
+ 1 2 LOAD_NAME 0 (x)
+ 4 LOAD_CONST 0 (1)
+ 6 BINARY_OP 0 (+)
+ 8 RETURN_VALUE
"""
simple_stmt_str = "x = x + 1"
dis_simple_stmt_str = """\
- 1 0 LOAD_NAME 0 (x)
- 2 LOAD_CONST 0 (1)
- 4 BINARY_OP 0 (+)
- 6 STORE_NAME 0 (x)
- 8 LOAD_CONST 1 (None)
- 10 RETURN_VALUE
+ 0 RESUME 0
+
+ 1 2 LOAD_NAME 0 (x)
+ 4 LOAD_CONST 0 (1)
+ 6 BINARY_OP 0 (+)
+ 8 STORE_NAME 0 (x)
+ 10 LOAD_CONST 1 (None)
+ 12 RETURN_VALUE
"""
annot_stmt_str = """\
@@ -250,31 +278,33 @@ def bug42562():
# leading newline is for a reason (tests lineno)
dis_annot_stmt_str = """\
- 2 0 SETUP_ANNOTATIONS
- 2 LOAD_CONST 0 (1)
- 4 STORE_NAME 0 (x)
- 6 LOAD_NAME 1 (int)
- 8 LOAD_NAME 2 (__annotations__)
- 10 LOAD_CONST 1 ('x')
- 12 STORE_SUBSCR
+ 0 RESUME 0
- 3 14 LOAD_NAME 3 (fun)
- 16 LOAD_CONST 0 (1)
- 18 CALL_NO_KW 1
- 20 LOAD_NAME 2 (__annotations__)
- 22 LOAD_CONST 2 ('y')
- 24 STORE_SUBSCR
-
- 4 26 LOAD_CONST 0 (1)
- 28 LOAD_NAME 4 (lst)
- 30 LOAD_NAME 3 (fun)
- 32 LOAD_CONST 3 (0)
- 34 CALL_NO_KW 1
- 36 STORE_SUBSCR
- 38 LOAD_NAME 1 (int)
- 40 POP_TOP
- 42 LOAD_CONST 4 (None)
- 44 RETURN_VALUE
+ 2 2 SETUP_ANNOTATIONS
+ 4 LOAD_CONST 0 (1)
+ 6 STORE_NAME 0 (x)
+ 8 LOAD_NAME 1 (int)
+ 10 LOAD_NAME 2 (__annotations__)
+ 12 LOAD_CONST 1 ('x')
+ 14 STORE_SUBSCR
+
+ 3 16 LOAD_NAME 3 (fun)
+ 18 LOAD_CONST 0 (1)
+ 20 CALL_NO_KW 1
+ 22 LOAD_NAME 2 (__annotations__)
+ 24 LOAD_CONST 2 ('y')
+ 26 STORE_SUBSCR
+
+ 4 28 LOAD_CONST 0 (1)
+ 30 LOAD_NAME 4 (lst)
+ 32 LOAD_NAME 3 (fun)
+ 34 LOAD_CONST 3 (0)
+ 36 CALL_NO_KW 1
+ 38 STORE_SUBSCR
+ 40 LOAD_NAME 1 (int)
+ 42 POP_TOP
+ 44 LOAD_CONST 4 (None)
+ 46 RETURN_VALUE
"""
compound_stmt_str = """\
@@ -284,60 +314,65 @@ def bug42562():
# Trailing newline has been deliberately omitted
dis_compound_stmt_str = """\
- 1 0 LOAD_CONST 0 (0)
- 2 STORE_NAME 0 (x)
+ 0 RESUME 0
+
+ 1 2 LOAD_CONST 0 (0)
+ 4 STORE_NAME 0 (x)
- 2 4 NOP
+ 2 6 NOP
- 3 >> 6 LOAD_NAME 0 (x)
- 8 LOAD_CONST 1 (1)
- 10 BINARY_OP 13 (+=)
- 12 STORE_NAME 0 (x)
+ 3 >> 8 LOAD_NAME 0 (x)
+ 10 LOAD_CONST 1 (1)
+ 12 BINARY_OP 13 (+=)
+ 14 STORE_NAME 0 (x)
- 2 14 JUMP_ABSOLUTE 3 (to 6)
+ 2 16 JUMP_ABSOLUTE 4 (to 8)
"""
dis_traceback = """\
-%3d 0 NOP
-
-%3d 2 LOAD_CONST 1 (1)
- 4 LOAD_CONST 2 (0)
- --> 6 BINARY_OP 11 (/)
- 8 POP_TOP
+%3d 0 RESUME 0
-%3d 10 LOAD_FAST 1 (tb)
- 12 RETURN_VALUE
- >> 14 PUSH_EXC_INFO
+%3d 2 NOP
-%3d 16 LOAD_GLOBAL 0 (Exception)
- 18 JUMP_IF_NOT_EXC_MATCH 24 (to 48)
- 20 STORE_FAST 0 (e)
+%3d 4 LOAD_CONST 1 (1)
+ 6 LOAD_CONST 2 (0)
+ --> 8 BINARY_OP 11 (/)
+ 10 POP_TOP
-%3d 22 LOAD_FAST 0 (e)
- 24 LOAD_ATTR 1 (__traceback__)
- 26 STORE_FAST 1 (tb)
- 28 POP_EXCEPT
- 30 LOAD_CONST 0 (None)
- 32 STORE_FAST 0 (e)
- 34 DELETE_FAST 0 (e)
-
-%3d 36 LOAD_FAST 1 (tb)
- 38 RETURN_VALUE
- >> 40 LOAD_CONST 0 (None)
- 42 STORE_FAST 0 (e)
- 44 DELETE_FAST 0 (e)
- 46 RERAISE 1
-
-%3d >> 48 RERAISE 0
- >> 50 COPY 3
- 52 POP_EXCEPT
- 54 RERAISE 1
+%3d 12 LOAD_FAST 1 (tb)
+ 14 RETURN_VALUE
+ >> 16 PUSH_EXC_INFO
+
+%3d 18 LOAD_GLOBAL 0 (Exception)
+ 20 JUMP_IF_NOT_EXC_MATCH 25 (to 50)
+ 22 STORE_FAST 0 (e)
+
+%3d 24 LOAD_FAST 0 (e)
+ 26 LOAD_ATTR 1 (__traceback__)
+ 28 STORE_FAST 1 (tb)
+ 30 POP_EXCEPT
+ 32 LOAD_CONST 0 (None)
+ 34 STORE_FAST 0 (e)
+ 36 DELETE_FAST 0 (e)
+
+%3d 38 LOAD_FAST 1 (tb)
+ 40 RETURN_VALUE
+ >> 42 LOAD_CONST 0 (None)
+ 44 STORE_FAST 0 (e)
+ 46 DELETE_FAST 0 (e)
+ 48 RERAISE 1
+
+%3d >> 50 RERAISE 0
+ >> 52 COPY 3
+ 54 POP_EXCEPT
+ 56 RERAISE 1
ExceptionTable:
- 2 to 8 -> 14 [0]
- 14 to 20 -> 50 [1] lasti
- 22 to 26 -> 40 [1] lasti
- 40 to 48 -> 50 [1] lasti
-""" % (TRACEBACK_CODE.co_firstlineno + 1,
+ 4 to 10 -> 16 [0]
+ 16 to 22 -> 52 [1] lasti
+ 24 to 28 -> 42 [1] lasti
+ 42 to 50 -> 52 [1] lasti
+""" % (TRACEBACK_CODE.co_firstlineno,
+ TRACEBACK_CODE.co_firstlineno + 1,
TRACEBACK_CODE.co_firstlineno + 2,
TRACEBACK_CODE.co_firstlineno + 5,
TRACEBACK_CODE.co_firstlineno + 3,
@@ -349,22 +384,24 @@ def _fstring(a, b, c, d):
return f'{a} {b:4} {c!r} {d!r:4}'
dis_fstring = """\
-%3d 0 LOAD_FAST 0 (a)
- 2 FORMAT_VALUE 0
- 4 LOAD_CONST 1 (' ')
- 6 LOAD_FAST 1 (b)
- 8 LOAD_CONST 2 ('4')
- 10 FORMAT_VALUE 4 (with format)
- 12 LOAD_CONST 1 (' ')
- 14 LOAD_FAST 2 (c)
- 16 FORMAT_VALUE 2 (repr)
- 18 LOAD_CONST 1 (' ')
- 20 LOAD_FAST 3 (d)
- 22 LOAD_CONST 2 ('4')
- 24 FORMAT_VALUE 6 (repr, with format)
- 26 BUILD_STRING 7
- 28 RETURN_VALUE
-""" % (_fstring.__code__.co_firstlineno + 1,)
+%3d 0 RESUME 0
+
+%3d 2 LOAD_FAST 0 (a)
+ 4 FORMAT_VALUE 0
+ 6 LOAD_CONST 1 (' ')
+ 8 LOAD_FAST 1 (b)
+ 10 LOAD_CONST 2 ('4')
+ 12 FORMAT_VALUE 4 (with format)
+ 14 LOAD_CONST 1 (' ')
+ 16 LOAD_FAST 2 (c)
+ 18 FORMAT_VALUE 2 (repr)
+ 20 LOAD_CONST 1 (' ')
+ 22 LOAD_FAST 3 (d)
+ 24 LOAD_CONST 2 ('4')
+ 26 FORMAT_VALUE 6 (repr, with format)
+ 28 BUILD_STRING 7
+ 30 RETURN_VALUE
+""" % (_fstring.__code__.co_firstlineno, _fstring.__code__.co_firstlineno + 1)
def _tryfinally(a, b):
try:
@@ -379,42 +416,18 @@ def _tryfinallyconst(b):
b()
dis_tryfinally = """\
-%3d 0 NOP
-
-%3d 2 LOAD_FAST 0 (a)
-
-%3d 4 LOAD_FAST 1 (b)
- 6 CALL_NO_KW 0
- 8 POP_TOP
- 10 RETURN_VALUE
- >> 12 PUSH_EXC_INFO
- 14 LOAD_FAST 1 (b)
- 16 CALL_NO_KW 0
- 18 POP_TOP
- 20 RERAISE 0
- >> 22 COPY 3
- 24 POP_EXCEPT
- 26 RERAISE 1
-ExceptionTable:
- 2 to 2 -> 12 [0]
- 12 to 20 -> 22 [1] lasti
-""" % (_tryfinally.__code__.co_firstlineno + 1,
- _tryfinally.__code__.co_firstlineno + 2,
- _tryfinally.__code__.co_firstlineno + 4,
- )
-
-dis_tryfinallyconst = """\
-%3d 0 NOP
+%3d 0 RESUME 0
%3d 2 NOP
-%3d 4 LOAD_FAST 0 (b)
- 6 CALL_NO_KW 0
- 8 POP_TOP
- 10 LOAD_CONST 1 (1)
+%3d 4 LOAD_FAST 0 (a)
+
+%3d 6 LOAD_FAST 1 (b)
+ 8 CALL_NO_KW 0
+ 10 POP_TOP
12 RETURN_VALUE
- 14 PUSH_EXC_INFO
- 16 LOAD_FAST 0 (b)
+ >> 14 PUSH_EXC_INFO
+ 16 LOAD_FAST 1 (b)
18 CALL_NO_KW 0
20 POP_TOP
22 RERAISE 0
@@ -422,8 +435,38 @@ def _tryfinallyconst(b):
26 POP_EXCEPT
28 RERAISE 1
ExceptionTable:
+ 4 to 4 -> 14 [0]
14 to 22 -> 24 [1] lasti
-""" % (_tryfinallyconst.__code__.co_firstlineno + 1,
+""" % (_tryfinally.__code__.co_firstlineno,
+ _tryfinally.__code__.co_firstlineno + 1,
+ _tryfinally.__code__.co_firstlineno + 2,
+ _tryfinally.__code__.co_firstlineno + 4,
+ )
+
+dis_tryfinallyconst = """\
+%3d 0 RESUME 0
+
+%3d 2 NOP
+
+%3d 4 NOP
+
+%3d 6 LOAD_FAST 0 (b)
+ 8 CALL_NO_KW 0
+ 10 POP_TOP
+ 12 LOAD_CONST 1 (1)
+ 14 RETURN_VALUE
+ 16 PUSH_EXC_INFO
+ 18 LOAD_FAST 0 (b)
+ 20 CALL_NO_KW 0
+ 22 POP_TOP
+ 24 RERAISE 0
+ >> 26 COPY 3
+ 28 POP_EXCEPT
+ 30 RERAISE 1
+ExceptionTable:
+ 16 to 24 -> 26 [1] lasti
+""" % (_tryfinallyconst.__code__.co_firstlineno,
+ _tryfinallyconst.__code__.co_firstlineno + 1,
_tryfinallyconst.__code__.co_firstlineno + 2,
_tryfinallyconst.__code__.co_firstlineno + 4,
)
@@ -447,15 +490,18 @@ def foo(x):
dis_nested_0 = """\
0 MAKE_CELL 0 (y)
-%3d 2 LOAD_CLOSURE 0 (y)
- 4 BUILD_TUPLE 1
- 6 LOAD_CONST 1 (<code object foo at 0x..., file "%s", line %d>)
- 8 MAKE_FUNCTION 8 (closure)
- 10 STORE_FAST 1 (foo)
+%3d 2 RESUME 0
-%3d 12 LOAD_FAST 1 (foo)
- 14 RETURN_VALUE
-""" % (_h.__code__.co_firstlineno + 1,
+%3d 4 LOAD_CLOSURE 0 (y)
+ 6 BUILD_TUPLE 1
+ 8 LOAD_CONST 1 (<code object foo at 0x..., file "%s", line %d>)
+ 10 MAKE_FUNCTION 8 (closure)
+ 12 STORE_FAST 1 (foo)
+
+%3d 14 LOAD_FAST 1 (foo)
+ 16 RETURN_VALUE
+""" % (_h.__code__.co_firstlineno,
+ _h.__code__.co_firstlineno + 1,
__file__,
_h.__code__.co_firstlineno + 1,
_h.__code__.co_firstlineno + 4,
@@ -466,17 +512,20 @@ def foo(x):
0 COPY_FREE_VARS 1
2 MAKE_CELL 0 (x)
-%3d 4 LOAD_CLOSURE 0 (x)
- 6 BUILD_TUPLE 1
- 8 LOAD_CONST 1 (<code object <listcomp> at 0x..., file "%s", line %d>)
- 10 MAKE_FUNCTION 8 (closure)
- 12 LOAD_DEREF 1 (y)
- 14 GET_ITER
- 16 CALL_NO_KW 1
- 18 RETURN_VALUE
+%3d 4 RESUME 0
+
+%3d 6 LOAD_CLOSURE 0 (x)
+ 8 BUILD_TUPLE 1
+ 10 LOAD_CONST 1 (<code object <listcomp> at 0x..., file "%s", line %d>)
+ 12 MAKE_FUNCTION 8 (closure)
+ 14 LOAD_DEREF 1 (y)
+ 16 GET_ITER
+ 18 CALL_NO_KW 1
+ 20 RETURN_VALUE
""" % (dis_nested_0,
__file__,
_h.__code__.co_firstlineno + 1,
+ _h.__code__.co_firstlineno + 1,
_h.__code__.co_firstlineno + 3,
__file__,
_h.__code__.co_firstlineno + 3,
@@ -486,16 +535,17 @@ def foo(x):
Disassembly of <code object <listcomp> at 0x..., file "%s", line %d>:
0 COPY_FREE_VARS 1
-%3d 2 BUILD_LIST 0
- 4 LOAD_FAST 0 (.0)
- >> 6 FOR_ITER 6 (to 20)
- 8 STORE_FAST 1 (z)
- 10 LOAD_DEREF 2 (x)
- 12 LOAD_FAST 1 (z)
- 14 BINARY_OP 0 (+)
- 16 LIST_APPEND 2
- 18 JUMP_ABSOLUTE 3 (to 6)
- >> 20 RETURN_VALUE
+%3d 2 RESUME 0
+ 4 BUILD_LIST 0
+ 6 LOAD_FAST 0 (.0)
+ >> 8 FOR_ITER 6 (to 22)
+ 10 STORE_FAST 1 (z)
+ 12 LOAD_DEREF 2 (x)
+ 14 LOAD_FAST 1 (z)
+ 16 BINARY_OP 0 (+)
+ 18 LIST_APPEND 2
+ 20 JUMP_ABSOLUTE 4 (to 8)
+ >> 22 RETURN_VALUE
""" % (dis_nested_1,
__file__,
_h.__code__.co_firstlineno + 3,
@@ -524,6 +574,7 @@ def strip_addresses(self, text):
return re.sub(r'\b0x[0-9A-Fa-f]+\b', '0x...', text)
def do_disassembly_test(self, func, expected):
+ self.maxDiff = None
got = self.get_disassembly(func, depth=0)
if got != expected:
got = self.strip_addresses(got)
@@ -599,6 +650,7 @@ def func(count):
self.do_disassembly_test(dis_module, dis_module_expected_results)
def test_big_offsets(self):
+ self.maxDiff = None
def func(count):
namespace = {}
func = "def foo(x):\n " + ";".join(["x = x + 1"] * count) + "\n return x"
@@ -607,23 +659,27 @@ def func(count):
def expected(count, w):
s = ['''\
+ 1 %*d RESUME 0
+
+''' % (w, 0)]
+ s += ['''\
%*d LOAD_FAST 0 (x)
%*d LOAD_CONST 1 (1)
%*d BINARY_OP 0 (+)
%*d STORE_FAST 0 (x)
-''' % (w, 8*i, w, 8*i + 2, w, 8*i + 4, w, 8*i + 6)
+''' % (w, 8*i + 2, w, 8*i + 4, w, 8*i + 6, w, 8*i + 8)
for i in range(count)]
s += ['''\
3 %*d LOAD_FAST 0 (x)
%*d RETURN_VALUE
-''' % (w, 8*count, w, 8*count + 2)]
- s[0] = ' 2' + s[0][3:]
+''' % (w, 8*count + 2, w, 8*count + 4)]
+ s[1] = ' 2' + s[1][3:]
return ''.join(s)
for i in range(1, 5):
self.do_disassembly_test(func(i), expected(i, 4))
- self.do_disassembly_test(func(1249), expected(1249, 4))
+ self.do_disassembly_test(func(1248), expected(1248, 4))
self.do_disassembly_test(func(1250), expected(1250, 5))
def test_disassemble_str(self):
@@ -683,6 +739,7 @@ def test_dis_none(self):
self.assertRaises(RuntimeError, dis.dis, None)
def test_dis_traceback(self):
+ self.maxDiff = None
try:
del sys.last_traceback
except AttributeError:
@@ -993,191 +1050,197 @@ def _prepare_test_cases():
expected_opinfo_outer = [
Instruction(opname='MAKE_CELL', opcode=135, arg=0, argval='a', argrepr='a', offset=0, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='MAKE_CELL', opcode=135, arg=1, argval='b', argrepr='b', offset=2, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=(3, 4), argrepr='(3, 4)', offset=4, starts_line=2, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CLOSURE', opcode=136, arg=0, argval='a', argrepr='a', offset=6, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CLOSURE', opcode=136, arg=1, argval='b', argrepr='b', offset=8, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='BUILD_TUPLE', opcode=102, arg=2, argval=2, argrepr='', offset=10, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_f, argrepr=repr(code_object_f), offset=12, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='MAKE_FUNCTION', opcode=132, arg=9, argval=9, argrepr='defaults, closure', offset=14, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='f', argrepr='f', offset=16, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=18, starts_line=7, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_DEREF', opcode=137, arg=0, argval='a', argrepr='a', offset=20, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_DEREF', opcode=137, arg=1, argval='b', argrepr='b', offset=22, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='', argrepr="''", offset=24, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=26, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='BUILD_LIST', opcode=103, arg=0, argval=0, argrepr='', offset=28, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='BUILD_MAP', opcode=105, arg=0, argval=0, argrepr='', offset=30, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Hello world!', argrepr="'Hello world!'", offset=32, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=7, argval=7, argrepr='', offset=34, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=36, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='f', argrepr='f', offset=38, starts_line=8, is_jump_target=False, positions=None),
- Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=40, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RESUME', opcode=151, arg=0, argval=0, argrepr='', offset=4, starts_line=1, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=(3, 4), argrepr='(3, 4)', offset=6, starts_line=2, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CLOSURE', opcode=136, arg=0, argval='a', argrepr='a', offset=8, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CLOSURE', opcode=136, arg=1, argval='b', argrepr='b', offset=10, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='BUILD_TUPLE', opcode=102, arg=2, argval=2, argrepr='', offset=12, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_f, argrepr=repr(code_object_f), offset=14, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='MAKE_FUNCTION', opcode=132, arg=9, argval=9, argrepr='defaults, closure', offset=16, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='f', argrepr='f', offset=18, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=20, starts_line=7, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_DEREF', opcode=137, arg=0, argval='a', argrepr='a', offset=22, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_DEREF', opcode=137, arg=1, argval='b', argrepr='b', offset=24, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='', argrepr="''", offset=26, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=28, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='BUILD_LIST', opcode=103, arg=0, argval=0, argrepr='', offset=30, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='BUILD_MAP', opcode=105, arg=0, argval=0, argrepr='', offset=32, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Hello world!', argrepr="'Hello world!'", offset=34, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=7, argval=7, argrepr='', offset=36, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=38, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='f', argrepr='f', offset=40, starts_line=8, is_jump_target=False, positions=None),
+ Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=42, starts_line=None, is_jump_target=False, positions=None),
]
expected_opinfo_f = [
Instruction(opname='COPY_FREE_VARS', opcode=149, arg=2, argval=2, argrepr='', offset=0, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='MAKE_CELL', opcode=135, arg=0, argval='c', argrepr='c', offset=2, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='MAKE_CELL', opcode=135, arg=1, argval='d', argrepr='d', offset=4, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval=(5, 6), argrepr='(5, 6)', offset=6, starts_line=3, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CLOSURE', opcode=136, arg=3, argval='a', argrepr='a', offset=8, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CLOSURE', opcode=136, arg=4, argval='b', argrepr='b', offset=10, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CLOSURE', opcode=136, arg=0, argval='c', argrepr='c', offset=12, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CLOSURE', opcode=136, arg=1, argval='d', argrepr='d', offset=14, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='BUILD_TUPLE', opcode=102, arg=4, argval=4, argrepr='', offset=16, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_inner, argrepr=repr(code_object_inner), offset=18, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='MAKE_FUNCTION', opcode=132, arg=9, argval=9, argrepr='defaults, closure', offset=20, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='inner', argrepr='inner', offset=22, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=24, starts_line=5, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_DEREF', opcode=137, arg=3, argval='a', argrepr='a', offset=26, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_DEREF', opcode=137, arg=4, argval='b', argrepr='b', offset=28, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_DEREF', opcode=137, arg=0, argval='c', argrepr='c', offset=30, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_DEREF', opcode=137, arg=1, argval='d', argrepr='d', offset=32, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=4, argval=4, argrepr='', offset=34, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=36, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='inner', argrepr='inner', offset=38, starts_line=6, is_jump_target=False, positions=None),
- Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=40, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RESUME', opcode=151, arg=0, argval=0, argrepr='', offset=6, starts_line=2, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval=(5, 6), argrepr='(5, 6)', offset=8, starts_line=3, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CLOSURE', opcode=136, arg=3, argval='a', argrepr='a', offset=10, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CLOSURE', opcode=136, arg=4, argval='b', argrepr='b', offset=12, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CLOSURE', opcode=136, arg=0, argval='c', argrepr='c', offset=14, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CLOSURE', opcode=136, arg=1, argval='d', argrepr='d', offset=16, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='BUILD_TUPLE', opcode=102, arg=4, argval=4, argrepr='', offset=18, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=code_object_inner, argrepr=repr(code_object_inner), offset=20, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='MAKE_FUNCTION', opcode=132, arg=9, argval=9, argrepr='defaults, closure', offset=22, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='STORE_FAST', opcode=125, arg=2, argval='inner', argrepr='inner', offset=24, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=26, starts_line=5, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_DEREF', opcode=137, arg=3, argval='a', argrepr='a', offset=28, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_DEREF', opcode=137, arg=4, argval='b', argrepr='b', offset=30, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_DEREF', opcode=137, arg=0, argval='c', argrepr='c', offset=32, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_DEREF', opcode=137, arg=1, argval='d', argrepr='d', offset=34, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=4, argval=4, argrepr='', offset=36, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=38, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=2, argval='inner', argrepr='inner', offset=40, starts_line=6, is_jump_target=False, positions=None),
+ Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=42, starts_line=None, is_jump_target=False, positions=None),
]
expected_opinfo_inner = [
Instruction(opname='COPY_FREE_VARS', opcode=149, arg=4, argval=4, argrepr='', offset=0, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=2, starts_line=4, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_DEREF', opcode=137, arg=2, argval='a', argrepr='a', offset=4, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_DEREF', opcode=137, arg=3, argval='b', argrepr='b', offset=6, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_DEREF', opcode=137, arg=4, argval='c', argrepr='c', offset=8, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_DEREF', opcode=137, arg=5, argval='d', argrepr='d', offset=10, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='e', argrepr='e', offset=12, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=1, argval='f', argrepr='f', offset=14, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=6, argval=6, argrepr='', offset=16, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=18, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=20, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=22, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RESUME', opcode=151, arg=0, argval=0, argrepr='', offset=2, starts_line=3, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='print', argrepr='print', offset=4, starts_line=4, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_DEREF', opcode=137, arg=2, argval='a', argrepr='a', offset=6, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_DEREF', opcode=137, arg=3, argval='b', argrepr='b', offset=8, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_DEREF', opcode=137, arg=4, argval='c', argrepr='c', offset=10, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_DEREF', opcode=137, arg=5, argval='d', argrepr='d', offset=12, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='e', argrepr='e', offset=14, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=1, argval='f', argrepr='f', offset=16, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=6, argval=6, argrepr='', offset=18, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=20, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=22, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=24, starts_line=None, is_jump_target=False, positions=None),
]
expected_opinfo_jumpy = [
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='range', argrepr='range', offset=0, starts_line=3, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=10, argrepr='10', offset=2, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=4, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='GET_ITER', opcode=68, arg=None, argval=None, argrepr='', offset=6, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='FOR_ITER', opcode=93, arg=17, argval=44, argrepr='to 44', offset=8, starts_line=None, is_jump_target=True, positions=None),
- Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=10, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=12, starts_line=4, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=14, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=16, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=18, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=20, starts_line=5, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=22, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=24, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=15, argval=30, argrepr='to 30', offset=26, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=4, argval=8, argrepr='to 8', offset=28, starts_line=6, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=30, starts_line=7, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=32, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=34, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=21, argval=42, argrepr='to 42', offset=36, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=38, starts_line=8, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_FORWARD', opcode=110, arg=5, argval=52, argrepr='to 52', offset=40, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=4, argval=8, argrepr='to 8', offset=42, starts_line=7, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=44, starts_line=10, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='I can haz else clause?', argrepr="'I can haz else clause?'", offset=46, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=48, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=50, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=52, starts_line=11, is_jump_target=True, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=48, argval=96, argrepr='to 96', offset=54, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=56, starts_line=12, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=58, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=60, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=62, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=64, starts_line=13, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=66, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='BINARY_OP', opcode=122, arg=23, argval=23, argrepr='-=', offset=68, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=70, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=72, starts_line=14, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=74, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=76, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=41, argval=82, argrepr='to 82', offset=78, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=26, argval=52, argrepr='to 52', offset=80, starts_line=15, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=82, starts_line=16, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=84, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=86, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=46, argval=92, argrepr='to 92', offset=88, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_FORWARD', opcode=110, arg=6, argval=104, argrepr='to 104', offset=90, starts_line=17, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=92, starts_line=11, is_jump_target=True, positions=None),
- Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=28, argval=56, argrepr='to 56', offset=94, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=96, starts_line=19, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=98, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=100, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=102, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=104, starts_line=20, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=106, starts_line=21, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=108, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='BINARY_OP', opcode=122, arg=11, argval=11, argrepr='/', offset=110, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=112, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_FORWARD', opcode=110, arg=14, argval=144, argrepr='to 144', offset=114, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=116, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=2, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=118, starts_line=22, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_IF_NOT_EXC_MATCH', opcode=121, arg=68, argval=136, argrepr='to 136', offset=120, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=122, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=124, starts_line=23, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=8, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=126, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=128, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=130, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=132, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_FORWARD', opcode=110, arg=34, argval=204, argrepr='to 204', offset=134, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=136, starts_line=22, is_jump_target=True, positions=None),
- Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=138, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=140, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=142, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=144, starts_line=25, is_jump_target=True, positions=None),
- Instruction(opname='BEFORE_WITH', opcode=53, arg=None, argval=None, argrepr='', offset=146, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=148, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=150, starts_line=26, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Never reach this', argrepr="'Never reach this'", offset=152, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=154, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=156, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=158, starts_line=25, is_jump_target=False, positions=None),
- Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=160, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RESUME', opcode=151, arg=0, argval=0, argrepr='', offset=0, starts_line=1, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=0, argval='range', argrepr='range', offset=2, starts_line=3, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=10, argrepr='10', offset=4, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=6, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='GET_ITER', opcode=68, arg=None, argval=None, argrepr='', offset=8, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='FOR_ITER', opcode=93, arg=17, argval=46, argrepr='to 46', offset=10, starts_line=None, is_jump_target=True, positions=None),
+ Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=12, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=14, starts_line=4, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=16, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=18, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=20, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=22, starts_line=5, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=24, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=26, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=16, argval=32, argrepr='to 32', offset=28, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=5, argval=10, argrepr='to 10', offset=30, starts_line=6, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=32, starts_line=7, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=34, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=36, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=22, argval=44, argrepr='to 44', offset=38, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=40, starts_line=8, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_FORWARD', opcode=110, arg=5, argval=54, argrepr='to 54', offset=42, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=5, argval=10, argrepr='to 10', offset=44, starts_line=7, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=46, starts_line=10, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='I can haz else clause?', argrepr="'I can haz else clause?'", offset=48, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=50, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=52, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=54, starts_line=11, is_jump_target=True, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=49, argval=98, argrepr='to 98', offset=56, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=58, starts_line=12, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=60, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=62, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=64, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=66, starts_line=13, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=68, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='BINARY_OP', opcode=122, arg=23, argval=23, argrepr='-=', offset=70, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=72, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=74, starts_line=14, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=76, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COMPARE_OP', opcode=107, arg=4, argval='>', argrepr='>', offset=78, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=42, argval=84, argrepr='to 84', offset=80, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_ABSOLUTE', opcode=113, arg=27, argval=54, argrepr='to 54', offset=82, starts_line=15, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=84, starts_line=16, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=86, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COMPARE_OP', opcode=107, arg=0, argval='<', argrepr='<', offset=88, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=47, argval=94, argrepr='to 94', offset=90, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_FORWARD', opcode=110, arg=6, argval=106, argrepr='to 106', offset=92, starts_line=17, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=94, starts_line=11, is_jump_target=True, positions=None),
+ Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=29, argval=58, argrepr='to 58', offset=96, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=98, starts_line=19, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=100, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=102, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=104, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=106, starts_line=20, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=108, starts_line=21, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=110, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='BINARY_OP', opcode=122, arg=11, argval=11, argrepr='/', offset=112, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=114, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_FORWARD', opcode=110, arg=14, argval=146, argrepr='to 146', offset=116, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=118, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=2, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=120, starts_line=22, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_IF_NOT_EXC_MATCH', opcode=121, arg=69, argval=138, argrepr='to 138', offset=122, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=124, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=126, starts_line=23, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=8, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=128, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=130, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=132, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=134, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_FORWARD', opcode=110, arg=34, argval=206, argrepr='to 206', offset=136, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=138, starts_line=22, is_jump_target=True, positions=None),
+ Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=140, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=142, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=144, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=146, starts_line=25, is_jump_target=True, positions=None),
+ Instruction(opname='BEFORE_WITH', opcode=53, arg=None, argval=None, argrepr='', offset=148, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=150, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=152, starts_line=26, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Never reach this', argrepr="'Never reach this'", offset=154, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=156, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=158, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=160, starts_line=25, is_jump_target=False, positions=None),
Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=162, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=3, argval=3, argrepr='', offset=164, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=166, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_FORWARD', opcode=110, arg=11, argval=192, argrepr='to 192', offset=168, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=170, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=172, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=92, argval=184, argrepr='to 184', offset=174, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=2, argval=2, argrepr='', offset=176, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=178, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=180, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=182, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=184, starts_line=None, is_jump_target=True, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=186, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=188, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='DUP_TOP', opcode=4, arg=None, argval=None, argrepr='', offset=164, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=3, argval=3, argrepr='', offset=166, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=168, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_FORWARD', opcode=110, arg=11, argval=194, argrepr='to 194', offset=170, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=172, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=174, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=93, argval=186, argrepr='to 186', offset=176, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=2, argval=2, argrepr='', offset=178, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=180, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=182, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=184, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=186, starts_line=None, is_jump_target=True, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=188, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=190, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=192, starts_line=28, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=194, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=196, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=198, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=200, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=202, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=204, starts_line=23, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=206, starts_line=28, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=208, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=210, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=212, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=214, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=216, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=218, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=220, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=222, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=224, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=226, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=228, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=230, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=232, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=234, starts_line=None, is_jump_target=False, positions=None)]
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=192, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=194, starts_line=28, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=196, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=198, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=200, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=202, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=204, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=206, starts_line=23, is_jump_target=True, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=208, starts_line=28, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=210, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=212, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=214, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=216, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=218, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=220, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='print', argrepr='print', offset=222, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=224, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='CALL_NO_KW', opcode=169, arg=1, argval=1, argrepr='', offset=226, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=228, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=230, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=232, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=234, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=236, starts_line=None, is_jump_target=False, positions=None),
+]
# One last piece of inspect fodder to check the default line number handling
def simple(): pass
expected_opinfo_simple = [
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=0, starts_line=simple.__code__.co_firstlineno, is_jump_target=False),
- Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=2, starts_line=None, is_jump_target=False)
+ Instruction(opname='RESUME', opcode=151, arg=0, argval=0, argrepr='', offset=0, starts_line=simple.__code__.co_firstlineno, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=2, starts_line=None, is_jump_target=False),
+ Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=4, starts_line=None, is_jump_target=False)
]
@@ -1230,6 +1293,7 @@ def test_co_positions(self):
for instr in dis.get_instructions(code)
]
expected = [
+ (None, None, None, None),
(1, 1, 0, 1),
(2, 2, 2, 3),
(2, 2, 5, 6),
@@ -1249,6 +1313,8 @@ def test_co_positions_missing_info(self):
for instruction in actual:
with self.subTest(instruction=instruction):
start_line, end_line, start_offset, end_offset = instruction.positions
+ if instruction.opname == "RESUME":
+ continue
assert start_line == 1
assert end_line == 1
assert start_offset is None
@@ -1259,6 +1325,8 @@ def test_co_positions_missing_info(self):
for instruction in actual:
with self.subTest(instruction=instruction):
start_line, end_line, start_offset, end_offset = instruction.positions
+ if instruction.opname == "RESUME":
+ continue
assert start_line == 1
assert end_line is None
assert start_offset is not None
@@ -1398,6 +1466,7 @@ def test_distb_empty(self):
dis.distb()
def test_distb_last_traceback(self):
+ self.maxDiff = None
# We need to have an existing last traceback in `sys`:
tb = get_tb()
sys.last_traceback = tb
@@ -1405,6 +1474,7 @@ def test_distb_last_traceback(self):
self.assertEqual(self.get_disassembly(None), dis_traceback)
def test_distb_explicit_arg(self):
+ self.maxDiff = None
tb = get_tb()
self.assertEqual(self.get_disassembly(tb), dis_traceback)
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-01-04-14-08-10.bpo-45923.rBp7r1.rst b/Misc/NEWS.d/next/Core and Builtins/2022-01-04-14-08-10.bpo-45923.rBp7r1.rst
new file mode 100644
index 0000000000000..967f6db1236b7
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-01-04-14-08-10.bpo-45923.rBp7r1.rst
@@ -0,0 +1,3 @@
+Add RESUME opcode. This is a logical no-op. It is emitted by the compiler
+anywhere a Python function can be entered. It is used by the interpreter to
+perform tracing and optimizer checks.
diff --git a/PC/launcher.c b/PC/launcher.c
index d2e6462f13e31..de7abeb4e86ab 100644
--- a/PC/launcher.c
+++ b/PC/launcher.c
@@ -1268,7 +1268,9 @@ static PYC_MAGIC magic_values[] = {
{ 3400, 3419, L"3.8" },
{ 3420, 3429, L"3.9" },
{ 3430, 3449, L"3.10" },
- { 3450, 3469, L"3.11" },
+ /* Allow 50 magic numbers per version from here on */
+ { 3450, 3499, L"3.11" },
+ { 3500, 3549, L"3.12" },
{ 0 }
};
diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h
index 45ca31e1b5e95..4052fc6c92632 100644
--- a/Programs/test_frozenmain.h
+++ b/Programs/test_frozenmain.h
@@ -1,35 +1,35 @@
// Auto-generated by Programs/freeze_test_frozenmain.py
unsigned char M_test_frozenmain[] = {
227,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,
- 0,0,0,0,0,115,86,0,0,0,100,0,100,1,108,0,
- 90,0,100,0,100,1,108,1,90,1,101,2,100,2,169,1,
- 1,0,101,2,100,3,101,0,106,3,169,2,1,0,101,1,
- 106,4,169,0,100,4,25,0,90,5,100,5,68,0,93,14,
- 90,6,101,2,100,6,101,6,155,0,100,7,101,5,101,6,
- 25,0,155,0,157,4,169,1,1,0,113,26,100,1,83,0,
- 41,8,233,0,0,0,0,78,122,18,70,114,111,122,101,110,
- 32,72,101,108,108,111,32,87,111,114,108,100,122,8,115,121,
- 115,46,97,114,103,118,218,6,99,111,110,102,105,103,41,5,
- 90,12,112,114,111,103,114,97,109,95,110,97,109,101,218,10,
- 101,120,101,99,117,116,97,98,108,101,90,15,117,115,101,95,
- 101,110,118,105,114,111,110,109,101,110,116,90,17,99,111,110,
- 102,105,103,117,114,101,95,99,95,115,116,100,105,111,90,14,
- 98,117,102,102,101,114,101,100,95,115,116,100,105,111,122,7,
- 99,111,110,102,105,103,32,122,2,58,32,41,7,218,3,115,
- 121,115,90,17,95,116,101,115,116,105,110,116,101,114,110,97,
- 108,99,97,112,105,218,5,112,114,105,110,116,218,4,97,114,
- 103,118,90,11,103,101,116,95,99,111,110,102,105,103,115,114,
- 2,0,0,0,218,3,107,101,121,169,0,243,0,0,0,0,
- 250,18,116,101,115,116,95,102,114,111,122,101,110,109,97,105,
- 110,46,112,121,218,8,60,109,111,100,117,108,101,62,114,11,
- 0,0,0,1,0,0,0,115,16,0,0,0,8,3,8,1,
- 8,2,12,1,12,1,8,1,26,7,4,249,115,18,0,0,
- 0,8,3,8,1,8,2,12,1,12,1,2,7,4,1,2,
- 249,30,7,115,86,0,0,0,1,11,1,11,1,11,1,11,
- 1,25,1,25,1,25,1,25,1,6,7,27,1,28,1,28,
- 1,6,7,17,19,22,19,27,1,28,1,28,10,27,10,39,
- 10,41,42,50,10,51,1,7,12,2,1,42,1,42,5,8,
- 5,10,11,41,21,24,11,41,11,41,28,34,35,38,28,39,
- 11,41,11,41,5,42,5,42,5,42,1,42,1,42,114,9,
- 0,0,0,
+ 0,0,0,0,0,115,88,0,0,0,151,0,100,0,100,1,
+ 108,0,90,0,100,0,100,1,108,1,90,1,101,2,100,2,
+ 169,1,1,0,101,2,100,3,101,0,106,3,169,2,1,0,
+ 101,1,106,4,169,0,100,4,25,0,90,5,100,5,68,0,
+ 93,14,90,6,101,2,100,6,101,6,155,0,100,7,101,5,
+ 101,6,25,0,155,0,157,4,169,1,1,0,113,27,100,1,
+ 83,0,41,8,233,0,0,0,0,78,122,18,70,114,111,122,
+ 101,110,32,72,101,108,108,111,32,87,111,114,108,100,122,8,
+ 115,121,115,46,97,114,103,118,218,6,99,111,110,102,105,103,
+ 41,5,90,12,112,114,111,103,114,97,109,95,110,97,109,101,
+ 218,10,101,120,101,99,117,116,97,98,108,101,90,15,117,115,
+ 101,95,101,110,118,105,114,111,110,109,101,110,116,90,17,99,
+ 111,110,102,105,103,117,114,101,95,99,95,115,116,100,105,111,
+ 90,14,98,117,102,102,101,114,101,100,95,115,116,100,105,111,
+ 122,7,99,111,110,102,105,103,32,122,2,58,32,41,7,218,
+ 3,115,121,115,90,17,95,116,101,115,116,105,110,116,101,114,
+ 110,97,108,99,97,112,105,218,5,112,114,105,110,116,218,4,
+ 97,114,103,118,90,11,103,101,116,95,99,111,110,102,105,103,
+ 115,114,2,0,0,0,218,3,107,101,121,169,0,243,0,0,
+ 0,0,250,18,116,101,115,116,95,102,114,111,122,101,110,109,
+ 97,105,110,46,112,121,218,8,60,109,111,100,117,108,101,62,
+ 114,11,0,0,0,1,0,0,0,115,18,0,0,0,2,128,
+ 8,3,8,1,8,2,12,1,12,1,8,1,26,7,4,249,
+ 115,20,0,0,0,2,128,8,3,8,1,8,2,12,1,12,
+ 1,2,7,4,1,2,249,30,7,115,88,0,0,0,0,0,
+ 1,11,1,11,1,11,1,11,1,25,1,25,1,25,1,25,
+ 1,6,7,27,1,28,1,28,1,6,7,17,19,22,19,27,
+ 1,28,1,28,10,27,10,39,10,41,42,50,10,51,1,7,
+ 12,2,1,42,1,42,5,8,5,10,11,41,21,24,11,41,
+ 11,41,28,34,35,38,28,39,11,41,11,41,5,42,5,42,
+ 5,42,1,42,1,42,114,9,0,0,0,
};
diff --git a/Python/ceval.c b/Python/ceval.c
index 86d834cd3a67f..be26ffd822c13 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1546,6 +1546,17 @@ eval_frame_handle_pending(PyThreadState *tstate)
#define TRACE_FUNCTION_ENTRY() \
if (cframe.use_tracing) { \
+ _PyFrame_SetStackPointer(frame, stack_pointer); \
+ int err = trace_function_entry(tstate, frame); \
+ stack_pointer = _PyFrame_GetStackPointer(frame); \
+ if (err) { \
+ goto error; \
+ } \
+ }
+
+#define TRACE_FUNCTION_THROW_ENTRY() \
+ if (cframe.use_tracing) { \
+ assert(frame->stacktop >= 0); \
if (trace_function_entry(tstate, frame)) { \
goto exit_unwind; \
} \
@@ -1694,7 +1705,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
tstate->recursion_remaining--;
goto exit_unwind;
}
- TRACE_FUNCTION_ENTRY();
+ TRACE_FUNCTION_THROW_ENTRY();
DTRACE_FUNCTION_ENTRY();
goto resume_with_error;
}
@@ -1734,17 +1745,6 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
goto exit_unwind;
}
- assert(tstate->cframe == &cframe);
- assert(frame == cframe.current_frame);
-
- TRACE_FUNCTION_ENTRY();
- DTRACE_FUNCTION_ENTRY();
-
- if (_Py_IncrementCountAndMaybeQuicken(frame->f_code) < 0) {
- goto exit_unwind;
- }
- frame->f_state = FRAME_EXECUTING;
-
resume_frame:
SET_LOCALS_FROM_FRAME();
@@ -1825,6 +1825,24 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
DISPATCH();
}
+ TARGET(RESUME) {
+ assert(tstate->cframe == &cframe);
+ assert(frame == cframe.current_frame);
+
+ int err = _Py_IncrementCountAndMaybeQuicken(frame->f_code);
+ if (err) {
+ if (err < 0) {
+ goto error;
+ }
+ /* Update first_instr and next_instr to point to newly quickened code */
+ int nexti = INSTR_OFFSET();
+ first_instr = frame->f_code->co_firstinstr;
+ next_instr = first_instr + nexti;
+ }
+ frame->f_state = FRAME_EXECUTING;
+ DISPATCH();
+ }
+
TARGET(LOAD_CLOSURE) {
/* We keep LOAD_CLOSURE so that the bytecode stays more readable. */
PyObject *value = GETLOCAL(oparg);
@@ -3134,7 +3152,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
PyObject *initial = GETLOCAL(oparg);
PyObject *cell = PyCell_New(initial);
if (cell == NULL) {
- goto error;
+ goto resume_with_error;
}
SETLOCAL(oparg, cell);
DISPATCH();
@@ -5209,33 +5227,40 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, InterpreterFrame *frame, int thr
int instr_prev = skip_backwards_over_extended_args(frame->f_code, frame->f_lasti);
frame->f_lasti = INSTR_OFFSET();
TRACING_NEXTOPARG();
- if (PyDTrace_LINE_ENABLED()) {
- maybe_dtrace_line(frame, &tstate->trace_info, instr_prev);
+ if (opcode == RESUME) {
+ /* Call tracing */
+ TRACE_FUNCTION_ENTRY();
+ DTRACE_FUNCTION_ENTRY();
}
- /* line-by-line tracing support */
-
- if (cframe.use_tracing &&
- tstate->c_tracefunc != NULL && !tstate->tracing) {
- int err;
- /* see maybe_call_line_trace()
- for expository comments */
- _PyFrame_SetStackPointer(frame, stack_pointer);
-
- err = maybe_call_line_trace(tstate->c_tracefunc,
- tstate->c_traceobj,
- tstate, frame, instr_prev);
- if (err) {
- /* trace function raised an exception */
- next_instr++;
- goto error;
+ else {
+ /* line-by-line tracing support */
+ if (PyDTrace_LINE_ENABLED()) {
+ maybe_dtrace_line(frame, &tstate->trace_info, instr_prev);
}
- /* Reload possibly changed frame fields */
- JUMPTO(frame->f_lasti);
- stack_pointer = _PyFrame_GetStackPointer(frame);
- frame->stacktop = -1;
- TRACING_NEXTOPARG();
+ if (cframe.use_tracing &&
+ tstate->c_tracefunc != NULL && !tstate->tracing) {
+ int err;
+ /* see maybe_call_line_trace()
+ for expository comments */
+ _PyFrame_SetStackPointer(frame, stack_pointer);
+
+ err = maybe_call_line_trace(tstate->c_tracefunc,
+ tstate->c_traceobj,
+ tstate, frame, instr_prev);
+ if (err) {
+ /* trace function raised an exception */
+ next_instr++;
+ goto error;
+ }
+ /* Reload possibly changed frame fields */
+ JUMPTO(frame->f_lasti);
+
+ stack_pointer = _PyFrame_GetStackPointer(frame);
+ frame->stacktop = -1;
+ }
}
+ TRACING_NEXTOPARG();
PRE_DISPATCH_GOTO();
DISPATCH_GOTO();
}
@@ -6046,6 +6071,7 @@ _PyEval_Vector(PyThreadState *tstate, PyFunctionObject *func,
return NULL;
}
PyObject *retval = _PyEval_EvalFrame(tstate, frame, 0);
+ assert(frame->stacktop >= 0);
assert(_PyFrame_GetStackPointer(frame) == _PyFrame_Stackbase(frame));
_PyEvalFrameClearAndPop(tstate, frame);
return retval;
@@ -6492,13 +6518,9 @@ call_trace(Py_tracefunc func, PyObject *obj,
if (f == NULL) {
return -1;
}
- if (frame->f_lasti < 0) {
- f->f_lineno = frame->f_code->co_firstlineno;
- }
- else {
- initialize_trace_info(&tstate->trace_info, frame);
- f->f_lineno = _PyCode_CheckLineNumber(frame->f_lasti*sizeof(_Py_CODEUNIT), &tstate->trace_info.bounds);
- }
+ assert (frame->f_lasti >= 0);
+ initialize_trace_info(&tstate->trace_info, frame);
+ f->f_lineno = _PyCode_CheckLineNumber(frame->f_lasti*sizeof(_Py_CODEUNIT), &tstate->trace_info.bounds);
result = func(obj, f, what, arg);
f->f_lineno = 0;
_PyThreadState_ResumeTracing(tstate);
@@ -6534,7 +6556,14 @@ maybe_call_line_trace(Py_tracefunc func, PyObject *obj,
then call the trace function if we're tracing source lines.
*/
initialize_trace_info(&tstate->trace_info, frame);
- int lastline = _PyCode_CheckLineNumber(instr_prev*sizeof(_Py_CODEUNIT), &tstate->trace_info.bounds);
+ _Py_CODEUNIT prev = ((_Py_CODEUNIT *)PyBytes_AS_STRING(frame->f_code->co_code))[instr_prev];
+ int lastline;
+ if (_Py_OPCODE(prev) == RESUME && _Py_OPARG(prev) == 0) {
+ lastline = -1;
+ }
+ else {
+ lastline = _PyCode_CheckLineNumber(instr_prev*sizeof(_Py_CODEUNIT), &tstate->trace_info.bounds);
+ }
int line = _PyCode_CheckLineNumber(frame->f_lasti*sizeof(_Py_CODEUNIT), &tstate->trace_info.bounds);
PyFrameObject *f = _PyFrame_GetFrameObject(frame);
if (f == NULL) {
diff --git a/Python/compile.c b/Python/compile.c
index 625a07bd39675..62f37ca452632 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -689,9 +689,9 @@ compiler_enter_scope(struct compiler *c, identifier name,
u->u_blocks = NULL;
u->u_nfblocks = 0;
u->u_firstlineno = lineno;
- u->u_lineno = 0;
+ u->u_lineno = lineno;
u->u_col_offset = 0;
- u->u_end_lineno = 0;
+ u->u_end_lineno = lineno;
u->u_end_col_offset = 0;
u->u_consts = PyDict_New();
if (!u->u_consts) {
@@ -995,6 +995,7 @@ stack_effect(int opcode, int oparg, int jump)
switch (opcode) {
case NOP:
case EXTENDED_ARG:
+ case RESUME:
return 0;
/* Stack manipulation */
@@ -1664,8 +1665,8 @@ compiler_addop_j_noline(struct compiler *c, int opcode, basicblock *b)
the ASDL name to synthesize the name of the C type and the visit function.
*/
-#define ADD_YIELD_FROM(C) \
- RETURN_IF_FALSE(compiler_add_yield_from((C)))
+#define ADD_YIELD_FROM(C, await) \
+ RETURN_IF_FALSE(compiler_add_yield_from((C), (await)))
#define POP_EXCEPT_AND_RERAISE(C) \
RETURN_IF_FALSE(compiler_pop_except_and_reraise((C)))
@@ -1823,18 +1824,19 @@ compiler_call_exit_with_nones(struct compiler *c) {
}
static int
-compiler_add_yield_from(struct compiler *c)
+compiler_add_yield_from(struct compiler *c, int await)
{
- basicblock *start, *jump, *exit;
+ basicblock *start, *resume, *exit;
start = compiler_new_block(c);
- jump = compiler_new_block(c);
+ resume = compiler_new_block(c);
exit = compiler_new_block(c);
- if (start == NULL || jump == NULL || exit == NULL) {
+ if (start == NULL || resume == NULL || exit == NULL) {
return 0;
}
compiler_use_next_block(c, start);
ADDOP_JUMP(c, SEND, exit);
- compiler_use_next_block(c, jump);
+ compiler_use_next_block(c, resume);
+ ADDOP_I(c, RESUME, await ? 3 : 2);
ADDOP_JUMP(c, JUMP_ABSOLUTE, start);
compiler_use_next_block(c, exit);
return 1;
@@ -1928,7 +1930,7 @@ compiler_unwind_fblock(struct compiler *c, struct fblockinfo *info,
if (info->fb_type == ASYNC_WITH) {
ADDOP(c, GET_AWAITABLE);
ADDOP_LOAD_CONST(c, Py_None);
- ADD_YIELD_FROM(c);
+ ADD_YIELD_FROM(c, 1);
}
ADDOP(c, POP_TOP);
/* The exit block should appear to execute after the
@@ -2047,9 +2049,11 @@ compiler_mod(struct compiler *c, mod_ty mod)
if (module == NULL) {
return 0;
}
- /* Use 0 for firstlineno initially, will fixup in assemble(). */
if (!compiler_enter_scope(c, module, COMPILER_SCOPE_MODULE, mod, 1))
return NULL;
+ c->u->u_lineno = -1;
+ ADDOP_I(c, RESUME, 0);
+ c->u->u_lineno = 1;
switch (mod->kind) {
case Module_kind:
if (!compiler_body(c, mod->v.Module.body)) {
@@ -2504,6 +2508,7 @@ compiler_function(struct compiler *c, stmt_ty s, int is_async)
if (!compiler_enter_scope(c, name, scope_type, (void *)s, firstlineno)) {
return 0;
}
+ ADDOP_I(c, RESUME, 0);
/* if not -OO mode, add docstring */
if (c->c_optimize < 2) {
@@ -2573,8 +2578,10 @@ compiler_class(struct compiler *c, stmt_ty s)
/* 1. compile the class body into a code object */
if (!compiler_enter_scope(c, s->v.ClassDef.name,
- COMPILER_SCOPE_CLASS, (void *)s, firstlineno))
+ COMPILER_SCOPE_CLASS, (void *)s, firstlineno)) {
return 0;
+ }
+ ADDOP_I(c, RESUME, 0);
/* this block represents what we do in the new scope */
{
/* use the class name for name mangling */
@@ -2907,11 +2914,13 @@ compiler_lambda(struct compiler *c, expr_ty e)
if (funcflags == -1) {
return 0;
}
+ ADDOP_I(c, RESUME, 0);
if (!compiler_enter_scope(c, name, COMPILER_SCOPE_LAMBDA,
(void *)e, e->lineno))
return 0;
+ ADDOP_I(c, RESUME, 0);
/* Make None the first constant, so the lambda can't have a
docstring. */
if (compiler_add_const(c, Py_None) < 0)
@@ -3041,7 +3050,7 @@ compiler_async_for(struct compiler *c, stmt_ty s)
ADDOP_JUMP(c, SETUP_FINALLY, except);
ADDOP(c, GET_ANEXT);
ADDOP_LOAD_CONST(c, Py_None);
- ADD_YIELD_FROM(c);
+ ADD_YIELD_FROM(c, 1);
ADDOP(c, POP_BLOCK); /* for SETUP_FINALLY */
/* Success block for __anext__ */
@@ -5135,6 +5144,7 @@ compiler_sync_comprehension_generator(struct compiler *c,
case COMP_GENEXP:
VISIT(c, expr, elt);
ADDOP(c, YIELD_VALUE);
+ ADDOP_I(c, RESUME, 1);
ADDOP(c, POP_TOP);
break;
case COMP_LISTCOMP:
@@ -5207,7 +5217,7 @@ compiler_async_comprehension_generator(struct compiler *c,
ADDOP_JUMP(c, SETUP_FINALLY, except);
ADDOP(c, GET_ANEXT);
ADDOP_LOAD_CONST(c, Py_None);
- ADD_YIELD_FROM(c);
+ ADD_YIELD_FROM(c, 1);
ADDOP(c, POP_BLOCK);
VISIT(c, expr, gen->target);
@@ -5233,6 +5243,7 @@ compiler_async_comprehension_generator(struct compiler *c,
case COMP_GENEXP:
VISIT(c, expr, elt);
ADDOP(c, YIELD_VALUE);
+ ADDOP_I(c, RESUME, 1);
ADDOP(c, POP_TOP);
break;
case COMP_LISTCOMP:
@@ -5285,6 +5296,7 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
{
goto error;
}
+ ADDOP_I(c, RESUME, 0);
SET_LOC(c, e);
is_async_generator = c->u->u_ste->ste_coroutine;
@@ -5357,7 +5369,7 @@ compiler_comprehension(struct compiler *c, expr_ty e, int type,
if (is_async_generator && type != COMP_GENEXP) {
ADDOP(c, GET_AWAITABLE);
ADDOP_LOAD_CONST(c, Py_None);
- ADD_YIELD_FROM(c);
+ ADD_YIELD_FROM(c, 1);
}
return 1;
@@ -5506,7 +5518,7 @@ compiler_async_with(struct compiler *c, stmt_ty s, int pos)
ADDOP(c, BEFORE_ASYNC_WITH);
ADDOP(c, GET_AWAITABLE);
ADDOP_LOAD_CONST(c, Py_None);
- ADD_YIELD_FROM(c);
+ ADD_YIELD_FROM(c, 1);
ADDOP_JUMP(c, SETUP_WITH, final);
@@ -5543,7 +5555,7 @@ compiler_async_with(struct compiler *c, stmt_ty s, int pos)
return 0;
ADDOP(c, GET_AWAITABLE);
ADDOP_LOAD_CONST(c, Py_None);
- ADD_YIELD_FROM(c);
+ ADD_YIELD_FROM(c, 1);
ADDOP(c, POP_TOP);
@@ -5557,7 +5569,7 @@ compiler_async_with(struct compiler *c, stmt_ty s, int pos)
ADDOP(c, WITH_EXCEPT_START);
ADDOP(c, GET_AWAITABLE);
ADDOP_LOAD_CONST(c, Py_None);
- ADD_YIELD_FROM(c);
+ ADD_YIELD_FROM(c, 1);
compiler_with_except_finish(c, cleanup);
compiler_use_next_block(c, exit);
@@ -5703,6 +5715,7 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
ADDOP_LOAD_CONST(c, Py_None);
}
ADDOP(c, YIELD_VALUE);
+ ADDOP_I(c, RESUME, 1);
break;
case YieldFrom_kind:
if (c->u->u_ste->ste_type != FunctionBlock)
@@ -5714,7 +5727,7 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
VISIT(c, expr, e->v.YieldFrom.value);
ADDOP(c, GET_YIELD_FROM_ITER);
ADDOP_LOAD_CONST(c, Py_None);
- ADD_YIELD_FROM(c);
+ ADD_YIELD_FROM(c, 0);
break;
case Await_kind:
if (!IS_TOP_LEVEL_AWAIT(c)){
@@ -5731,7 +5744,7 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
VISIT(c, expr, e->v.Await.value);
ADDOP(c, GET_AWAITABLE);
ADDOP_LOAD_CONST(c, Py_None);
- ADD_YIELD_FROM(c);
+ ADD_YIELD_FROM(c, 1);
break;
case Compare_kind:
return compiler_compare(c, e);
@@ -7987,6 +8000,7 @@ insert_prefix_instructions(struct compiler *c, basicblock *entryblock,
if (flags < 0) {
return -1;
}
+ assert(c->u->u_firstlineno > 0);
/* Set up cells for any variable that escapes, to be put in a closure. */
const int ncellvars = (int)PyDict_GET_SIZE(c->u->u_cellvars);
@@ -8191,17 +8205,19 @@ assemble(struct compiler *c, int addNone)
goto error;
}
- // This must be called before fix_cell_offsets().
- if (insert_prefix_instructions(c, entryblock, cellfixedoffsets, nfreevars)) {
- goto error;
- }
-
/* Set firstlineno if it wasn't explicitly set. */
if (!c->u->u_firstlineno) {
- if (entryblock->b_instr && entryblock->b_instr->i_lineno)
+ if (entryblock->b_instr && entryblock->b_instr->i_lineno) {
c->u->u_firstlineno = entryblock->b_instr->i_lineno;
- else
+ }
+ else {
c->u->u_firstlineno = 1;
+ }
+ }
+
+ // This must be called before fix_cell_offsets().
+ if (insert_prefix_instructions(c, entryblock, cellfixedoffsets, nfreevars)) {
+ goto error;
}
if (!assemble_init(&a, nblocks, c->u->u_firstlineno))
diff --git a/Python/opcode_targets.h b/Python/opcode_targets.h
index 7ba45666ed061..c78425ff9bb64 100644
--- a/Python/opcode_targets.h
+++ b/Python/opcode_targets.h
@@ -150,7 +150,7 @@ static void *opcode_targets[256] = {
&&TARGET_LOAD_CLASSDEREF,
&&TARGET_COPY_FREE_VARS,
&&_unknown_opcode,
- &&_unknown_opcode,
+ &&TARGET_RESUME,
&&TARGET_MATCH_CLASS,
&&_unknown_opcode,
&&_unknown_opcode,
More information about the Python-checkins
mailing list