Skip to content

Commit

Permalink
Auto merge of #1465 - nbdd0121:patch-1, r=RalfJung
Browse files Browse the repository at this point in the history
Remove likely and unlikely from intrinsics shim

They are now implemented in MIR interpreter by rust-lang/rust#73778
  • Loading branch information
bors committed Jul 3, 2020
2 parents e7ef64f + c5b324b commit 86a7c55
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions src/shims/intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -523,16 +523,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
let &[_] = check_arg_count(args)?;
}

#[rustfmt::skip]
| "likely"
| "unlikely"
=> {
// These just return their argument
let &[b] = check_arg_count(args)?;
let b = this.read_immediate(b)?;
this.write_immediate(*b, dest)?;
}

"try" => return this.handle_try(args, dest, ret),

name => throw_unsup_format!("unimplemented intrinsic: {}", name),
Expand Down

0 comments on commit 86a7c55

Please sign in to comment.