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.

Sign up for GitHub

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

Jump to bottom

GH-94979: Pop the exception stack when jumping out of exception handlers. #95003

Merged
merged 2 commits into from
Jul 19, 2022
Merged

GH-94979: Pop the exception stack when jumping out of exception handlers. #95003

merged 2 commits into from
Jul 19, 2022

Conversation

markshannon
Copy link
Member

@markshannon markshannon commented Jul 19, 2022 •
edited
Loading

Skipping news as there have been no releases between the introduction of the bug and the fix.

@markshannon markshannon added the needs backport to 3.11 only security fixes label Jul 19, 2022
@markshannon markshannon added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Jul 19, 2022
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @markshannon for commit bb9f9c8 🤖

If you want to schedule another build, you need to add the ":hammer: test-with-buildbots" label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Jul 19, 2022
iritkatriel
iritkatriel reviewed Jul 19, 2022
View reviewed changes
Objects/frameobject.c Outdated Show resolved Hide resolved
@markshannon
Copy link
Member Author

1 buildbot seems to have stuck running test_concurrent_futures.

iritkatriel
iritkatriel approved these changes Jul 19, 2022
View reviewed changes
Copy link
Member

@iritkatriel iritkatriel left a comment

Choose a reason for hiding this comment

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

FTR: this is getting crazy.

@markshannon
Copy link
Member Author

FTR: this is getting crazy.

I assume you mean the duplication of stack effect here, in the compiler and the interpreter.
That's why we want to build all three from a single declarative form, if we can.

@markshannon markshannon merged commit 3f73860 into python:main Jul 19, 2022
@miss-islington
Copy link
Contributor

Thanks @markshannon for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @markshannon, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 3f738600f623b88bc90ec12587f75babb6f1025e 3.11

markshannon added a commit to faster-cpython/cpython that referenced this pull request Jul 19, 2022
@markshannon
pythonGH-94979: Pop the exception stack when jumping out of exception…
28e2929 
… handlers. (python#95003)
@markshannon markshannon mentioned this pull request Jul 19, 2022
Merged
@markshannon markshannon deleted the pop-excepts-when-line-jumping branch July 19, 2022 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iritkatriel iritkatriel iritkatriel approved these changes

Assignees

@markshannon markshannon

Labels
needs backport to 3.11 only security fixes skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@markshannon @bedevere-bot @miss-islington @iritkatriel