Skip to content

gh-123165: correct tests for dis.dis(func, show_positions=True) #123220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iritkatriel merged 2 commits into from
Aug 22, 2024
Merged

gh-123165: correct tests for dis.dis(func, show_positions=True) #123220

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3bc26f
fake positions on CPython implementations only
picnixz Aug 22, 2024
71f2048
simplify
picnixz Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
simplify
  • Loading branch information
@picnixz
picnixz committed Aug 22, 2024
commit 71f2048ccc88848284de1ab0a9dd59712baf7c47
77 changes: 38 additions & 39 deletions Lib/test/test_dis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Minimal tests for dis module

import ast
import contextlib
import dis
import functools
Expand Down Expand Up @@ -974,51 +975,49 @@ def format_instr_positions(instr):
expected = dis_f_with_positions_format % positions
self.do_disassembly_test(_f, expected, show_positions=True)

@cpython_only
@requires_debug_ranges()
def test_dis_with_some_positions(self):
# If this test fails, it means that the construction of co_linetable
# has been changed. Please update this test and the internal docs
# accordingly so that they stay in sync.

def f():
pass
code = ("def f():\n"
" try: pass\n"
" finally:pass")
f = compile(ast.parse(code), "?", "exec").co_consts[0]

PY_CODE_LOCATION_INFO_NO_COLUMNS = 13
PY_CODE_LOCATION_INFO_WITH_COLUMNS = 14
PY_CODE_LOCATION_INFO_NO_LOCATION = 15

f.__code__ = f.__code__.replace(
co_stacksize=1,
co_firstlineno=42,
co_code=bytes([
dis.opmap["RESUME"], 0,
dis.opmap["NOP"], 0,
dis.opmap["RETURN_CONST"], 0,
]),
co_linetable=bytes([
(1 << 7)
| (PY_CODE_LOCATION_INFO_NO_COLUMNS << 3)
| (1 - 1), # 1 code unit (RESUME)
(1 << 1), # start line offset (encoded as an svarint)
(1 << 7)
| (PY_CODE_LOCATION_INFO_NO_LOCATION << 3)
| (1 - 1), # 1 code unit (NOP)
(1 << 7)
| (PY_CODE_LOCATION_INFO_WITH_COLUMNS << 3)
| (1 - 1), # 1 code unit (RETURN CONST)
(2 << 1), # start line offset (encoded as an svarint)
3, # end line offset (encoded as a varint)
1, # 1-based start column (reported as COL - 1)
5, # 1-based end column (reported as ENDCOL - 1)
]
))
expect = '\n'.join([
'43:?-43:? RESUME 0',
'1:0-1:0 RESUME 0',
'',
'2:3-3:15 NOP',
'',
'3:11-3:15 RETURN_CONST 0 (None)',
'',
' -- L1: PUSH_EXC_INFO',
'',
'3:11-3:15 RERAISE 0',
'',
' -- NOP',
' -- L2: COPY 3',
' -- POP_EXCEPT',
' -- RERAISE 1',
'ExceptionTable:',
' L1 to L2 -> L2 [1] lasti',
'',
])
self.do_disassembly_test(f, expect, show_positions=True)

@requires_debug_ranges()
def test_dis_with_linenos_but_no_columns(self):
code = "def f():\n\tx = 1"
tree = ast.parse(code)
func = tree.body[0]
ass_x = func.body[0].targets[0]
# remove columns information but keep line information
ass_x.col_offset = ass_x.end_col_offset = -1
f = compile(tree, "?", "exec").co_consts[0]

expect = '\n'.join([
'1:0-1:0 RESUME 0',
'',
'45:0-48:4 RETURN_CONST 0 (None)',
'2:5-2:6 LOAD_CONST 1 (1)',
'2:?-2:? STORE_FAST 0 (x)',
'2:?-2:? RETURN_CONST 0 (None)',
'',
])
self.do_disassembly_test(f, expect, show_positions=True)
Expand Down