Remove asserts that confuse enum _framestate with enum _frameowner#124148
Merged
colesbury merged 3 commits intopython:mainfrom Jan 2, 2025
Merged
Remove asserts that confuse enum _framestate with enum _frameowner#124148colesbury merged 3 commits intopython:mainfrom
enum _framestate with enum _frameowner#124148colesbury merged 3 commits intopython:mainfrom
Conversation
The owner field of _PyInterpreterFrame is supposed to be a member of enum _frameowner, but FRAME_CLEARED is a member of enum _framestate. At present, it happens that FRAME_CLEARED is not numerically equal to any member of enum _frameowner, but that could change in the future. The code that incorrectly assigned owner = FRAME_CLEARED was deleted in commit a53cc3f (pythonGH-116687). Remove the incorrect checks for owner != FRAME_CLEARED as well. Signed-off-by: Anders Kaseorg <andersk@mit.edu>
brandtbucher
approved these changes
Sep 24, 2024
Member
brandtbucher
left a comment
brandtbucher
left a comment
There was a problem hiding this comment.
Yup, makes sense. Nice catch.
colesbury
added
needs backport to 3.12
|
Thanks @andersk for the PR, and @colesbury for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13. |
|
Sorry, @andersk and @colesbury, I could not cleanly backport this to |
|
Sorry, @andersk and @colesbury, I could not cleanly backport this to |
Contributor
|
Backports didn't apply cleanly and we didn't backport #116687, so I figure it's probably not worth backporting this after all. |
colesbury
removed
needs backport to 3.12
srinivasreddy
pushed a commit
to srinivasreddy/cpython
that referenced
this pull request
Jan 8, 2025
pythonGH-124148) The `owner` field of `_PyInterpreterFrame` is supposed to be a member of `enum _frameowner`, but `FRAME_CLEARED` is a member of `enum _framestate`. At present, it happens that `FRAME_CLEARED` is not numerically equal to any member of `enum _frameowner`, but that could change in the future. The code that incorrectly assigned `owner = FRAME_CLEARED` was deleted in commit a53cc3f (pythonGH-116687). Remove the incorrect checks for `owner != FRAME_CLEARED` as well.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The
ownerfield of_PyInterpreterFrameis supposed to be a member ofenum _frameowner, butFRAME_CLEAREDis a member ofenum _framestate. At present, it happens thatFRAME_CLEAREDis not numerically equal to any member ofenum _frameowner, but that could change in the future. The code that incorrectly assignedowner = FRAME_CLEAREDwas deleted in commit a53cc3f (GH-116687). Remove the incorrect checks forowner != FRAME_CLEAREDas well.