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

adjust Miri to needs of changed unwinding strategy #1227

Merged
merged 3 commits into from
Mar 15, 2020

Conversation

RalfJung
Copy link
Member

No description provided.

bors added a commit to rust-lang/rust that referenced this pull request Mar 14, 2020
adjust Miri to needs of changed unwinding strategy

As expected, #67502 broke unwinding in Miri. To fix it we have to adjust parts of the engine and the panic runtime, which this PR does. The Miri-side changes are in rust-lang/miri#1227.

Cc @oli-obk @Aaron1011 @Mark-Simulacrum @Amanieu
@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 15, 2020

📌 Commit 956692d has been approved by RalfJung

@bors
Copy link
Collaborator

bors commented Mar 15, 2020

⌛ Testing commit 956692d with merge 91b037d...

bors added a commit that referenced this pull request Mar 15, 2020
adjust Miri to needs of changed unwinding strategy
@RalfJung
Copy link
Member Author

@bors retry r+

@bors
Copy link
Collaborator

bors commented Mar 15, 2020

📌 Commit 17a677f has been approved by RalfJung

@bors
Copy link
Collaborator

bors commented Mar 15, 2020

⌛ Testing commit 17a677f with merge a7891c0...

@bors
Copy link
Collaborator

bors commented Mar 15, 2020

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing a7891c0 to master...

@bors bors merged commit a7891c0 into rust-lang:master Mar 15, 2020
@bors bors mentioned this pull request Mar 15, 2020
@RalfJung RalfJung deleted the unwind branch March 15, 2020 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-blocked-on-rust Status: Blocked on landing a Rust PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants