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

make Windows abort_internal Miri-compatible #93300

Merged
merged 1 commit into from
Jan 26, 2022

Conversation

RalfJung
Copy link
Member

#92828 started calling abort_internal on double-panics, uncovering that on Windows this function does not work in Miri because of its use of inline assembly.

Cc @Amanieu

@rust-highfive
Copy link
Collaborator

r? @m-ou-se

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 25, 2022
@Amanieu
Copy link
Member

Amanieu commented Jan 25, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Jan 25, 2022

📌 Commit 53d2401 has been approved by Amanieu

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 25, 2022
@RalfJung
Copy link
Member Author

@bors rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 25, 2022
…askrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#93250 (Remove deduplication of early lints)
 - rust-lang#93286 (Add white-space: nowrap to links in the sidebar)
 - rust-lang#93291 (minor fix for rust-lang#93231)
 - rust-lang#93300 (make Windows abort_internal Miri-compatible)
 - rust-lang#93303 (Fix ICE when parsing bad turbofish with lifetime argument)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 04f915b into rust-lang:master Jan 26, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 26, 2022
@RalfJung RalfJung deleted the win-abort-miri branch February 4, 2022 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants