Skip to content
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

Jump to bottom

gh-120367: fix removal of redundant NOPs and jumps after reordering hot-cold blocks #120425

Merged
merged 2 commits into from
Jun 17, 2024
Merged

gh-120367: fix removal of redundant NOPs and jumps after reordering hot-cold blocks #120425

merged 2 commits into from
Jun 17, 2024

Conversation

iritkatriel
Copy link
Member

@iritkatriel iritkatriel commented Jun 12, 2024 •
edited by bedevere-app bot
Loading

@iritkatriel iritkatriel added interpreter-core (Objects, Python, Grammar, and Parser dirs) needs backport to 3.13 bugs and security fixes labels Jun 12, 2024
@iritkatriel iritkatriel requested a review from markshannon as a code owner June 12, 2024 17:55
@bedevere-app bedevere-app bot mentioned this pull request Jun 12, 2024
Closed
@iritkatriel iritkatriel added the type-crash A hard crash of the interpreter, possibly with a core dump label Jun 12, 2024
@iritkatriel iritkatriel requested a review from carljm June 12, 2024 21:07
carljm
carljm approved these changes Jun 16, 2024
View reviewed changes
Lib/test/test_compile.py
Comment on lines +522 to +526
if hasattr(node,"lineno"):
del node.lineno
del node.end_lineno
del node.col_offset
del node.end_col_offset
Copy link
Member

Choose a reason for hiding this comment

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

why is it important for this test to remove node locations and then use ast.fix_missing_locations? maybe worth a comment?

@iritkatriel iritkatriel enabled auto-merge (squash) June 17, 2024 09:45
@iritkatriel iritkatriel merged commit 21866c8 into python:main Jun 17, 2024
36 checks passed
@miss-islington-app
Copy link

Thanks @iritkatriel for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 17, 2024
@iritkatriel @miss-islington
pythongh-120367: fix removal of redundant NOPs and jumps after reorde…
8ca7ab7 
…ring hot-cold blocks (pythonGH-120425)

(cherry picked from commit 21866c8)

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
@bedevere-app
Copy link

bedevere-app bot commented Jun 17, 2024

GH-120621 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Jun 17, 2024
iritkatriel added a commit that referenced this pull request Jun 17, 2024
@miss-islington @iritkatriel
[3.13] gh-120367: fix removal of redundant NOPs and jumps after reord…
61a2229 
…ering hot-cold blocks (GH-120425) (#120621)

gh-120367: fix removal of redundant NOPs and jumps after reordering hot-cold blocks (GH-120425)
(cherry picked from commit 21866c8)

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
@iritkatriel iritkatriel added type-bug An unexpected behavior, bug, or error and removed type-crash A hard crash of the interpreter, possibly with a core dump labels Jun 18, 2024
mrahtz pushed a commit to mrahtz/cpython that referenced this pull request Jun 30, 2024
@iritkatriel @mrahtz
pythongh-120367: fix removal of redundant NOPs and jumps after reorde…
96fb825 
…ring hot-cold blocks (python#120425)
noahbkim pushed a commit to hudson-trading/cpython that referenced this pull request Jul 11, 2024
@iritkatriel @noahbkim
pythongh-120367: fix removal of redundant NOPs and jumps after reorde…
090e658 
…ring hot-cold blocks (python#120425)
estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024
@iritkatriel @estyxx
pythongh-120367: fix removal of redundant NOPs and jumps after reorde…
dc246d9 
…ring hot-cold blocks (python#120425)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carljm carljm carljm approved these changes

@markshannon markshannon Awaiting requested review from markshannon markshannon is a code owner

Assignees
No one assigned
Labels
interpreter-core (Objects, Python, Grammar, and Parser dirs) type-bug An unexpected behavior, bug, or error
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

no_redundant_jumps: Assertion `0' failed
2 participants
@iritkatriel @carljm