Auto merge of #1465 - nbdd0121:patch-1, r=RalfJung

Remove likely and unlikely from intrinsics shim

They are now implemented in MIR interpreter by rust-lang/rust#73778
This commit is contained in:
bors 2020-07-03 06:06:37 +00:00
commit 86a7c555ed

View File

@ -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),