bpo-45813: Drop redundant assertion from frame.clear() #29990
Merged
Conversation
This file contains hidden or 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
asvetlov
commented
Dec 8, 2021
| @@ -686,7 +686,6 @@ frame_clear(PyFrameObject *f, PyObject *Py_UNUSED(ignored)) | |||
| } | |||
| if (f->f_frame->generator) { | |||
| _PyGen_Finalize(f->f_frame->generator); | |||
| assert(f->f_frame->generator == NULL); | |||
There was a problem hiding this comment.
The check doesn't make sense, frame->generator consistency is checked by InterpreterFrame (Python/frame.c), not by PyFrameObject (Objects/frameobject.c).
@markshannon I very much appreciate it if you find time for the review.
There was a problem hiding this comment.
I agree. This assert would be appropriate in the dealloc function, but not in clear.
There was a problem hiding this comment.
Brilliant idea. Added assertion to frame_dealloc().
asvetlov
commented
Dec 8, 2021
| @@ -686,7 +686,6 @@ frame_clear(PyFrameObject *f, PyObject *Py_UNUSED(ignored)) | |||
| } | |||
| if (f->f_frame->generator) { | |||
| _PyGen_Finalize(f->f_frame->generator); | |||
| assert(f->f_frame->generator == NULL); | |||
There was a problem hiding this comment.
Brilliant idea. Added assertion to frame_dealloc().
| 'This would crash the interpreter in 3.11a2' | ||
| async def f(): | ||
| pass | ||
| frame = f().cr_frame | ||
| frame.clear() | ||
| with self.assertWarns(RuntimeWarning): |
There was a problem hiding this comment.
Suppress printing RuntimeWarning: coroutine 'CoroutineTest.test_bpo_....<locals>.f' was never awaited on the console.
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.
#29700 fixes one crash scenario.
This PR fixes a case when the generator is held by external reference, not the generator's frame object.
A separate NEWs entry is not required, #29700 already provides a good enough description.
https://bugs.python.org/issue45813