Skip to content
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

miri: add throw_machine_stop macro #66951

Merged
merged 1 commit into from
Dec 3, 2019
Merged

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Dec 2, 2019

r? @oli-obk
This helps Miri: rust-lang/miri#1093

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 2, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Dec 3, 2019

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 3, 2019

📌 Commit ff5fcac has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Dec 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Dec 3, 2019
bors added a commit that referenced this pull request Dec 3, 2019
Rollup of 7 pull requests

Successful merges:

 - #66750 (Update the `wasi` crate for `wasm32-wasi`)
 - #66878 (Move Sessions into (new) librustc_session)
 - #66903 (parse_enum_item -> parse_enum_variant)
 - #66951 (miri: add throw_machine_stop macro)
 - #66957 (Change Linker for x86_64-fortanix-unknown-sgx target to rust-lld)
 - #66960 ([const-prop] Fix ICE calculating enum discriminant)
 - #66973 (Update the minimum external LLVM to 7)

Failed merges:

r? @ghost
@bors bors merged commit ff5fcac into rust-lang:master Dec 3, 2019
bors added a commit to rust-lang/miri that referenced this pull request Dec 3, 2019
@RalfJung RalfJung deleted the miri-machine-stop branch December 4, 2019 23:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants