Skip to content

Commit 1d71dc6

Browse files
BLANKatGITHUBAmanieu
authored andcommitted
replaced extern "rust-intrinsic" block with core::ptr::copy_nonoverlapping
using core::ptr::copy_nonoverlapping for memory operations changes core::ptr::coopy_nonoverlapping to crate::ptr::
1 parent b0ff457 commit 1d71dc6

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

Diff for: crates/core_arch/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
proc_macro_hygiene,
1414
stmt_expr_attributes,
1515
core_intrinsics,
16-
intrinsics,
1716
no_core,
1817
fmt_helpers_for_derive,
1918
rustc_attrs,

Diff for: crates/core_arch/src/powerpc/altivec.rs

+2-14
Original file line numberDiff line numberDiff line change
@@ -674,15 +674,9 @@ mod sealed {
674674
pub unsafe fn $fun(a: isize, b: *const $ty) -> t_t_l!($ty) {
675675
let addr = (b as *const u8).offset(a);
676676

677-
// Workaround ptr::copy_nonoverlapping not being inlined
678-
unsafe extern "rust-intrinsic" {
679-
#[rustc_nounwind]
680-
pub fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: usize);
681-
}
682-
683677
let mut r = mem::MaybeUninit::uninit();
684678

685-
copy_nonoverlapping(
679+
crate::ptr::copy_nonoverlapping(
686680
addr,
687681
r.as_mut_ptr() as *mut u8,
688682
mem::size_of::<t_t_l!($ty)>(),
@@ -729,13 +723,7 @@ mod sealed {
729723
pub unsafe fn $fun(s: t_t_l!($ty), a: isize, b: *mut $ty) {
730724
let addr = (b as *mut u8).offset(a);
731725

732-
// Workaround ptr::copy_nonoverlapping not being inlined
733-
unsafe extern "rust-intrinsic" {
734-
#[rustc_nounwind]
735-
pub fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: usize);
736-
}
737-
738-
copy_nonoverlapping(
726+
crate::ptr::copy_nonoverlapping(
739727
&s as *const _ as *const u8,
740728
addr,
741729
mem::size_of::<t_t_l!($ty)>(),

0 commit comments

Comments
 (0)