-
Notifications
You must be signed in to change notification settings - Fork 352
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
Fix toolstate for rust-lang/rust#85546 #1812
Conversation
This comment has been minimized.
This comment has been minimized.
) -> 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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why did you remove this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unwind_to_block()
will check this now: https://github.com/rust-lang/rust/blob/1969c2e312303faa458cf19dad9783165e3c72c8/compiler/rustc_middle/src/ty/layout.rs#L2588
unwind: match unwind { | ||
Some(cleanup) => StackPopUnwind::Cleanup(cleanup), | ||
None => StackPopUnwind::Skip, | ||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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 |
cc rust-lang/rust#85780