GH-104584: Restore frame->stacktop on optimizer error
#108953
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
brandtbucher
commented
Sep 5, 2023
•
brandtbucher
commented
- Issue: Pluggable optimizer API #104584
brandtbucher
added
interpreter-core
brandtbucher
changed the title
stack_pointer on optimizer errorframe->stacktop on optimizer error
gvanrossum
approved these changes
Sep 5, 2023
There was a problem hiding this comment.
Just ran into this by coincidence. Fine to merge, but I do have a quibble (more aimed at @markshannon perhaps :-).
| @@ -169,6 +169,7 @@ _PyOptimizer_BackEdge(_PyInterpreterFrame *frame, _Py_CODEUNIT *src, _Py_CODEUNI | |||
| if (err <= 0) { | |||
| assert(executor == NULL); | |||
| if (err < 0) { | |||
| _PyFrame_SetStackPointer(frame, stack_pointer); | |||
There was a problem hiding this comment.
Oh, interesting. It seems this is needed because when JUMP_BACKWARD calls _PyOptimizer_BackEdge it doesn't update the stack pointer in the frame, it just passes the stack pointer to the optimizer, which upon success passes it to the executor, which will eventually call STORE_SP() to update the stack pointer in the frame. And sure, this PR seems to fix the hole, but I wonder if it wouldn't be more robust to just save it before even calling _PyOptimizer_BackEdge.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.