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.

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

Remove asserts that confuse enum _framestate with enum _frameowner #124148

Merged
merged 3 commits into from
Jan 2, 2025

Conversation

andersk
Copy link
Contributor

@andersk andersk commented Sep 16, 2024

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 (GH-116687). Remove the incorrect checks for owner != FRAME_CLEARED as well.

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 <[email protected]>
Copy link
Contributor

@colesbury colesbury left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@brandtbucher brandtbucher left a comment

Choose a reason for hiding this comment

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

Yup, makes sense. Nice catch.

@colesbury colesbury added needs backport to 3.12 bug and security fixes needs backport to 3.13 bugs and security fixes labels Jan 2, 2025
@colesbury colesbury enabled auto-merge (squash) January 2, 2025 16:33
@colesbury colesbury merged commit a626f9a into python:main Jan 2, 2025
38 of 39 checks passed
@miss-islington-app
Copy link

Thanks @andersk for the PR, and @colesbury for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Sorry, @andersk and @colesbury, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker a626f9a67b76e5fe69677afd5f8317d8c61de8de 3.13

@miss-islington-app
Copy link

Sorry, @andersk and @colesbury, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker a626f9a67b76e5fe69677afd5f8317d8c61de8de 3.12

@colesbury
Copy link
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 colesbury removed needs backport to 3.12 bug and security fixes needs backport to 3.13 bugs and security fixes labels Jan 2, 2025
@colesbury colesbury removed their assignment Jan 2, 2025
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants