Fix toolstate for rust-lang/rust#85546 #1812
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
This comment has been minimized.
This comment has been minimized.
RalfJung
reviewed
May 24, 2021
| ) -> InterpResult<'tcx> { | ||
| let this = self.eval_context_mut(); | ||
|
|
||
| trace!("miri_start_panic: {:?}", this.frame().instance); | ||
| // Make sure we only start unwinding when this matches our panic strategy. | ||
| if this.tcx.sess.panic_strategy() != PanicStrategy::Unwind { |
There was a problem hiding this comment.
unwind_to_block() will check this now: https://github.com/rust-lang/rust/blob/1969c2e312303faa458cf19dad9783165e3c72c8/compiler/rustc_middle/src/ty/layout.rs#L2588
RalfJung
reviewed
May 24, 2021
ghost
mentioned this pull request
ghost
changed the title
RalfJung
reviewed
May 28, 2021
| unwind: match unwind { | ||
| Some(cleanup) => StackPopUnwind::Cleanup(cleanup), | ||
| None => StackPopUnwind::Skip, | ||
| }, |
There was a problem hiding this comment.
almost looks like we want a function to easily construct a StackPopUnwind from an Option<BasicBlock>... but that's for a future PR (and a rustc PR, most likely)
|
@bors r+ |
|
📌 Commit 9b2d425 has been approved by |
|
☀️ Test successful - checks-actions |
ghost
deleted the
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.
cc rust-lang/rust#85780