Skip to content

gh-112137: change dis output to display labels instead of offsets #112138

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 25 commits into from
Nov 22, 2023
Merged

gh-112137: change dis output to display labels instead of offsets #112138

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5470f75
Instruction gets the label
iritkatriel Nov 15, 2023
54cb8ca
replace offsets by labels
iritkatriel Nov 16, 2023
c363ee8
📜🤖 Added by blurb_it.
blurb-it[bot] Nov 16, 2023
6ac23fd
Merge branch 'main' into dis_labels
iritkatriel Nov 16, 2023
852c5c4
distinguish between jump targets (J) and exception handlers (H)
iritkatriel Nov 16, 2023
af97cee
nice exception ranges
iritkatriel Nov 16, 2023
d2884ed
labels in exception table, and on separate line in the code
iritkatriel Nov 17, 2023
c527ded
fix tests
iritkatriel Nov 17, 2023
b3914e6
do not collapse excaption table in tests
iritkatriel Nov 17, 2023
efd5906
update dis.rst doctest
iritkatriel Nov 17, 2023
83ae74e
whitespace
iritkatriel Nov 17, 2023
bac6628
whitespace
iritkatriel Nov 20, 2023
390c7a2
add option to include offset and labels on same line as instruction
iritkatriel Nov 21, 2023
020c742
fix doctest
iritkatriel Nov 21, 2023
965a3cd
linenumber, then labels, then (optionally) offsets
iritkatriel Nov 22, 2023
7d00ddb
update tests
iritkatriel Nov 22, 2023
a7de18c
fix doctest
iritkatriel Nov 22, 2023
cc24af8
whitespace
iritkatriel Nov 22, 2023
6542b06
whitespace
iritkatriel Nov 22, 2023
823b0e1
add test with offsets
iritkatriel Nov 22, 2023
2219a96
add doc
iritkatriel Nov 22, 2023
f52d698
whitespace
iritkatriel Nov 22, 2023
278aae3
whitespace
iritkatriel Nov 22, 2023
5420f6b
tweak doc
iritkatriel Nov 22, 2023
d741666
remove extra line
iritkatriel Nov 22, 2023
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
Next Next commit
add test with offsets
  • Loading branch information
@iritkatriel
iritkatriel committed Nov 22, 2023
commit 823b0e1f9e4d2ff122528f75ccb9b41ed2ad34dd
23 changes: 19 additions & 4 deletions Lib/test/test_dis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,19 @@ def _f(a):
_f.__code__.co_firstlineno + 1,
_f.__code__.co_firstlineno + 2)

dis_f_with_offsets = """\
%3d 0 RESUME 0

%3d 2 LOAD_GLOBAL 1 (print + NULL)
12 LOAD_FAST 0 (a)
14 CALL 1
22 POP_TOP

%3d 24 RETURN_CONST 1 (1)
""" % (_f.__code__.co_firstlineno,
_f.__code__.co_firstlineno + 1,
_f.__code__.co_firstlineno + 2)


dis_f_co_code = """\
RESUME 0
Expand All @@ -122,7 +135,6 @@ def _f(a):
RETURN_CONST 1
"""


def bug708901():
for res in range(1,
10):
Expand Down Expand Up @@ -899,15 +911,15 @@ def get_disassembly(self, func, lasti=-1, wrapper=True, **kwargs):
def get_disassemble_as_string(self, func, lasti=-1):
return self.get_disassembly(func, lasti, False)

def do_disassembly_test(self, func, expected):
def do_disassembly_test(self, func, expected, **kwargs):
self.maxDiff = None
got = self.get_disassembly(func, depth=0)
got = self.get_disassembly(func, depth=0, **kwargs)
self.do_disassembly_compare(got, expected)
# Add checks for dis.disco
if hasattr(func, '__code__'):
got_disco = io.StringIO()
with contextlib.redirect_stdout(got_disco):
dis.disco(func.__code__)
dis.disco(func.__code__, **kwargs)
self.do_disassembly_compare(got_disco.getvalue(), expected)

def test_opmap(self):
Expand Down Expand Up @@ -936,6 +948,9 @@ def test_widths(self):
def test_dis(self):
self.do_disassembly_test(_f, dis_f)

def test_dis_with_offsets(self):
self.do_disassembly_test(_f, dis_f_with_offsets, show_offsets=True)

def test_bug_708901(self):
self.do_disassembly_test(bug708901, dis_bug708901)

Expand Down