GeezerVison is showing github.com — GH-104584: Restore `frame->stacktop` on optimizer error by brandtbucher · Pull Request #108953 · python/cpython
Conversation
brandtbucher
commented
Sep 5, 2023
•
edited by bedevere-bot
Loading
Uh oh!
There was an error while loading. Please reload this page.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
brandtbucher
changed the title
GH-104584: Restore stack_pointer on optimizer error
GH-104584: Restore frame->stacktop on optimizer error
Sep 5, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just ran into this by coincidence. Fine to merge, but I do have a quibble (more aimed at @markshannon perhaps :-).
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
|
|
if (err <= 0) {
|
|
|
assert(executor == NULL);
|
|
|
if (err < 0) {
|
|
|
_PyFrame_SetStackPointer(frame, stack_pointer);
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Reviewers
markshannon
Awaiting requested review from markshannon
markshannon is a code owner
Uh oh!
There was an error while loading. Please reload this page.
Labels
interpreter-core
(Objects, Python, Grammar, and Parser dirs)
type-crash
A hard crash of the interpreter, possibly with a core dump
Milestone
No milestone
Development
Successfully merging this pull request may close these issues.
Uh oh!
There was an error while loading. Please reload this page.
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.
|