about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2022-06-16 07:24:41 +0900
committerGitHub <noreply@github.com>2022-06-16 07:24:41 +0900
commitb91c4d5b45484ad3c121e2f738a31195f49374aa (patch)
tree730c0d822ef88dd5e0710f3e26a479aa2c7cb9a1
parent4ee78a686facf95eb640fc00d5b92d4e9281e81c (diff)
parent8a8404bc2b62299f085cd22bc1e0863eca3065fe (diff)
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```
-rw-r--r--library/core/src/intrinsics.rs1
1 files changed, 1 insertions, 0 deletions
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 const unsafe fn write_bytes<T>(dst: *mut T, val: u8, 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,