libunwind_panic: adjust miri panic hack #66822
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
rust-highfive added the S-waiting-on-review 
Contributor
| Makes sensr @bors r+ |
Collaborator
| 📌 Commit 4217dd8cfe305b65cca19e5ced438661ec808af1 has been approved by |
bors added S-waiting-on-bors 
Contributor
| @RalfJung: I don't understand why this is needed. Does the playground install Miri in a weird way? |
Member Author
| No, but the playground adds a bunch of dependencies and one of them has a build script that panics. As you announced, our previous approach to handling this turns panics in build scripts into aborts. |
This comment has been minimized.
This comment has been minimized.
bors added S-waiting-on-author This comment has been minimized.
This comment has been minimized.
Member Author
| Rebased. @bors r=oli-obk |
Collaborator
| 📌 Commit 02b66a1 has been approved by |
Collaborator
| 🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened |
bors added S-waiting-on-bors Centril added a commit to Centril/rust that referenced this pull request Dec 1, 2019
libunwind_panic: adjust miri panic hack We adjust the Miri hack in libpanic_unwind such that even with `cfg(miri)`, we build a version of libpanic_unwind that actually works. This is needed to resolve rust-lang/rust-playground#548. r? @oli-obk @alexcrichton
bors added a commit that referenced this pull request Dec 1, 2019
Rollup of 7 pull requests Successful merges: - #66346 (Replace .unwrap() with ? in std::os::unix::net) - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.) - #66822 (libunwind_panic: adjust miri panic hack) - #66827 (handle diverging functions forwarding their return place) - #66828 (Less minification) - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.) - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.) Failed merges: - #66874 (Miri engine: proper support for `Assert` MIR terminators) r? @ghost
bors added a commit that referenced this pull request Dec 1, 2019
Rollup of 7 pull requests Successful merges: - #66346 (Replace .unwrap() with ? in std::os::unix::net) - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.) - #66822 (libunwind_panic: adjust miri panic hack) - #66827 (handle diverging functions forwarding their return place) - #66828 (Less minification) - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.) - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.) Failed merges: - #66874 (Miri engine: proper support for `Assert` MIR terminators) r? @ghost
This was referenced Dec 2, 2019
RalfJung added a commit to RalfJung/rust that referenced this pull request Dec 2, 2019
libunwind_panic: adjust miri panic hack We adjust the Miri hack in libpanic_unwind such that even with `cfg(miri)`, we build a version of libpanic_unwind that actually works. This is needed to resolve rust-lang/rust-playground#548. r? @oli-obk @alexcrichton
bors added a commit that referenced this pull request Dec 2, 2019
Rollup of 5 pull requests Successful merges: - #66245 (Conditional compilation for sanitizers) - #66654 (Handle const-checks for `&mut` outside of `HasMutInterior`) - #66822 (libunwind_panic: adjust miri panic hack) - #66827 (handle diverging functions forwarding their return place) - #66834 (rustbuild fixes) Failed merges: r? @ghost
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 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.
We adjust the Miri hack in libpanic_unwind such that even with
cfg(miri), we build a version of libpanic_unwind that actually works.This is needed to resolve rust-lang/rust-playground#548.
r? @oli-obk @alexcrichton