gh-153354: Fix bool conversion in generated __annotate__#153360
Open
BHUVANSH855 wants to merge 1 commit into
Open
gh-153354: Fix bool conversion in generated __annotate__#153360BHUVANSH855 wants to merge 1 commit into
BHUVANSH855 wants to merge 1 commit into
Conversation
|
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 |
sobolevn
reviewed
Jul 8, 2026
| pass | ||
|
|
||
| self.assertEqual( | ||
| func.__annotate__(NonBool()), |
Member
There was a problem hiding this comment.
Please, test other types of __annotate__ functions as well: all must work correctly, not only per-function one.
| ADDOP_I(c, loc, LOAD_FAST, 0); | ||
| ADDOP_LOAD_CONST_NEW(c, loc, value_with_fake_globals); | ||
| ADDOP_I(c, loc, COMPARE_OP, (Py_GT << 5) | compare_masks[Py_GT]); | ||
| ADDOP_I(c, loc, COMPARE_OP, |
Member
There was a problem hiding this comment.
Question: maybe we should just add ADDOP(c, loc, TO_BOOL); and let the optimizer do its job?
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
2 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.
Summary
Fix the compiler-generated
__annotate__guard to emit aCOMPARE_OPwith the bool-conversion flag set beforePOP_JUMP_IF_FALSE.Previously, the generated bytecode omitted the bool-conversion flag, allowing a non-boolean result from
__gt__to reachPOP_JUMP_IF_FALSE. On debug builds this triggered an assertion failure, while release builds could exhibit incorrect behavior.Changes
COMPARE_OPincodegen_setup_annotations_scope().__annotate__function invoked with an object whose__gt__returns a non-boolean value.Issue
Fixes gh-153354.
Testing
COMPARE_OP (bool(>)), matching normal conditional comparison code generation.