diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-05-20 08:54:10 -0400 |
|---|---|---|
| committer | Jubilee <46493976+workingjubilee@users.noreply.github.com> | 2022-07-19 16:37:34 -0700 |
| commit | bbf31f9c78ad35ad1ef8fa91146e31cb447662b9 (patch) | |
| tree | f4c2d344d7451f25244daccaa1df7295e7018ae4 | |
| parent | 64bef2910be17ca75ced3f0a99b4584f69114c74 (diff) | |
| download | rust-bbf31f9c78ad35ad1ef8fa91146e31cb447662b9.tar.gz rust-bbf31f9c78ad35ad1ef8fa91146e31cb447662b9.zip | |
Finish bumping stage0
It looks like the last time had left some remaining cfg's -- which made me think that the stage0 bump was actually successful. This brings us to a released 1.62 beta though.
| -rw-r--r-- | crates/core_simd/src/intrinsics.rs | 1 | ||||
| -rw-r--r-- | crates/core_simd/src/vector/ptr.rs | 19 |
2 files changed, 0 insertions, 20 deletions
diff --git a/crates/core_simd/src/intrinsics.rs b/crates/core_simd/src/intrinsics.rs index a1de8474fb2..6047890a093 100644 --- a/crates/core_simd/src/intrinsics.rs +++ b/crates/core_simd/src/intrinsics.rs @@ -62,7 +62,6 @@ extern "platform-intrinsic" { pub(crate) fn simd_xor<T>(x: T, y: T) -> T; /// getelementptr (without inbounds) - #[cfg(not(bootstrap))] pub(crate) fn simd_arith_offset<T, U>(ptrs: T, offsets: U) -> T; /// fptoui/fptosi/uitofp/sitofp diff --git a/crates/core_simd/src/vector/ptr.rs b/crates/core_simd/src/vector/ptr.rs index 68a9c67f795..fa756344db9 100644 --- a/crates/core_simd/src/vector/ptr.rs +++ b/crates/core_simd/src/vector/ptr.rs @@ -1,9 +1,6 @@ //! Private implementation details of public gather/scatter APIs. -#[cfg(not(bootstrap))] use crate::simd::intrinsics; use crate::simd::{LaneCount, Simd, SupportedLaneCount}; -#[cfg(bootstrap)] -use core::mem; /// A vector of *const T. #[derive(Debug, Copy, Clone)] @@ -24,14 +21,6 @@ where #[inline] #[must_use] pub fn wrapping_add(self, addend: Simd<usize, LANES>) -> Self { - #[cfg(bootstrap)] - // Safety: converting pointers to usize and vice-versa is safe - // (even if using that pointer is not) - unsafe { - let x: Simd<usize, LANES> = mem::transmute_copy(&self); - mem::transmute_copy(&{ x + (addend * Simd::splat(mem::size_of::<T>())) }) - } - #[cfg(not(bootstrap))] // Safety: this intrinsic doesn't have a precondition unsafe { intrinsics::simd_arith_offset(self, addend) } } @@ -56,14 +45,6 @@ where #[inline] #[must_use] pub fn wrapping_add(self, addend: Simd<usize, LANES>) -> Self { - #[cfg(bootstrap)] - // Safety: converting pointers to usize and vice-versa is safe - // (even if using that pointer is not) - unsafe { - let x: Simd<usize, LANES> = mem::transmute_copy(&self); - mem::transmute_copy(&{ x + (addend * Simd::splat(mem::size_of::<T>())) }) - } - #[cfg(not(bootstrap))] // Safety: this intrinsic doesn't have a precondition unsafe { intrinsics::simd_arith_offset(self, addend) } } |