Move panic payload state from Machine to Thread #1532
Merged
Conversation
This file contains hidden or 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
Member
|
Thanks, this is a great catch! I am wondering now, presumably |
RalfJung
reviewed
Aug 31, 2020
RalfJung
reviewed
Aug 31, 2020
RalfJung
reviewed
Aug 31, 2020
Contributor
Author
|
Good call about |
RalfJung
reviewed
Sep 2, 2020
| if let Some(errno_place) = this.active_thread_ref().last_error { | ||
| Ok(errno_place) | ||
| } else { | ||
| let errno_layout = this.machine.layouts.u32; |
Member
There was a problem hiding this comment.
Suggested change
| let errno_layout = this.machine.layouts.u32; | |
| // Allocate new place, set initial value to 0. | |
| let errno_layout = this.machine.layouts.u32; |
Member
|
This looks great, thanks. :) Please fix the last comment nit and squash the "Commit missing new file" commit, then we can land this. |
divergentdave
force-pushed
the
thread-panic-payload
branch
from
5080bb5 to
a6746ad
Compare
Member
|
@bors r+ |
Contributor
|
📌 Commit a6746ad has been approved by |
Contributor
Contributor
|
☀️ Test successful - checks-travis, status-appveyor |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR moves the panic payload storage from the
Machinestate to per-thread state. Prior to this change, if one thread panicked while another was still unwinding, Miri would fail withthread 'rustc' panicked at 'the panic runtime should avoid double-panics', src/shims/panic.rs:51:9. I ran into this issue while prototyping a round-robin scheduler, but it's also reachable with the current scheduler and contrived programs that use blocking API calls to cause thread switching during unwinding. I wrote a test case along those lines for this change.