Skip to content

Commit

Permalink
Rollup merge of rust-lang#98059 - tmiasko:inline-const-eval-select, r…
Browse files Browse the repository at this point in the history
…=Amanieu

Inline `const_eval_select`

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

r? `@Amanieu`
  • Loading branch information
GuillaumeGomez committed Jun 15, 2022
2 parents fb691ca + 8a8404b commit 7e992e7
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions library/core/src/intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 7e992e7

Please sign in to comment.