adjust Miri to needs of changed unwinding strategy #69999
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @davidtwco (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors p=1 |
|
r? @oli-obk |
Mark-Simulacrum
approved these changes
Mar 14, 2020
| @@ -272,11 +272,13 @@ impl<'tcx, Tag> Scalar<Tag> { | |||
|
|
|||
| #[inline] | |||
| pub fn from_bool(b: bool) -> Self { | |||
| // Guaranteed to be truncated and does not need sign extension. | |||
There was a problem hiding this comment.
These seem like they could be separate? But fine to leave them in too.
There was a problem hiding this comment.
I had to add from_i32 for the Miri side of this. So while I was at it I figured I might as well add the comments here, instead of making them a separate PR.
oli-obk
reviewed
Mar 14, 2020
|
r=me with the comment updated. |
|
@bors r=oli-obk |
|
📌 Commit b450e1b has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-azure |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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