[pointer] SizeEq supports raw pointer transmutes

joshlf · joshlf · commit 9eed6ef7930c · 2025-03-06T15:15:50.000-08:00
This permits us to remove the `KnownLayout` bounds from
`Ptr::transmute`, and thus to remove `Ptr::transmute_sized` entirely.

gherrit-pr-id: I090715fd9ed6f100fd35513b05054015621ecb9c
diff --git a/src/impls.rs b/src/impls.rs
@@ -7,7 +7,7 @@
 // This file may not be copied, modified, or distributed except according to
 // those terms.
 
-use core::mem::MaybeUninit as CoreMaybeUninit;
+use core::{cell::UnsafeCell, mem::MaybeUninit as CoreMaybeUninit, ptr::NonNull};
 
 use super::*;
 
@@ -223,16 +223,32 @@ safety_comment! {
 //
 //   String slices are a UTF-8 representation of characters that have the same
 //   layout as slices of type `[u8]`.
-unsafe impl pointer::SizeEq<str> for [u8] {}
+unsafe impl pointer::SizeEq<str> for [u8] {
+    fn cast_from_raw(s: NonNull<str>) -> NonNull<[u8]> {
+        cast!(s)
+    }
+}
 // SAFETY: See previous safety comment.
-unsafe impl pointer::SizeEq<[u8]> for str {}
+unsafe impl pointer::SizeEq<[u8]> for str {
+    fn cast_from_raw(bytes: NonNull<[u8]>) -> NonNull<str> {
+        cast!(bytes)
+    }
+}
 
 macro_rules! unsafe_impl_try_from_bytes_for_nonzero {
     ($($nonzero:ident[$prim:ty]),*) => {
         $(
             unsafe_impl!(=> TryFromBytes for $nonzero; |n| {
-                unsafe impl pointer::SizeEq<$nonzero> for Unalign<$prim> {}
-                unsafe impl pointer::SizeEq<Unalign<$prim>> for $nonzero {}
+                unsafe impl pointer::SizeEq<$nonzero> for Unalign<$prim> {
+                    fn cast_from_raw(n: NonNull<$nonzero>) -> NonNull<Unalign<$prim>> {
+                        cast!(n)
+                    }
+                }
+                unsafe impl pointer::SizeEq<Unalign<$prim>> for $nonzero {
+                    fn cast_from_raw(p: NonNull<Unalign<$prim>>) -> NonNull<$nonzero> {
+                        cast!(p)
+                    }
+                }
 
                 let n = n.transmute::<Unalign<$prim>, invariant::Valid, _>();
                 $nonzero::new(n.read_unaligned().into_inner()).is_some()
@@ -470,6 +486,7 @@ mod atomics {
     macro_rules! unsafe_impl_transmute_from_for_atomic {
         ($($($tyvar:ident)? => $atomic:ty [$prim:ty]),*) => {
             const _: () = {
+                use core::{cell::UnsafeCell, ptr::NonNull};
                 use crate::pointer::{TransmuteFrom, SizeEq, invariant::Valid};
 
                 $(
@@ -485,10 +502,18 @@ mod atomics {
 
                     // SAFETY: THe caller promised that `$atomic` and `$prim`
                     // have the same size.
-                    unsafe impl<$($tyvar)?> SizeEq<$atomic> for $prim {}
+                    unsafe impl<$($tyvar)?> SizeEq<$atomic> for $prim {
+                        fn cast_from_raw(a: NonNull<$atomic>) -> NonNull<$prim> {
+                            cast!(a)
+                        }
+                    }
                     // SAFETY: THe caller promised that `$atomic` and `$prim`
                     // have the same size.
-                    unsafe impl<$($tyvar)?> SizeEq<$prim> for $atomic {}
+                    unsafe impl<$($tyvar)?> SizeEq<$prim> for $atomic {
+                        fn cast_from_raw(p: NonNull<$prim>) -> NonNull<$atomic> {
+                            cast!(p)
+                        }
+                    }
                     // SAFETY: The caller promised that `$atomic` and `$prim`
                     // have the same size. `UnsafeCell<T>` has the same size as
                     // `T` [1].
@@ -498,9 +523,17 @@ mod atomics {
                     //   `UnsafeCell<T>` has the same in-memory representation as
                     //   its inner type `T`. A consequence of this guarantee is that
                     //   it is possible to convert between `T` and `UnsafeCell<T>`.
-                    unsafe impl<$($tyvar)?> SizeEq<$atomic> for core::cell::UnsafeCell<$prim> {}
+                    unsafe impl<$($tyvar)?> SizeEq<$atomic> for UnsafeCell<$prim> {
+                        fn cast_from_raw(a: NonNull<$atomic>) -> NonNull<UnsafeCell<$prim>> {
+                            cast!(a)
+                        }
+                    }
                     // SAFETY: See previous safety comment.
-                    unsafe impl<$($tyvar)?> SizeEq<core::cell::UnsafeCell<$prim>> for $atomic {}
+                    unsafe impl<$($tyvar)?> SizeEq<UnsafeCell<$prim>> for $atomic {
+                        fn cast_from_raw(p: NonNull<UnsafeCell<$prim>>) -> NonNull<$atomic> {
+                            cast!(p)
+                        }
+                    }
 
                     // SAFETY: The caller promised that `$atomic` and `$prim`
                     // have the same bit validity. `UnsafeCell<T>` has the same
diff --git a/src/lib.rs b/src/lib.rs
@@ -805,17 +805,6 @@ pub unsafe trait KnownLayout {
         // resulting size would not fit in a `usize`.
         meta.size_for_metadata(Self::LAYOUT)
     }
-
-    #[doc(hidden)]
-    #[must_use]
-    #[inline(always)]
-    fn cast_from_raw<P: KnownLayout<PointerMetadata = Self::PointerMetadata> + ?Sized>(
-        ptr: NonNull<P>,
-    ) -> NonNull<Self> {
-        let data = ptr.cast::<u8>();
-        let meta = P::pointer_to_metadata(ptr.as_ptr());
-        Self::raw_from_ptr_len(data, meta)
-    }
 }
 
 /// The metadata associated with a [`KnownLayout`] type.
diff --git a/src/pointer/ptr.rs b/src/pointer/ptr.rs
@@ -393,12 +393,8 @@ mod _conversions {
     {
         pub(crate) fn transmute<U, V, R>(self) -> Ptr<'a, U, (I::Aliasing, Unaligned, V)>
         where
-            T: KnownLayout,
             V: Validity,
-            U: TransmuteFromPtr<T, I::Aliasing, I::Validity, V, R>
-                + KnownLayout<PointerMetadata = T::PointerMetadata>
-                + SizeEq<T>
-                + ?Sized,
+            U: TransmuteFromPtr<T, I::Aliasing, I::Validity, V, R> + SizeEq<T> + ?Sized,
         {
             // SAFETY:
             // - This cast preserves address and provenance
@@ -416,28 +412,6 @@ mod _conversions {
             unsafe { self.transmute_unchecked(|t: NonNull<T>| U::cast_from_raw(t)) }
         }
 
-        pub(crate) fn transmute_sized<U, V, R>(self) -> Ptr<'a, U, (I::Aliasing, Unaligned, V)>
-        where
-            T: Sized,
-            V: Validity,
-            U: TransmuteFromPtr<T, I::Aliasing, I::Validity, V, R> + SizeEq<T>,
-        {
-            // SAFETY:
-            // - This cast preserves address and provenance
-            // - `U: SizeEq<T>` guarantees that this cast preserves the number
-            //   of bytes in the referent
-            // - If aliasing is `Shared`, then by `U: TransmuteFromPtr<T>`, at
-            //   least one of the following holds:
-            //   - `T: Immutable` and `U: Immutable`, in which case it is
-            //     trivially sound for shared code to operate on a `&T` and `&U`
-            //     at the same time, as neither can perform interior mutation
-            //   - It is directly guaranteed that it is sound for shared code to
-            //     operate on these references simultaneously
-            // - By `U: TransmuteFromPtr<T, I::Aliasing, I::Validity, V>`, it is
-            //   sound to perform this transmute.
-            unsafe { self.transmute_unchecked(cast!()) }
-        }
-
         #[doc(hidden)]
         #[inline(always)]
         #[must_use]
diff --git a/src/pointer/transmute.rs b/src/pointer/transmute.rs
@@ -10,6 +10,7 @@ use core::{
     cell::UnsafeCell,
     mem::{ManuallyDrop, MaybeUninit},
     num::Wrapping,
+    ptr::NonNull,
 };
 
 use crate::{pointer::invariant::*, FromBytes, Immutable, IntoBytes, Unalign};
@@ -227,20 +228,8 @@ macro_rules! unsafe_impl_invariants_eq {
     };
 }
 
-// SAFETY: See bounds.
-unsafe impl<T> SizeEq<MaybeUninit<T>> for Wrapping<T>
-where
-    T: SizeEq<Wrapping<T>>,
-    T: SizeEq<MaybeUninit<T>>,
-{
-}
-// SAFETY: See bounds.
-unsafe impl<T> SizeEq<Wrapping<T>> for MaybeUninit<T>
-where
-    T: SizeEq<Wrapping<T>>,
-    T: SizeEq<MaybeUninit<T>>,
-{
-}
+impl_transitive_transmute_from!(T => MaybeUninit<T> => T => Wrapping<T>);
+impl_transitive_transmute_from!(T => Wrapping<T> => T => MaybeUninit<T>);
 
 // SAFETY: `ManuallyDrop<T>` has the same size and bit validity as `T` [1], and
 // implements `Deref<Target = T>` [2]. Thus, it is already possible for safe
@@ -298,12 +287,18 @@ pub unsafe trait TransmuteFrom<Src: ?Sized, SV, DV>: SizeEq<Src> {}
 /// - If `T: ?Sized` and `Self: ?Sized`, then it must be the case that, given
 ///   any `t: *mut T`, `t as *mut Self` produces a pointer which addresses the
 ///   same number of bytes as `t`.
-pub unsafe trait SizeEq<T: ?Sized> {}
+pub unsafe trait SizeEq<T: ?Sized> {
+    fn cast_from_raw(t: NonNull<T>) -> NonNull<Self>;
+}
 
 // SAFETY: `T` trivially has the same size and vtable kind as `T`, and since
 // pointer `*mut T -> *mut T` pointer casts are no-ops, this cast trivially
 // preserves referent size (when `T: ?Sized`).
-unsafe impl<T: ?Sized> SizeEq<T> for T {}
+unsafe impl<T: ?Sized> SizeEq<T> for T {
+    fn cast_from_raw(t: NonNull<T>) -> NonNull<T> {
+        t
+    }
+}
 
 // SAFETY: Since `Src: IntoBytes`, the set of valid `Src`'s is the set of
 // initialized bit patterns, which is exactly the set allowed in the referent of
@@ -436,6 +431,15 @@ unsafe impl<T> TransmuteFrom<T, Uninit, Valid> for MaybeUninit<T> {}
 //
 //   `MaybeUninit<T>` is guaranteed to have the same size, alignment, and ABI as
 //   `T`
-unsafe impl<T> SizeEq<T> for MaybeUninit<T> {}
+unsafe impl<T> SizeEq<T> for MaybeUninit<T> {
+    fn cast_from_raw(t: NonNull<T>) -> NonNull<MaybeUninit<T>> {
+        cast!(t)
+    }
+}
+
 // SAFETY: See previous safety comment.
-unsafe impl<T> SizeEq<MaybeUninit<T>> for T {}
+unsafe impl<T> SizeEq<MaybeUninit<T>> for T {
+    fn cast_from_raw(t: NonNull<MaybeUninit<T>>) -> NonNull<T> {
+        cast!(t)
+    }
+}
diff --git a/src/util/macros.rs b/src/util/macros.rs
@@ -254,7 +254,7 @@ macro_rules! impl_for_transmute_from {
             // SAFETY: This macro ensures that `$repr` and `Self` have the same
             // size and bit validity. Thus, a bit-valid instance of `$repr` is
             // also a bit-valid instance of `Self`.
-            <$repr as TryFromBytes>::is_bit_valid(candidate.transmute_sized())
+            <$repr as TryFromBytes>::is_bit_valid(candidate.transmute())
         }
     };
     (
@@ -694,13 +694,19 @@ macro_rules! static_assert_dst_is_not_zst {
 
 macro_rules! cast {
     () => {
-        // SAFETY: `NonNull::as_ptr` returns a non-null pointer, so the argument
-        // to `NonNull::new_unchecked` is also non-null.
         |p| {
-            #[allow(clippy::as_conversions)]
-            return core::ptr::NonNull::new_unchecked(core::ptr::NonNull::as_ptr(p) as *mut _);
+            // SAFETY: `NonNull::as_ptr` returns a non-null pointer, so the
+            // argument to `NonNull::new_unchecked` is also non-null.
+            #[allow(clippy::as_conversions, unused_unsafe)]
+            #[allow(clippy::undocumented_unsafe_blocks)] // Clippy false positive
+            return unsafe {
+                core::ptr::NonNull::new_unchecked(core::ptr::NonNull::as_ptr(p) as *mut _)
+            };
         }
     };
+    ($p:ident) => {
+        cast!()($p)
+    };
 }
 
 /// Implements `TransmuteFrom` and `SizeEq` for `T` and `$wrapper<T>`.
@@ -712,17 +718,27 @@ macro_rules! cast {
 macro_rules! unsafe_impl_for_transparent_wrapper {
     (T $(: ?$optbound:ident)? => $wrapper:ident<T>) => {
         const _: () = {
+            use core::ptr::NonNull;
             use crate::pointer::{TransmuteFrom, SizeEq, invariant::Valid};
+
             // SAFETY: The caller promises that `T` and `$wrapper<T>` have the
             // same bit validity.
             unsafe impl<T $(: ?$optbound)?> TransmuteFrom<T, Valid, Valid> for $wrapper<T> {}
             // SAFETY: See previous safety comment.
             unsafe impl<T $(: ?$optbound)?> TransmuteFrom<$wrapper<T>, Valid, Valid> for T {}
             // SAFETY: The caller promises that `T` and `$wrapper<T>` satisfy
             // `SizeEq`.
-            unsafe impl<T $(: ?$optbound)?> SizeEq<T> for $wrapper<T> {}
+            unsafe impl<T $(: ?$optbound)?> SizeEq<T> for $wrapper<T> {
+                fn cast_from_raw(t: NonNull<T>) -> NonNull<$wrapper<T>> {
+                    cast!(t)
+                }
+            }
             // SAFETY: See previous safety comment.
-            unsafe impl<T $(: ?$optbound)?> SizeEq<$wrapper<T>> for T {}
+            unsafe impl<T $(: ?$optbound)?> SizeEq<$wrapper<T>> for T {
+                fn cast_from_raw(t: NonNull<$wrapper<T>>) -> NonNull<T> {
+                    cast!(t)
+                }
+            }
         };
 
         // So that this macro must be invoked inside `safety_comment!` or else
@@ -732,17 +748,57 @@ macro_rules! unsafe_impl_for_transparent_wrapper {
     };
 }
 
+macro_rules! impl_transitive_transmute_from {
+    ($($tyvar:ident $(: ?$optbound:ident)?)? => $t:ty => $u:ty => $v:ty) => {
+        const _: () = {
+            use core::ptr::NonNull;
+            use crate::pointer::{TransmuteFrom, SizeEq, invariant::Valid};
+
+            // SAFETY: Since `$u: SizeEq<$t>` and `$v: SizeEq<U>`, this impl is
+            // transitively sound.
+            unsafe impl<$($tyvar $(: ?$optbound)?)?> SizeEq<$t> for $v
+            where
+                $u: SizeEq<$t>,
+                $v: SizeEq<$u>,
+            {
+                fn cast_from_raw(t: NonNull<$t>) -> NonNull<$v> {
+                    cast!(t)
+                }
+            }
+
+            // SAFETY: Since `$u: TransmuteFrom<$t, Valid, Valid>`, it is sound
+            // to transmute a bit-valid `$t` to a bit-valid `$u`. Since `$v:
+            // TransmuteFrom<$u, Valid, Valid>`, it is sound to transmute that
+            // bit-valid `$u` to a bit-valid `$v`.
+            unsafe impl<$($tyvar $(: ?$optbound)?)?> TransmuteFrom<$t, Valid, Valid> for $v
+            where
+                $u: TransmuteFrom<$t, Valid, Valid>,
+                $v: TransmuteFrom<$u, Valid, Valid>,
+            {}
+        };
+    };
+}
+
 macro_rules! impl_size_eq {
     ($t:ty, $u:ty) => {
         const _: () = {
             use crate::pointer::SizeEq;
+            use core::ptr::NonNull;
 
     static_assert!(=> mem::size_of::<$t>() == mem::size_of::<$u>());
 
             // SAFETY: We've asserted that their sizes are equal.
-            unsafe impl SizeEq<$t> for $u {}
+            unsafe impl SizeEq<$t> for $u {
+                fn cast_from_raw(t: NonNull<$t>) -> NonNull<$u> {
+                    cast!(t)
+                }
+            }
             // SAFETY: We've asserted that their sizes are equal.
-            unsafe impl SizeEq<$u> for $t {}
+            unsafe impl SizeEq<$u> for $t {
+                fn cast_from_raw(u: NonNull<$u>) -> NonNull<$t> {
+                    cast!(u)
+                }
+            }
         };
     };
 }
diff --git a/src/wrappers.rs b/src/wrappers.rs
@@ -188,7 +188,7 @@ impl<T> Unalign<T> {
     /// may prefer [`Deref::deref`], which is infallible.
     #[inline(always)]
     pub fn try_deref(&self) -> Result<&T, AlignmentError<&Self, T>> {
-        let inner = Ptr::from_ref(self).transmute_sized();
+        let inner = Ptr::from_ref(self).transmute();
         match inner.bikeshed_try_into_aligned() {
             Ok(aligned) => Ok(aligned.as_ref()),
             Err(err) => Err(err.map_src(|src| src.into_unalign().as_ref())),
@@ -205,7 +205,7 @@ impl<T> Unalign<T> {
     /// callers may prefer [`DerefMut::deref_mut`], which is infallible.
     #[inline(always)]
     pub fn try_deref_mut(&mut self) -> Result<&mut T, AlignmentError<&mut Self, T>> {
-        let inner = Ptr::from_mut(self).transmute_sized::<_, _, (_, (_, _))>();
+        let inner = Ptr::from_mut(self).transmute::<_, _, (_, (_, _))>();
         match inner.bikeshed_try_into_aligned() {
             Ok(aligned) => Ok(aligned.as_mut()),
             Err(err) => Err(err.map_src(|src| src.into_unalign().as_mut())),
@@ -394,17 +394,14 @@ impl<T: Unaligned> Deref for Unalign<T> {
 
     #[inline(always)]
     fn deref(&self) -> &T {
-        Ptr::from_ref(self).transmute_sized().bikeshed_recall_aligned().as_ref()
+        Ptr::from_ref(self).transmute().bikeshed_recall_aligned().as_ref()
     }
 }
 
 impl<T: Unaligned> DerefMut for Unalign<T> {
     #[inline(always)]
     fn deref_mut(&mut self) -> &mut T {
-        Ptr::from_mut(self)
-            .transmute_sized::<_, _, (_, (_, _))>()
-            .bikeshed_recall_aligned()
-            .as_mut()
+        Ptr::from_mut(self).transmute::<_, _, (_, (_, _))>().bikeshed_recall_aligned().as_mut()
     }
 }
 
