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

Remove incorrect debug assertions from catch_unwind #68698

Merged
merged 1 commit into from
Feb 1, 2020

Conversation

tmiasko
Copy link
Contributor

@tmiasko tmiasko commented Jan 31, 2020

Previously the debug assertions in the implementation of catch_unwind
used to verify consistency of the panic count by checking that the count
is zero just before leaving the function. This incorrectly assumed that
no panic was in progress when entering catch_unwind.

Fixes #68696.

Previously the debug assertions in the implementation of catch_unwind
used to verify consistency of the panic count by checking that the count
is zero just before leaving the function. This incorrectly assumed that
no panic was in progress when entering `catch_unwind`.
@Mark-Simulacrum
Copy link
Member

I believe this is correct but going to r? @Amanieu just in case here.

@Amanieu
Copy link
Member

Amanieu commented Jan 31, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 31, 2020

📌 Commit 80c3bec has been approved by Amanieu

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 31, 2020
@bors
Copy link
Contributor

bors commented Feb 1, 2020

⌛ Testing commit 80c3bec with merge 6c0b779...

bors added a commit that referenced this pull request Feb 1, 2020
Remove incorrect debug assertions from catch_unwind

Previously the debug assertions in the implementation of catch_unwind
used to verify consistency of the panic count by checking that the count
is zero just before leaving the function. This incorrectly assumed that
no panic was in progress when entering `catch_unwind`.

Fixes #68696.
@bors
Copy link
Contributor

bors commented Feb 1, 2020

☀️ Test successful - checks-azure
Approved by: Amanieu
Pushing 6c0b779 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 1, 2020
@bors bors merged commit 80c3bec into rust-lang:master Feb 1, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #68698!

Tested on commit 6c0b779.
Direct link to PR: #68698

🎉 rustc-guide on linux: test-fail → test-pass (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Feb 1, 2020
Tested on commit rust-lang/rust@6c0b779.
Direct link to PR: <rust-lang/rust#68698>

🎉 rustc-guide on linux: test-fail → test-pass (cc @JohnTitor @amanjeev @spastorino @mark-i-m, @rust-lang/infra).
@tmiasko tmiasko deleted the catch-panic branch February 27, 2020 21:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

catch_unwind panics due to failing debug assert when used during unwinding
6 participants