diff --git a/crates/core_arch/src/lib.rs b/crates/core_arch/src/lib.rs index aba8095693..827026f5aa 100644 --- a/crates/core_arch/src/lib.rs +++ b/crates/core_arch/src/lib.rs @@ -13,7 +13,6 @@ proc_macro_hygiene, stmt_expr_attributes, core_intrinsics, - intrinsics, no_core, fmt_helpers_for_derive, rustc_attrs, diff --git a/crates/core_arch/src/powerpc/altivec.rs b/crates/core_arch/src/powerpc/altivec.rs index 564d812cc4..54aa0725e2 100644 --- a/crates/core_arch/src/powerpc/altivec.rs +++ b/crates/core_arch/src/powerpc/altivec.rs @@ -674,15 +674,9 @@ mod sealed { pub unsafe fn $fun(a: isize, b: *const $ty) -> t_t_l!($ty) { let addr = (b as *const u8).offset(a); - // Workaround ptr::copy_nonoverlapping not being inlined - unsafe extern "rust-intrinsic" { - #[rustc_nounwind] - pub fn copy_nonoverlapping(src: *const T, dst: *mut T, count: usize); - } - let mut r = mem::MaybeUninit::uninit(); - copy_nonoverlapping( + crate::ptr::copy_nonoverlapping( addr, r.as_mut_ptr() as *mut u8, mem::size_of::(), @@ -729,13 +723,7 @@ mod sealed { pub unsafe fn $fun(s: t_t_l!($ty), a: isize, b: *mut $ty) { let addr = (b as *mut u8).offset(a); - // Workaround ptr::copy_nonoverlapping not being inlined - unsafe extern "rust-intrinsic" { - #[rustc_nounwind] - pub fn copy_nonoverlapping(src: *const T, dst: *mut T, count: usize); - } - - copy_nonoverlapping( + crate::ptr::copy_nonoverlapping( &s as *const _ as *const u8, addr, mem::size_of::(),