FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-153354: Fix bool conversion in generated __annotate__ by BHUVANSH855 · Pull Request #153360 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-153354: Fix bool conversion in generated __annotate__ - #153360

Merged
JelleZijlstra merged 2 commits into
python:mainfrom
BHUVANSH855:fix-153354-annotate-compare-op
Oct 7, 2026
ConversationCommits (2)ChecksFiles changed
Merged

gh-153354: Fix bool conversion in generated __annotate__#153360
JelleZijlstra merged 2 commits into
python:mainfrom
BHUVANSH855:fix-153354-annotate-compare-op

Conversation

BHUVANSH855 commented Jul 8, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Summary

Fix the compiler-generated __annotate__ guard by emitting TO_BOOL after COMPARE_OP, allowing the optimizer to generate the bool-converting COMPARE_OP before POP_JUMP_IF_FALSE.

Previously, the generated bytecode omitted the bool conversion required before POP_JUMP_IF_FALSE, allowing a non-boolean result from __gt__ to reach the jump. On debug builds this triggered an assertion failure, while release builds could exhibit incorrect behavior.

Changes

  • Emit TO_BOOL after the generated COMPARE_OP in codegen_setup_annotations_scope(), allowing the optimizer to fold it into a bool-converting COMPARE_OP.
  • Expand the regression test to cover compiler-generated __annotate__ functions for functions, classes, and modules.

Issue

Fixes gh-153354.

Testing

  • Built CPython (Debug, x64).
  • Verified that the original reproducer no longer crashes.
  • Verified that the generated bytecode now emits COMPARE_OP (bool(>)), matching normal conditional comparison code generation after optimization.
  • Ran the following test suites successfully:
PCbuild\amd64\python_d.exe -m test test_annotationlib
PCbuild\amd64\python_d.exe -m test test_compile

bedevere-app Bot commented Jul 8, 2026

Copy link
Copy Markdown

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

bedevere-app Bot mentioned this pull request Jul 8, 2026
Closed
sobolevn reviewed Jul 8, 2026
View reviewed changes
Comment thread Lib/test/test_annotationlib.py Outdated
Comment thread Python/codegen.c Outdated
BHUVANSH855 force-pushed the fix-153354-annotate-compare-op branch from 361e81b to de184ba Compare July 9, 2026 02:06

bedevere-app Bot commented Jul 9, 2026

Copy link
Copy Markdown

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

sobolevn reviewed Jul 9, 2026
View reviewed changes

sobolevn left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Please, don't forget a NEWS entry.

BHUVANSH855 force-pushed the fix-153354-annotate-compare-op branch from de184ba to ad3708a Compare July 9, 2026 07:59
BHUVANSH855 requested a review from sobolevn July 9, 2026 08:42
sobolevn approved these changes Jul 9, 2026
View reviewed changes

sobolevn left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

LGTM

iritkatriel reviewed Aug 14, 2026
View reviewed changes
Comment thread Lib/test/test_annotationlib.py Outdated

BHUVANSH855 commented Oct 5, 2026

Copy link
Copy Markdown
Contributor Author

Can we land this PR to main ?
Is there any blocker left to be addressed before merging this.

JelleZijlstra merged commit 7d3fca4 into python:main Oct 7, 2026
54 checks passed
BHUVANSH855 deleted the fix-153354-annotate-compare-op branch October 7, 2026 17:57
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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

JelleZijlstra JelleZijlstra approved these changes
sobolevn sobolevn approved these changes
markshannon Awaiting requested review from markshannon markshannon is a code owner
iritkatriel Awaiting requested review from iritkatriel iritkatriel is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Generated __annotate__ uses COMPARE_OP without the bool-conversion flag, feeding a non-bool to POP_JUMP_IF_FALSE

4 participants

Back | FazBrowse Home | New Git URL