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

gh-94215: Fix error handling for line-tracing events #94681

Merged
merged 3 commits into from
Jul 8, 2022

Conversation

brandtbucher
Copy link
Member

@brandtbucher brandtbucher commented Jul 8, 2022

Supersedes #94659. This properly restores frame state following an exception raised by a line-tracing event. It also adds some comments to clarify the (somewhat subtle) nearby code.

@brandtbucher brandtbucher added interpreter-core (Objects, Python, Grammar, and Parser dirs) type-crash A hard crash of the interpreter, possibly with a core dump needs backport to 3.11 only security fixes labels Jul 8, 2022
@brandtbucher brandtbucher self-assigned this Jul 8, 2022
@brandtbucher brandtbucher added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Jul 8, 2022
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @brandtbucher for commit d616b11 🤖

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 8, 2022
Copy link
Member

@tiran tiran left a comment

Choose a reason for hiding this comment

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

LGTM! Build bots are happy, too.

Thanks for tracking down the root cause of the bug.

@tiran
Copy link
Member

tiran commented Jul 8, 2022

Worker x86-64 macOS is stuck the initial preparation phase. Every other buildbot and CI task was successful.

@tiran tiran merged commit 23ee4a8 into python:main Jul 8, 2022
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

Sorry @brandtbucher and @tiran, I had trouble checking out the 3.11 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 23ee4a8067506e6c9c47748185653617413f7a60 3.11

@miss-islington miss-islington assigned tiran and unassigned brandtbucher Jul 8, 2022
tiran pushed a commit to tiran/cpython that referenced this pull request Jul 8, 2022
…thonGH-94681)

* Re-enable crasher
* Fix error handling for line-tracing events
* blurb add
(cherry picked from commit 23ee4a8)

Co-authored-by: Brandt Bucher <brandtbucher@microsoft.com>
@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Jul 8, 2022
@bedevere-bot
Copy link

GH-94688 is a backport of this pull request to the 3.11 branch.

tiran added a commit that referenced this pull request Jul 8, 2022
GH-94688)

* Re-enable crasher
* Fix error handling for line-tracing events
* blurb add
(cherry picked from commit 23ee4a8)

Co-authored-by: Brandt Bucher <brandtbucher@microsoft.com>
@brandtbucher brandtbucher deleted the line-tracing-exceptions branch July 21, 2022 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
interpreter-core (Objects, Python, Grammar, and Parser dirs) type-crash A hard crash of the interpreter, possibly with a core dump
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants