From: Gary Guo <gary@garyguo.net>
Date: Thu, 2 Jul 2020 19:00:27 +0000 (+0100)
Subject: Remove likely and unlikely from intrinsics shim
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=c5b324b031c1152c558737928cb345d07a1e5b82;p=rust.git

Remove likely and unlikely from intrinsics shim

They are now implemented in MIR interpreter by rust-lang/rust#73778
---

diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs
index 015d9edc11b..68f67a1ed98 100644
--- a/src/shims/intrinsics.rs
+++ b/src/shims/intrinsics.rs
@@ -523,16 +523,6 @@ fn call_intrinsic(
                 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),