Skip to content

Commit

Permalink
Auto merge of #1482 - canova:remote-unreachable, r=RalfJung
Browse files Browse the repository at this point in the history
Remove unreachable intrinsic

This is now supported by the interpreter with rust-lang/rust#74459. We can remove this intrinsic implementation here.
This is covered by this test: https://github.com/rust-lang/miri/blob/master/tests/compile-fail/unreachable.rs

I guess we need to wait until the rust-lang/rust PR merges into nightly, and then we can update `rust-version` hash in the PR, right?

r? @oli-obk
  • Loading branch information
bors committed Jul 23, 2020
2 parents 67e7eb4 + d1aee69 commit 592b140
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/shims/intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
let (dest, ret) = match ret {
None => match intrinsic_name {
"miri_start_panic" => return this.handle_miri_start_panic(args, unwind),
"unreachable" => throw_ub!(Unreachable),
_ => throw_unsup_format!("unimplemented (diverging) intrinsic: {}", intrinsic_name),
},
Some(p) => p,
Expand Down

0 comments on commit 592b140

Please sign in to comment.