mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

gh-107901: make compiler inline basic blocks with no line number and no fallthrough (#114750)

Browse source
This commit is contained in:
Irit Katriel 2024-02-02 11:26:31 +00:00 • committed by GitHub
parent 41fde89e47
commit 2091fb2a85
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 108 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Lib/test/test_compile.py
View file

@ -1104,6 +1104,17 @@ class TestSpecifics(unittest.TestCase):
code_lines = self.get_code_lines(test.__code__)
self.assertEqual(expected_lines, code_lines)
def check_line_numbers(self, code, opnames=None):
# Check that all instructions whose op matches opnames
# have a line number. opnames can be a single name, or
# a sequence of names. If it is None, match all ops.
if isinstance(opnames, str):
opnames = (opnames, )
for inst in dis.Bytecode(code):
if opnames and inst.opname in opnames:
self.assertIsNotNone(inst.positions.lineno)
def test_line_number_synthetic_jump_multiple_predecessors(self):
def f():
for x in it:
@ -1113,25 +1124,52 @@ class TestSpecifics(unittest.TestCase):
except OSError:
pass
# Ensure that all JUMP_BACKWARDs have line number
code = f.__code__
for inst in dis.Bytecode(code):
if inst.opname == 'JUMP_BACKWARD':
self.assertIsNotNone(inst.positions.lineno)
self.check_line_numbers(f.__code__, 'JUMP_BACKWARD')
def test_lineno_of_backward_jump(self):
def test_line_number_synthetic_jump_multiple_predecessors_nested(self):
def f():
for x in it:
try:
X = 3
except OSError:
try:
if C3:
X = 4
except OSError:
pass
return 42
self.check_line_numbers(f.__code__, 'JUMP_BACKWARD')
def test_line_number_synthetic_jump_multiple_predecessors_more_nested(self):
def f():
for x in it:
try:
X = 3
except OSError:
try:
if C3:
if C4:
X = 4
except OSError:
try:
if C3:
if C4:
X = 5
except OSError:
pass
return 42
self.check_line_numbers(f.__code__, 'JUMP_BACKWARD')
def test_lineno_of_backward_jump_conditional_in_loop(self):
# Issue gh-107901
def f():
for i in x:
if y:
pass
linenos = list(inst.positions.lineno
for inst in dis.get_instructions(f.__code__)
if inst.opname == 'JUMP_BACKWARD')
self.assertTrue(len(linenos) > 0)
self.assertTrue(all(l is not None for l in linenos))
self.check_line_numbers(f.__code__, 'JUMP_BACKWARD')
def test_big_dict_literal(self):
# The compiler has a flushing point in "compiler_dict" that calls compiles