From: Yuki Okushi <jtitor@2k36.org>
Date: Wed, 15 Jun 2022 22:24:41 +0000 (+0900)
Subject: Rollup merge of #98059 - tmiasko:inline-const-eval-select, r=Amanieu
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=b91c4d5b45484ad3c121e2f738a31195f49374aa;hp=4ee78a686facf95eb640fc00d5b92d4e9281e81c;p=rust.git

Rollup merge of #98059 - tmiasko:inline-const-eval-select, r=Amanieu

Inline `const_eval_select`

To avoid circular link time dependency between core and compiler
builtins when building with `-Zshare-generics`.

r? ```@Amanieu```
---

diff --git a/library/core/src/intrinsics.rs b/library/core/src/intrinsics.rs
index 7c10ed65c4c..43ba2dc2874 100644
--- a/library/core/src/intrinsics.rs
+++ b/library/core/src/intrinsics.rs
@@ -2363,6 +2363,7 @@ pub(crate) fn is_nonoverlapping<T>(src: *const T, dst: *const T, count: usize) -
 #[rustc_const_unstable(feature = "const_eval_select", issue = "none")]
 #[lang = "const_eval_select"]
 #[rustc_do_not_const_check]
+#[inline]
 pub const unsafe fn const_eval_select<ARG, F, G, RET>(
     arg: ARG,
     _called_in_const: F,