bpo-42562: Fix issue when dis failed to parse function that has no line numbers (GH-23632)
Fix issue when dis failed to parse function that has only annotations
This commit is contained in:
parent
db68544122
commit
f24b8101a0
|
@ -384,7 +384,7 @@ def _disassemble_bytes(code, lasti=-1, varnames=None, names=None,
|
||||||
constants=None, cells=None, linestarts=None,
|
constants=None, cells=None, linestarts=None,
|
||||||
*, file=None, line_offset=0):
|
*, file=None, line_offset=0):
|
||||||
# Omit the line number column entirely if we have no line number info
|
# 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:
|
if show_lineno:
|
||||||
maxlineno = max(linestarts.values()) + line_offset
|
maxlineno = max(linestarts.values()) + line_offset
|
||||||
if maxlineno >= 1000:
|
if maxlineno >= 1000:
|
||||||
|
|
|
@ -166,6 +166,20 @@ dis_bug1333982 = """\
|
||||||
bug1333982.__code__.co_firstlineno + 2,
|
bug1333982.__code__.co_firstlineno + 2,
|
||||||
bug1333982.__code__.co_firstlineno + 1)
|
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 = """\
|
_BIG_LINENO_FORMAT = """\
|
||||||
%3d 0 LOAD_GLOBAL 0 (spam)
|
%3d 0 LOAD_GLOBAL 0 (spam)
|
||||||
2 POP_TOP
|
2 POP_TOP
|
||||||
|
@ -520,6 +534,9 @@ class DisTests(unittest.TestCase):
|
||||||
|
|
||||||
self.do_disassembly_test(bug1333982, dis_bug1333982)
|
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 test_big_linenos(self):
|
||||||
def func(count):
|
def func(count):
|
||||||
namespace = {}
|
namespace = {}
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
Fix issue when dis failed to parse function that has no line numbers. Patch
|
||||||
|
provided by Yurii Karabas.
|
Loading…
Reference in New Issue