switch back to intrinsics for better inlining

Author: xacrimon

compiler/rustc_mir_build/src/builder/matches/test.rs

@@ -372,7 +372,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 block,
                 span,
                 LangItem::Offset,
-                &[elem_ty],
+                &[elem_ptr_ty, tcx.types.usize],
                 span.args([Operand::Copy(temp_elem_ptr), ptr_offset]),
                 updated_ptr
             )
@@ -387,7 +387,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 block,
                 span,
                 LangItem::AggregateRawPtr,
-                &[elem_ty],
+                &[slice_ptr_ty, elem_ptr_ty, tcx.types.usize],
                 span.args([Operand::Copy(updated_ptr), slice_len]),
                 subslice_ptr
             )

library/core/src/intrinsics/mod.rs

@@ -1965,6 +1965,7 @@ pub const fn needs_drop<T: ?Sized>() -> bool {
 /// of bounds or arithmetic overflow occurs then this operation is undefined behavior.
 ///
 /// The stabilized version of this intrinsic is [`pointer::offset`].
+#[cfg_attr(not(bootstrap), lang = "offset")]
 #[must_use = "returns a new pointer rather than modifying its argument"]
 #[rustc_intrinsic_const_stable_indirect]
 #[rustc_nounwind]
@@ -4202,6 +4203,7 @@ pub const fn type_id<T: ?Sized + 'static>() -> u128 {
 /// This is used to implement functions like `slice::from_raw_parts_mut` and
 /// `ptr::from_raw_parts` in a way compatible with the compiler being able to
 /// change the possible layouts of pointers.
+#[cfg_attr(not(bootstrap), lang = "aggregate_raw_ptr")]
 #[rustc_nounwind]
 #[unstable(feature = "core_intrinsics", issue = "none")]
 #[rustc_intrinsic_const_stable_indirect]

library/core/src/match_internals.rs

@@ -1,16 +1,6 @@
 use crate::cmp::BytewiseEq;
 use crate::{intrinsics, mem};
 
-#[lang = "aggregate_raw_ptr"]
-const fn aggregate_raw_ptr<T>(data: *const T, meta: usize) -> *const [T] {
-    intrinsics::aggregate_raw_ptr(data, meta)
-}
-
-#[lang = "offset"]
-const fn offset<T>(ptr: *const T, offset: usize) -> *const T {
-    unsafe { intrinsics::offset(ptr, offset) }
-}
-
 #[lang = "PatternConstEq"]
 #[const_trait]
 trait PatternConstEq<Rhs = Self>