Skip to content

bpo-42562: Fix issue when dis failed to parse function that has no line numbers #23632

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.

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
merged 4 commits into from
Dec 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Lib/dis.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ def _disassemble_bytes(code, lasti=-1, varnames=None, names=None,
constants=None, cells=None, linestarts=None,
*, file=None, line_offset=0):
# Omit the line number column entirely if we have no line number info
show_lineno = linestarts is not None
show_lineno = bool(linestarts)
if show_lineno:
maxlineno = max(linestarts.values()) + line_offset
if maxlineno >= 1000:
Expand Down
17 changes: 17 additions & 0 deletions Lib/test/test_dis.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,20 @@ def bug1333982(x=[]):
bug1333982.__code__.co_firstlineno + 2,
bug1333982.__code__.co_firstlineno + 1)


def bug42562():
pass


# Set line number for 'pass' to None
bug42562.__code__ = bug42562.__code__.replace(co_linetable=b'\x04\x80\xff\x80')


dis_bug42562 = """\
0 LOAD_CONST 0 (None)
2 RETURN_VALUE
"""

_BIG_LINENO_FORMAT = """\
%3d 0 LOAD_GLOBAL 0 (spam)
2 POP_TOP
Expand Down Expand Up @@ -520,6 +534,9 @@ def test_bug_1333982(self):

self.do_disassembly_test(bug1333982, dis_bug1333982)

def test_bug_42562(self):
self.do_disassembly_test(bug42562, dis_bug42562)

def test_big_linenos(self):
def func(count):
namespace = {}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix issue when dis failed to parse function that has no line numbers. Patch
provided by Yurii Karabas.