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

gh-138349: Fix crash when combining module-level annotation and listcomp by JelleZijlstra · Pull Request #138363 · python/cpython · GitHub

/ cpython Public

gh-138349: Fix crash when combining module-level annotation and listcomp - #138363

Merged
vstinner merged 3 commits into
python:mainfrom
JelleZijlstra:fix138349
Sep 10, 2025
ConversationCommits (3)ChecksFiles changed
Merged

gh-138349: Fix crash when combining module-level annotation and listcomp#138363
vstinner merged 3 commits into
python:mainfrom
JelleZijlstra:fix138349

Conversation

JelleZijlstra commented Sep 1, 2025 •
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

The bug was that we used the wrong name list to get __conditional_annotations__, which caused us to emit a SET_ADD that was adding to something that wasn't a set. This manifested as a hang on debug builds and a crash on release builds for whatever reason, but the issue became more apparent when I added an assertion to setobject.c to make sure we were only adding to sets.

bedevere-app Bot mentioned this pull request Sep 1, 2025
Closed

Fidget-Spinner commented Sep 2, 2025

Copy link
Copy Markdown
Member

Do you need to bump the pyc magic number as well? I forgot whether bytecode invalidation matters here.

markshannon commented Sep 8, 2025

Copy link
Copy Markdown
Member

The changes look correct to me, but I've not looked that closely at the conditional annotation code.
This will need a magic number bump as the old pycs could cause crashes.

vstinner commented Sep 9, 2025

Copy link
Copy Markdown
Member

This will need a magic number bump as the old pycs could cause crashes.

@JelleZijlstra: Can you update the magic number (in Include/internal/pycore_magic_number.h) please?

JelleZijlstra commented Sep 9, 2025

Copy link
Copy Markdown
Member Author

Done

vstinner approved these changes Sep 9, 2025
View reviewed changes

vstinner 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. The changes does fix the crash and the added tests check for non-regression.

markshannon added the needs backport to 3.14 bugs and security fixes label Sep 10, 2025
vstinner merged commit 7a6fd4a into python:main Sep 10, 2025
51 checks passed

miss-islington-app Bot commented Sep 10, 2025

Copy link
Copy Markdown

Thanks @JelleZijlstra for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

miss-islington-app Bot commented Sep 10, 2025

Copy link
Copy Markdown

Sorry, @JelleZijlstra and @vstinner, I could not cleanly backport this to 3.14 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 7a6fd4a45deee23b827bf8e32bde172e14921ed6 3.14

vstinner pushed a commit to vstinner/cpython that referenced this pull request Sep 10, 2025
pythongh-138349: Fix crash when combining module-level annotation and…
ebf4863 
… listcomp (python#138363)

(cherry picked from commit 7a6fd4a)

bedevere-app Bot commented Sep 10, 2025

Copy link
Copy Markdown

GH-138749 is a backport of this pull request to the 3.14 branch.

bedevere-app Bot removed the needs backport to 3.14 bugs and security fixes label Sep 10, 2025

vstinner commented Sep 10, 2025

Copy link
Copy Markdown
Member

Merged, thanks @JelleZijlstra. I wrote a backport to 3.14 (I adapted the magic number for 3.14).

JelleZijlstra deleted the fix138349 branch September 10, 2025 14:15
hugovk pushed a commit that referenced this pull request Sep 11, 2025
[3.14] gh-138349: Fix crash when combining module-level annotation an…
3643a26 
…d listcomp (#138363) (#138749)

* gh-138349: Fix crash when combining module-level annotation and listcomp (#138363)

(cherry picked from commit 7a6fd4a)

---------

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
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

vstinner vstinner approved these changes
markshannon markshannon approved these changes
iritkatriel Awaiting requested review from iritkatriel iritkatriel is a code owner
rhettinger Awaiting requested review from rhettinger

Assignees

vstinner

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

Back | FazBrowse Home | New Git URL