mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

gh-91276: revert the increase of dis output width (GH-92126)

Browse source
This commit is contained in:
Irit Katriel 2022-05-02 09:51:17 -06:00 • committed by GitHub
parent b9ab6cea08
commit 84b986ba10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 262 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/dis.py
View file

@ -264,7 +264,7 @@ _Instruction.positions.__doc__ = "dis.Positions object holding the span of sourc
_ExceptionTableEntry = collections.namedtuple("_ExceptionTableEntry", _ExceptionTableEntry = collections.namedtuple("_ExceptionTableEntry",
"start end target depth lasti") "start end target depth lasti")
_OPNAME_WIDTH = max(map(len, opmap)) _OPNAME_WIDTH = 20
_OPARG_WIDTH = 5 _OPARG_WIDTH = 5
class Instruction(_Instruction): class Instruction(_Instruction):

510
Lib/test/test_dis.py
View file

@ -41,48 +41,48 @@ class _C:
cls.x = x == 1 cls.x = x == 1
dis_c_instance_method = """\ dis_c_instance_method = """\
%3d RESUME 0 %3d RESUME 0
%3d LOAD_FAST 1 (x) %3d LOAD_FAST 1 (x)
LOAD_CONST 1 (1) LOAD_CONST 1 (1)
COMPARE_OP 2 (==) COMPARE_OP 2 (==)
LOAD_FAST 0 (self) LOAD_FAST 0 (self)
STORE_ATTR 0 (x) STORE_ATTR 0 (x)
LOAD_CONST 0 (None) LOAD_CONST 0 (None)
RETURN_VALUE RETURN_VALUE
""" % (_C.__init__.__code__.co_firstlineno, _C.__init__.__code__.co_firstlineno + 1,) """ % (_C.__init__.__code__.co_firstlineno, _C.__init__.__code__.co_firstlineno + 1,)
dis_c_instance_method_bytes = """\ dis_c_instance_method_bytes = """\
RESUME 0 RESUME 0
LOAD_FAST 1 LOAD_FAST 1
LOAD_CONST 1 LOAD_CONST 1
COMPARE_OP 2 (==) COMPARE_OP 2 (==)
LOAD_FAST 0 LOAD_FAST 0
STORE_ATTR 0 STORE_ATTR 0
LOAD_CONST 0 LOAD_CONST 0
RETURN_VALUE RETURN_VALUE
""" """
dis_c_class_method = """\ dis_c_class_method = """\
%3d RESUME 0 %3d RESUME 0
%3d LOAD_FAST 1 (x) %3d LOAD_FAST 1 (x)
LOAD_CONST 1 (1) LOAD_CONST 1 (1)
COMPARE_OP 2 (==) COMPARE_OP 2 (==)
LOAD_FAST 0 (cls) LOAD_FAST 0 (cls)
STORE_ATTR 0 (x) STORE_ATTR 0 (x)
LOAD_CONST 0 (None) LOAD_CONST 0 (None)
RETURN_VALUE RETURN_VALUE
""" % (_C.cm.__code__.co_firstlineno, _C.cm.__code__.co_firstlineno + 2,) """ % (_C.cm.__code__.co_firstlineno, _C.cm.__code__.co_firstlineno + 2,)
dis_c_static_method = """\ dis_c_static_method = """\
%3d RESUME 0 %3d RESUME 0
%3d LOAD_FAST 0 (x) %3d LOAD_FAST 0 (x)
LOAD_CONST 1 (1) LOAD_CONST 1 (1)
COMPARE_OP 2 (==) COMPARE_OP 2 (==)
STORE_FAST 0 (x) STORE_FAST 0 (x)
LOAD_CONST 0 (None) LOAD_CONST 0 (None)
RETURN_VALUE RETURN_VALUE
""" % (_C.sm.__code__.co_firstlineno, _C.sm.__code__.co_firstlineno + 2,) """ % (_C.sm.__code__.co_firstlineno, _C.sm.__code__.co_firstlineno + 2,)
@ -103,15 +103,15 @@ def _f(a):
return 1 return 1
dis_f = """\ dis_f = """\
%3d RESUME 0 %3d RESUME 0
%3d LOAD_GLOBAL 1 (NULL + print) %3d LOAD_GLOBAL 1 (NULL + print)
LOAD_FAST 0 (a) LOAD_FAST 0 (a)
PRECALL 1 PRECALL 1
CALL 1 CALL 1
POP_TOP POP_TOP
%3d LOAD_CONST 1 (1) %3d LOAD_CONST 1 (1)
RETURN_VALUE RETURN_VALUE
""" % (_f.__code__.co_firstlineno, """ % (_f.__code__.co_firstlineno,
_f.__code__.co_firstlineno + 1, _f.__code__.co_firstlineno + 1,
@ -119,13 +119,13 @@ dis_f = """\
dis_f_co_code = """\ dis_f_co_code = """\
RESUME 0 RESUME 0
LOAD_GLOBAL 1 LOAD_GLOBAL 1
LOAD_FAST 0 LOAD_FAST 0
PRECALL 1 PRECALL 1
CALL 1 CALL 1
POP_TOP POP_TOP
LOAD_CONST 1 LOAD_CONST 1
RETURN_VALUE RETURN_VALUE
""" """
@ -136,22 +136,22 @@ def bug708901():
pass pass
dis_bug708901 = """\ dis_bug708901 = """\
%3d RESUME 0 %3d RESUME 0
%3d LOAD_GLOBAL 1 (NULL + range) %3d LOAD_GLOBAL 1 (NULL + range)
LOAD_CONST 1 (1) LOAD_CONST 1 (1)
%3d LOAD_CONST 2 (10) %3d LOAD_CONST 2 (10)
%3d PRECALL 2 %3d PRECALL 2
CALL 2 CALL 2
GET_ITER GET_ITER
>> FOR_ITER 2 (to 40) >> FOR_ITER 2 (to 40)
STORE_FAST 0 (res) STORE_FAST 0 (res)
%3d JUMP_BACKWARD 3 (to 34) %3d JUMP_BACKWARD 3 (to 34)
%3d >> LOAD_CONST 0 (None) %3d >> LOAD_CONST 0 (None)
RETURN_VALUE RETURN_VALUE
""" % (bug708901.__code__.co_firstlineno, """ % (bug708901.__code__.co_firstlineno,
bug708901.__code__.co_firstlineno + 1, bug708901.__code__.co_firstlineno + 1,
@ -167,22 +167,22 @@ def bug1333982(x=[]):
pass pass
dis_bug1333982 = """\ dis_bug1333982 = """\
%3d RESUME 0 %3d RESUME 0
%3d LOAD_ASSERTION_ERROR %3d LOAD_ASSERTION_ERROR
LOAD_CONST 2 (<code object <listcomp> at 0x..., file "%s", line %d>) LOAD_CONST 2 (<code object <listcomp> at 0x..., file "%s", line %d>)
MAKE_FUNCTION 0 MAKE_FUNCTION 0
LOAD_FAST 0 (x) LOAD_FAST 0 (x)
GET_ITER GET_ITER
PRECALL 0 PRECALL 0
CALL 0 CALL 0
%3d LOAD_CONST 3 (1) %3d LOAD_CONST 3 (1)
%3d BINARY_OP 0 (+) %3d BINARY_OP 0 (+)
PRECALL 0 PRECALL 0
CALL 0 CALL 0
RAISE_VARARGS 1 RAISE_VARARGS 1
""" % (bug1333982.__code__.co_firstlineno, """ % (bug1333982.__code__.co_firstlineno,
bug1333982.__code__.co_firstlineno + 1, bug1333982.__code__.co_firstlineno + 1,
__file__, __file__,
@ -200,8 +200,8 @@ bug42562.__code__ = bug42562.__code__.replace(co_linetable=b'\xf8')
dis_bug42562 = """\ dis_bug42562 = """\
RESUME 0 RESUME 0
LOAD_CONST 0 (None) LOAD_CONST 0 (None)
RETURN_VALUE RETURN_VALUE
""" """
@ -215,10 +215,10 @@ code_bug_45757 = bytes([
]) ])
dis_bug_45757 = """\ dis_bug_45757 = """\
EXTENDED_ARG 1 EXTENDED_ARG 1
NOP NOP
EXTENDED_ARG 1 EXTENDED_ARG 1
LOAD_CONST 297 LOAD_CONST 297
RETURN_VALUE RETURN_VALUE
""" """
@ -232,39 +232,39 @@ bug46724 = bytes([
dis_bug46724 = """\ dis_bug46724 = """\
>> EXTENDED_ARG 255 >> EXTENDED_ARG 255
EXTENDED_ARG 65535 EXTENDED_ARG 65535
EXTENDED_ARG 16777215 EXTENDED_ARG 16777215
JUMP_FORWARD -4 (to 0) JUMP_FORWARD -4 (to 0)
""" """
_BIG_LINENO_FORMAT = """\ _BIG_LINENO_FORMAT = """\
1 RESUME 0 1 RESUME 0
%3d LOAD_GLOBAL 0 (spam) %3d LOAD_GLOBAL 0 (spam)
POP_TOP POP_TOP
LOAD_CONST 0 (None) LOAD_CONST 0 (None)
RETURN_VALUE RETURN_VALUE
""" """
_BIG_LINENO_FORMAT2 = """\ _BIG_LINENO_FORMAT2 = """\
1 RESUME 0 1 RESUME 0
%4d LOAD_GLOBAL 0 (spam) %4d LOAD_GLOBAL 0 (spam)
POP_TOP POP_TOP
LOAD_CONST 0 (None) LOAD_CONST 0 (None)
RETURN_VALUE RETURN_VALUE
""" """
dis_module_expected_results = """\ dis_module_expected_results = """\
Disassembly of f: Disassembly of f:
4 RESUME 0 4 RESUME 0
LOAD_CONST 0 (None) LOAD_CONST 0 (None)
RETURN_VALUE RETURN_VALUE
Disassembly of g: Disassembly of g:
5 RESUME 0 5 RESUME 0
LOAD_CONST 0 (None) LOAD_CONST 0 (None)
RETURN_VALUE RETURN_VALUE
""" """
@ -272,24 +272,24 @@ Disassembly of g:
expr_str = "x + 1" expr_str = "x + 1"
dis_expr_str = """\ dis_expr_str = """\
RESUME 0 RESUME 0
1 LOAD_NAME 0 (x) 1 LOAD_NAME 0 (x)
LOAD_CONST 0 (1) LOAD_CONST 0 (1)
BINARY_OP 0 (+) BINARY_OP 0 (+)
RETURN_VALUE RETURN_VALUE
""" """
simple_stmt_str = "x = x + 1" simple_stmt_str = "x = x + 1"
dis_simple_stmt_str = """\ dis_simple_stmt_str = """\
RESUME 0 RESUME 0
1 LOAD_NAME 0 (x) 1 LOAD_NAME 0 (x)
LOAD_CONST 0 (1) LOAD_CONST 0 (1)
BINARY_OP 0 (+) BINARY_OP 0 (+)
STORE_NAME 0 (x) STORE_NAME 0 (x)
LOAD_CONST 1 (None) LOAD_CONST 1 (None)
RETURN_VALUE RETURN_VALUE
""" """
@ -302,36 +302,36 @@ lst[fun(0)]: int = 1
# leading newline is for a reason (tests lineno) # leading newline is for a reason (tests lineno)
dis_annot_stmt_str = """\ dis_annot_stmt_str = """\
RESUME 0 RESUME 0
2 SETUP_ANNOTATIONS 2 SETUP_ANNOTATIONS
LOAD_CONST 0 (1) LOAD_CONST 0 (1)
STORE_NAME 0 (x) STORE_NAME 0 (x)
LOAD_NAME 1 (int) LOAD_NAME 1 (int)
LOAD_NAME 2 (__annotations__) LOAD_NAME 2 (__annotations__)
LOAD_CONST 1 ('x') LOAD_CONST 1 ('x')
STORE_SUBSCR STORE_SUBSCR
3 PUSH_NULL 3 PUSH_NULL
LOAD_NAME 3 (fun) LOAD_NAME 3 (fun)
LOAD_CONST 0 (1) LOAD_CONST 0 (1)
PRECALL 1 PRECALL 1
CALL 1 CALL 1
LOAD_NAME 2 (__annotations__) LOAD_NAME 2 (__annotations__)
LOAD_CONST 2 ('y') LOAD_CONST 2 ('y')
STORE_SUBSCR STORE_SUBSCR
4 LOAD_CONST 0 (1) 4 LOAD_CONST 0 (1)
LOAD_NAME 4 (lst) LOAD_NAME 4 (lst)
PUSH_NULL PUSH_NULL
LOAD_NAME 3 (fun) LOAD_NAME 3 (fun)
LOAD_CONST 3 (0) LOAD_CONST 3 (0)
PRECALL 1 PRECALL 1
CALL 1 CALL 1
STORE_SUBSCR STORE_SUBSCR
LOAD_NAME 1 (int) LOAD_NAME 1 (int)
POP_TOP POP_TOP
LOAD_CONST 4 (None) LOAD_CONST 4 (None)
RETURN_VALUE RETURN_VALUE
""" """
@ -342,59 +342,59 @@ while 1:
# Trailing newline has been deliberately omitted # Trailing newline has been deliberately omitted
dis_compound_stmt_str = """\ dis_compound_stmt_str = """\
RESUME 0 RESUME 0
1 LOAD_CONST 0 (0) 1 LOAD_CONST 0 (0)
STORE_NAME 0 (x) STORE_NAME 0 (x)
2 NOP 2 NOP
3 >> LOAD_NAME 0 (x) 3 >> LOAD_NAME 0 (x)
LOAD_CONST 1 (1) LOAD_CONST 1 (1)
BINARY_OP 13 (+=) BINARY_OP 13 (+=)
STORE_NAME 0 (x) STORE_NAME 0 (x)
2 JUMP_BACKWARD 6 (to 8) 2 JUMP_BACKWARD 6 (to 8)
""" """
dis_traceback = """\ dis_traceback = """\
%3d RESUME 0 %3d RESUME 0
%3d NOP %3d NOP
%3d LOAD_CONST 1 (1) %3d LOAD_CONST 1 (1)
LOAD_CONST 2 (0) LOAD_CONST 2 (0)
--> BINARY_OP 11 (/) --> BINARY_OP 11 (/)
POP_TOP POP_TOP
%3d LOAD_FAST 1 (tb) %3d LOAD_FAST 1 (tb)
RETURN_VALUE RETURN_VALUE
>> PUSH_EXC_INFO >> PUSH_EXC_INFO
%3d LOAD_GLOBAL 0 (Exception) %3d LOAD_GLOBAL 0 (Exception)
CHECK_EXC_MATCH CHECK_EXC_MATCH
POP_JUMP_FORWARD_IF_FALSE 18 (to 72) POP_JUMP_FORWARD_IF_FALSE 18 (to 72)
STORE_FAST 0 (e) STORE_FAST 0 (e)
%3d LOAD_FAST 0 (e) %3d LOAD_FAST 0 (e)
LOAD_ATTR 1 (__traceback__) LOAD_ATTR 1 (__traceback__)
STORE_FAST 1 (tb) STORE_FAST 1 (tb)
POP_EXCEPT POP_EXCEPT
LOAD_CONST 0 (None) LOAD_CONST 0 (None)
STORE_FAST 0 (e) STORE_FAST 0 (e)
DELETE_FAST 0 (e) DELETE_FAST 0 (e)
%3d LOAD_FAST 1 (tb) %3d LOAD_FAST 1 (tb)
RETURN_VALUE RETURN_VALUE
>> LOAD_CONST 0 (None) >> LOAD_CONST 0 (None)
STORE_FAST 0 (e) STORE_FAST 0 (e)
DELETE_FAST 0 (e) DELETE_FAST 0 (e)
RERAISE 1 RERAISE 1
%3d >> RERAISE 0 %3d >> RERAISE 0
>> COPY 3 >> COPY 3
POP_EXCEPT POP_EXCEPT
RERAISE 1 RERAISE 1
ExceptionTable: ExceptionTable:
""" % (TRACEBACK_CODE.co_firstlineno, """ % (TRACEBACK_CODE.co_firstlineno,
TRACEBACK_CODE.co_firstlineno + 1, TRACEBACK_CODE.co_firstlineno + 1,
@ -409,22 +409,22 @@ def _fstring(a, b, c, d):
return f'{a} {b:4} {c!r} {d!r:4}' return f'{a} {b:4} {c!r} {d!r:4}'
dis_fstring = """\ dis_fstring = """\
%3d RESUME 0 %3d RESUME 0
%3d LOAD_FAST 0 (a) %3d LOAD_FAST 0 (a)
FORMAT_VALUE 0 FORMAT_VALUE 0
LOAD_CONST 1 (' ') LOAD_CONST 1 (' ')
LOAD_FAST 1 (b) LOAD_FAST 1 (b)
LOAD_CONST 2 ('4') LOAD_CONST 2 ('4')
FORMAT_VALUE 4 (with format) FORMAT_VALUE 4 (with format)
LOAD_CONST 1 (' ') LOAD_CONST 1 (' ')
LOAD_FAST 2 (c) LOAD_FAST 2 (c)
FORMAT_VALUE 2 (repr) FORMAT_VALUE 2 (repr)
LOAD_CONST 1 (' ') LOAD_CONST 1 (' ')
LOAD_FAST 3 (d) LOAD_FAST 3 (d)
LOAD_CONST 2 ('4') LOAD_CONST 2 ('4')
FORMAT_VALUE 6 (repr, with format) FORMAT_VALUE 6 (repr, with format)
BUILD_STRING 7 BUILD_STRING 7
RETURN_VALUE RETURN_VALUE
""" % (_fstring.__code__.co_firstlineno, _fstring.__code__.co_firstlineno + 1) """ % (_fstring.__code__.co_firstlineno, _fstring.__code__.co_firstlineno + 1)
@ -441,28 +441,28 @@ def _tryfinallyconst(b):
b() b()
dis_tryfinally = """\ dis_tryfinally = """\
%3d RESUME 0 %3d RESUME 0
%3d NOP %3d NOP
%3d LOAD_FAST 0 (a) %3d LOAD_FAST 0 (a)
%3d PUSH_NULL %3d PUSH_NULL
LOAD_FAST 1 (b) LOAD_FAST 1 (b)
PRECALL 0 PRECALL 0
CALL 0 CALL 0
POP_TOP POP_TOP
RETURN_VALUE RETURN_VALUE
>> PUSH_EXC_INFO >> PUSH_EXC_INFO
PUSH_NULL PUSH_NULL
LOAD_FAST 1 (b) LOAD_FAST 1 (b)
PRECALL 0 PRECALL 0
CALL 0 CALL 0
POP_TOP POP_TOP
RERAISE 0 RERAISE 0
>> COPY 3 >> COPY 3
POP_EXCEPT POP_EXCEPT
RERAISE 1 RERAISE 1
ExceptionTable: ExceptionTable:
""" % (_tryfinally.__code__.co_firstlineno, """ % (_tryfinally.__code__.co_firstlineno,
_tryfinally.__code__.co_firstlineno + 1, _tryfinally.__code__.co_firstlineno + 1,
@ -471,29 +471,29 @@ ExceptionTable:
) )
dis_tryfinallyconst = """\ dis_tryfinallyconst = """\
%3d RESUME 0 %3d RESUME 0
%3d NOP %3d NOP
%3d NOP %3d NOP
%3d PUSH_NULL %3d PUSH_NULL
LOAD_FAST 0 (b) LOAD_FAST 0 (b)
PRECALL 0 PRECALL 0
CALL 0 CALL 0
POP_TOP POP_TOP
LOAD_CONST 1 (1) LOAD_CONST 1 (1)
RETURN_VALUE RETURN_VALUE
PUSH_EXC_INFO PUSH_EXC_INFO
PUSH_NULL PUSH_NULL
LOAD_FAST 0 (b) LOAD_FAST 0 (b)
PRECALL 0 PRECALL 0
CALL 0 CALL 0
POP_TOP POP_TOP
RERAISE 0 RERAISE 0
>> COPY 3 >> COPY 3
POP_EXCEPT POP_EXCEPT
RERAISE 1 RERAISE 1
ExceptionTable: ExceptionTable:
""" % (_tryfinallyconst.__code__.co_firstlineno, """ % (_tryfinallyconst.__code__.co_firstlineno,
_tryfinallyconst.__code__.co_firstlineno + 1, _tryfinallyconst.__code__.co_firstlineno + 1,
@ -518,17 +518,17 @@ def _h(y):
return foo return foo
dis_nested_0 = """\ dis_nested_0 = """\
MAKE_CELL 0 (y) MAKE_CELL 0 (y)
%3d RESUME 0 %3d RESUME 0
%3d LOAD_CLOSURE 0 (y) %3d LOAD_CLOSURE 0 (y)
BUILD_TUPLE 1 BUILD_TUPLE 1
LOAD_CONST 1 (<code object foo at 0x..., file "%s", line %d>) LOAD_CONST 1 (<code object foo at 0x..., file "%s", line %d>)
MAKE_FUNCTION 8 (closure) MAKE_FUNCTION 8 (closure)
STORE_FAST 1 (foo) STORE_FAST 1 (foo)
%3d LOAD_FAST 1 (foo) %3d LOAD_FAST 1 (foo)
RETURN_VALUE RETURN_VALUE
""" % (_h.__code__.co_firstlineno, """ % (_h.__code__.co_firstlineno,
_h.__code__.co_firstlineno + 1, _h.__code__.co_firstlineno + 1,
@ -539,19 +539,19 @@ dis_nested_0 = """\
dis_nested_1 = """%s dis_nested_1 = """%s
Disassembly of <code object foo at 0x..., file "%s", line %d>: Disassembly of <code object foo at 0x..., file "%s", line %d>:
COPY_FREE_VARS 1 COPY_FREE_VARS 1
MAKE_CELL 0 (x) MAKE_CELL 0 (x)
%3d RESUME 0 %3d RESUME 0
%3d LOAD_CLOSURE 0 (x) %3d LOAD_CLOSURE 0 (x)
BUILD_TUPLE 1 BUILD_TUPLE 1
LOAD_CONST 1 (<code object <listcomp> at 0x..., file "%s", line %d>) LOAD_CONST 1 (<code object <listcomp> at 0x..., file "%s", line %d>)
MAKE_FUNCTION 8 (closure) MAKE_FUNCTION 8 (closure)
LOAD_DEREF 1 (y) LOAD_DEREF 1 (y)
GET_ITER GET_ITER
PRECALL 0 PRECALL 0
CALL 0 CALL 0
RETURN_VALUE RETURN_VALUE
""" % (dis_nested_0, """ % (dis_nested_0,
__file__, __file__,
@ -564,18 +564,18 @@ Disassembly of <code object foo at 0x..., file "%s", line %d>:
dis_nested_2 = """%s dis_nested_2 = """%s
Disassembly of <code object <listcomp> at 0x..., file "%s", line %d>: Disassembly of <code object <listcomp> at 0x..., file "%s", line %d>:
COPY_FREE_VARS 1 COPY_FREE_VARS 1
%3d RESUME 0 %3d RESUME 0
BUILD_LIST 0 BUILD_LIST 0
LOAD_FAST 0 (.0) LOAD_FAST 0 (.0)
>> FOR_ITER 7 (to 24) >> FOR_ITER 7 (to 24)
STORE_FAST 1 (z) STORE_FAST 1 (z)
LOAD_DEREF 2 (x) LOAD_DEREF 2 (x)
LOAD_FAST 1 (z) LOAD_FAST 1 (z)
BINARY_OP 0 (+) BINARY_OP 0 (+)
LIST_APPEND 2 LIST_APPEND 2
JUMP_BACKWARD 8 (to 8) JUMP_BACKWARD 8 (to 8)
>> RETURN_VALUE >> RETURN_VALUE
""" % (dis_nested_1, """ % (dis_nested_1,
__file__, __file__,
@ -588,16 +588,16 @@ def load_test(x, y=0):
return a, b return a, b
dis_load_test_quickened_code = """\ dis_load_test_quickened_code = """\
%3d 0 RESUME_QUICK 0 %3d 0 RESUME_QUICK 0
%3d 2 LOAD_FAST__LOAD_FAST 0 (x) %3d 2 LOAD_FAST__LOAD_FAST 0 (x)
4 LOAD_FAST 1 (y) 4 LOAD_FAST 1 (y)
6 STORE_FAST__STORE_FAST 3 (b) 6 STORE_FAST__STORE_FAST 3 (b)
8 STORE_FAST__LOAD_FAST 2 (a) 8 STORE_FAST__LOAD_FAST 2 (a)
%3d 10 LOAD_FAST__LOAD_FAST 2 (a) %3d 10 LOAD_FAST__LOAD_FAST 2 (a)
12 LOAD_FAST 3 (b) 12 LOAD_FAST 3 (b)
14 BUILD_TUPLE 2 14 BUILD_TUPLE 2
16 RETURN_VALUE 16 RETURN_VALUE
""" % (load_test.__code__.co_firstlineno, """ % (load_test.__code__.co_firstlineno,
load_test.__code__.co_firstlineno + 1, load_test.__code__.co_firstlineno + 1,
@ -608,25 +608,25 @@ def loop_test():
load_test(i) load_test(i)
dis_loop_test_quickened_code = """\ dis_loop_test_quickened_code = """\
%3d 0 RESUME_QUICK 0 %3d 0 RESUME_QUICK 0
%3d 2 BUILD_LIST 0 %3d 2 BUILD_LIST 0
4 LOAD_CONST 1 ((1, 2, 3)) 4 LOAD_CONST 1 ((1, 2, 3))
6 LIST_EXTEND 1 6 LIST_EXTEND 1
8 LOAD_CONST 2 (3) 8 LOAD_CONST 2 (3)
10 BINARY_OP_ADAPTIVE 5 (*) 10 BINARY_OP_ADAPTIVE 5 (*)
14 GET_ITER 14 GET_ITER
16 FOR_ITER 17 (to 52) 16 FOR_ITER 17 (to 52)
18 STORE_FAST 0 (i) 18 STORE_FAST 0 (i)
%3d 20 LOAD_GLOBAL_MODULE 1 (NULL + load_test) %3d 20 LOAD_GLOBAL_MODULE 1 (NULL + load_test)
32 LOAD_FAST 0 (i) 32 LOAD_FAST 0 (i)
34 PRECALL_PYFUNC 1 34 PRECALL_PYFUNC 1
38 CALL_PY_WITH_DEFAULTS 1 38 CALL_PY_WITH_DEFAULTS 1
48 POP_TOP 48 POP_TOP
50 JUMP_BACKWARD_QUICK 18 (to 16) 50 JUMP_BACKWARD_QUICK 18 (to 16)
%3d >> 52 LOAD_CONST 0 (None) %3d >> 52 LOAD_CONST 0 (None)
54 RETURN_VALUE 54 RETURN_VALUE
""" % (loop_test.__code__.co_firstlineno, """ % (loop_test.__code__.co_firstlineno,
loop_test.__code__.co_firstlineno + 1, loop_test.__code__.co_firstlineno + 1,
@ -734,7 +734,19 @@ class DisTests(DisTestBase):
self.assertEqual(dis.opmap["STORE_NAME"], dis.HAVE_ARGUMENT) self.assertEqual(dis.opmap["STORE_NAME"], dis.HAVE_ARGUMENT)
def test_widths(self): def test_widths(self):
long_opcodes = set(['POP_JUMP_FORWARD_IF_FALSE',
'POP_JUMP_FORWARD_IF_TRUE',
'POP_JUMP_FORWARD_IF_NOT_NONE',
'POP_JUMP_FORWARD_IF_NONE',
'POP_JUMP_BACKWARD_IF_FALSE',
'POP_JUMP_BACKWARD_IF_TRUE',
'POP_JUMP_BACKWARD_IF_NOT_NONE',
'POP_JUMP_BACKWARD_IF_NONE',
'JUMP_BACKWARD_NO_INTERRUPT',
])
for opcode, opname in enumerate(dis.opname): for opcode, opname in enumerate(dis.opname):
if opname in long_opcodes:
continue
with self.subTest(opname=opname): with self.subTest(opname=opname):
width = dis._OPNAME_WIDTH width = dis._OPNAME_WIDTH
if opcode < dis.HAVE_ARGUMENT: if opcode < dis.HAVE_ARGUMENT:
@ -800,19 +812,19 @@ class DisTests(DisTestBase):
def expected(count, w): def expected(count, w):
s = ['''\ s = ['''\
1 %*d RESUME 0 1 %*d RESUME 0
''' % (w, 0)] ''' % (w, 0)]
s += ['''\ s += ['''\
%*d LOAD_FAST 0 (x) %*d LOAD_FAST 0 (x)
%*d LOAD_CONST 1 (1) %*d LOAD_CONST 1 (1)
%*d BINARY_OP 0 (+) %*d BINARY_OP 0 (+)
%*d STORE_FAST 0 (x) %*d STORE_FAST 0 (x)
''' % (w, 10*i + 2, w, 10*i + 4, w, 10*i + 6, w, 10*i + 10) ''' % (w, 10*i + 2, w, 10*i + 4, w, 10*i + 6, w, 10*i + 10)
for i in range(count)] for i in range(count)]
s += ['''\ s += ['''\
3 %*d LOAD_FAST 0 (x) 3 %*d LOAD_FAST 0 (x)
%*d RETURN_VALUE %*d RETURN_VALUE
''' % (w, 10*count + 2, w, 10*count + 4)] ''' % (w, 10*count + 2, w, 10*count + 4)]
s[1] = ' 2' + s[1][3:] s[1] = ' 2' + s[1][3:]
@ -926,28 +938,28 @@ class DisTests(DisTestBase):
@cpython_only @cpython_only
def test_binary_specialize(self): def test_binary_specialize(self):
binary_op_quicken = """\ binary_op_quicken = """\
0 RESUME_QUICK 0 0 RESUME_QUICK 0
1 2 LOAD_NAME 0 (a) 1 2 LOAD_NAME 0 (a)
4 LOAD_NAME 1 (b) 4 LOAD_NAME 1 (b)
6 %s 6 %s
10 RETURN_VALUE 10 RETURN_VALUE
""" """
co_int = compile('a + b', "<int>", "eval") co_int = compile('a + b', "<int>", "eval")
self.code_quicken(lambda: exec(co_int, {}, {'a': 1, 'b': 2})) self.code_quicken(lambda: exec(co_int, {}, {'a': 1, 'b': 2}))
got = self.get_disassembly(co_int, adaptive=True) got = self.get_disassembly(co_int, adaptive=True)
self.do_disassembly_compare(got, binary_op_quicken % "BINARY_OP_ADD_INT 0 (+)", True) self.do_disassembly_compare(got, binary_op_quicken % "BINARY_OP_ADD_INT 0 (+)", True)
co_unicode = compile('a + b', "<unicode>", "eval") co_unicode = compile('a + b', "<unicode>", "eval")
self.code_quicken(lambda: exec(co_unicode, {}, {'a': 'a', 'b': 'b'})) self.code_quicken(lambda: exec(co_unicode, {}, {'a': 'a', 'b': 'b'}))
got = self.get_disassembly(co_unicode, adaptive=True) got = self.get_disassembly(co_unicode, adaptive=True)
self.do_disassembly_compare(got, binary_op_quicken % "BINARY_OP_ADD_UNICODE 0 (+)", True) self.do_disassembly_compare(got, binary_op_quicken % "BINARY_OP_ADD_UNICODE 0 (+)", True)
binary_subscr_quicken = """\ binary_subscr_quicken = """\
0 RESUME_QUICK 0 0 RESUME_QUICK 0
1 2 LOAD_NAME 0 (a) 1 2 LOAD_NAME 0 (a)
4 LOAD_CONST 0 (0) 4 LOAD_CONST 0 (0)
6 %s 6 %s
16 RETURN_VALUE 16 RETURN_VALUE
""" """
@ -964,10 +976,10 @@ class DisTests(DisTestBase):
@cpython_only @cpython_only
def test_load_attr_specialize(self): def test_load_attr_specialize(self):
load_attr_quicken = """\ load_attr_quicken = """\
0 RESUME_QUICK 0 0 RESUME_QUICK 0
1 2 LOAD_CONST 0 ('a') 1 2 LOAD_CONST 0 ('a')
4 LOAD_ATTR_SLOT 0 (__class__) 4 LOAD_ATTR_SLOT 0 (__class__)
14 RETURN_VALUE 14 RETURN_VALUE
""" """
co = compile("'a'.__class__", "", "eval") co = compile("'a'.__class__", "", "eval")
@ -978,13 +990,13 @@ class DisTests(DisTestBase):
@cpython_only @cpython_only
def test_call_specialize(self): def test_call_specialize(self):
call_quicken = """\ call_quicken = """\
0 RESUME_QUICK 0 0 RESUME_QUICK 0
1 2 PUSH_NULL 1 2 PUSH_NULL
4 LOAD_NAME 0 (str) 4 LOAD_NAME 0 (str)
6 LOAD_CONST 0 (1) 6 LOAD_CONST 0 (1)
8 PRECALL_NO_KW_STR_1 1 8 PRECALL_NO_KW_STR_1 1
12 CALL_ADAPTIVE 1 12 CALL_ADAPTIVE 1
22 RETURN_VALUE 22 RETURN_VALUE
""" """
co = compile("str(1)", "", "eval") co = compile("str(1)", "", "eval")