Skip to content

gh-126835: Disable tuple folding in the AST optimizer #128802

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

Closed
tomasr8 wants to merge 23 commits into from
Closed

gh-126835: Disable tuple folding in the AST optimizer #128802

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2f475e1
Disable tuple folding in the AST optimizer
tomasr8 Jan 3, 2025
7a96d47
Provisionally fix tests
tomasr8 Jan 3, 2025
6d93343
Tweak tests
Eclips4 Jan 16, 2025
02a38a3
Merge branch 'main' into ast-tuple-folding
Eclips4 Jan 17, 2025
5c05d69
Restore UNPACK_SEQUENCE_TWO_TUPLE
Eclips4 Jan 21, 2025
05f3e62
Update Lib/test/test_peepholer.py
Eclips4 Jan 21, 2025
a3d9790
Merge branch 'main' into ast-tuple-folding
Eclips4 Jan 21, 2025
9f1feb4
Restore test_folding_op by changing const from tuple to a string
Eclips4 Jan 27, 2025
ac50aad
Fold set into frozenset in CFG
Eclips4 Jan 27, 2025
2b39a13
Merge branch 'main' into ast-tuple-folding
Eclips4 Feb 1, 2025
17dffaa
`for` target optimization (set/list -> frozenset/tuple)
Eclips4 Feb 1, 2025
46845f0
Fold list into a tuple as rhs in `for`/`in` operators
Eclips4 Feb 1, 2025
e9631d8
Fix tests
Eclips4 Feb 1, 2025
53dfa93
Merge branch 'main' into ast-tuple-folding
Eclips4 Feb 4, 2025
9754820
Merge branch 'main' into ast-tuple-folding
Eclips4 Feb 14, 2025
477c784
Fix merge artifacts
Eclips4 Feb 14, 2025
6731dfb
Merge branch 'main' into ast-tuple-folding
Eclips4 Feb 22, 2025
aad9fb3
Remove failing tests
Eclips4 Feb 22, 2025
be40093
Restore test_peepholer tests
Eclips4 Feb 22, 2025
5aec965
Add a few tests
Eclips4 Feb 22, 2025
ee69f0f
Restore test
Eclips4 Feb 22, 2025
0801463
Regenerate some files
Eclips4 Feb 22, 2025
a268315
Address review
Eclips4 Feb 23, 2025
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 a few tests
  • Loading branch information
@Eclips4
Eclips4 committed Feb 22, 2025
commit 5aec965a9ea1721cb7decd8caa91e1d8e20c2e89
22 changes: 22 additions & 0 deletions Lib/test/test_peepholer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,28 @@ def negzero():
self.assertInBytecode(code, opname)
self.check_lnotab(code)

def test_folding_of_tuples_on_constants(self):

@WolframAlph WolframAlph Feb 22, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
def test_folding_of_tuples_on_constants(self):
def test_folding_of_tuples_of_constants(self):

@WolframAlph WolframAlph Feb 22, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And we actually, already have test_folding_of_tuples_of_constants, maybe we could add more to those instead?

tests =[
('()', True, 0),
('(1, 2, 3)', True, 3),
('("a", "b", "c")', True, 3),
('(1, a)', False, 2),
('(a, b, c)', False, 3),
('(1, (2, 3))', True, 2),
('(a, (b, c))', False, 2),
('(1, [], {})', False, 3),
(repr(tuple(range(30))), True, 30),
('(1, (2, (3, (4, (5)))))', True, 2)
]
for expr, is_const, length in tests:
with self.subTest(expr=expr, is_const=is_const, length=length):
code = compile(expr, '', 'eval')
if is_const:
self.assertNotInBytecode(code, 'BUILD_TUPLE', length)
self.assertInBytecode(code, 'LOAD_CONST', eval(expr))
else:
self.assertInBytecode(code, 'BUILD_TUPLE', length)

def test_elim_extra_return(self):
# RETURN LOAD_CONST None RETURN --> RETURN
def f(x):
Expand Down