Skip to content

Commit 9325623

Browse files
authored
Rollup merge of #110706 - scottmcm:transmute_unchecked, r=oli-obk
Add `intrinsics::transmute_unchecked` This takes a whole 3 lines in `compiler/` since it lowers to `CastKind::Transmute` in MIR *exactly* the same as the existing `intrinsics::transmute` does, it just doesn't have the fancy checking in `hir_typeck`. Added to enable experimenting with the request in <rust-lang/rust#106281 (comment)> and because the portable-simd folks might be interested for dependently-sized array-vector conversions. It also simplifies a couple places in `core`. See also rust-lang/rust#108442 (comment), where `CastKind::Transmute` was added having exactly these semantics before the lang meeting (which I wasn't in) independently expressed interest.
2 parents 5f3b8b4 + b2c8c57 commit 9325623

File tree

3 files changed

+31
-19
lines changed

3 files changed

+31
-19
lines changed

core/src/array/iter.rs

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
use crate::num::NonZeroUsize;
44
use crate::{
55
fmt,
6+
intrinsics::transmute_unchecked,
67
iter::{self, ExactSizeIterator, FusedIterator, TrustedLen},
7-
mem::{self, MaybeUninit},
8+
mem::MaybeUninit,
89
ops::{IndexRange, Range},
910
ptr,
1011
};
@@ -63,18 +64,11 @@ impl<T, const N: usize> IntoIterator for [T; N] {
6364
// an array of `T`.
6465
//
6566
// With that, this initialization satisfies the invariants.
66-
67-
// FIXME(LukasKalbertodt): actually use `mem::transmute` here, once it
68-
// works with const generics:
69-
// `mem::transmute::<[T; N], [MaybeUninit<T>; N]>(array)`
7067
//
71-
// Until then, we can use `mem::transmute_copy` to create a bitwise copy
72-
// as a different type, then forget `array` so that it is not dropped.
73-
unsafe {
74-
let iter = IntoIter { data: mem::transmute_copy(&self), alive: IndexRange::zero_to(N) };
75-
mem::forget(self);
76-
iter
77-
}
68+
// FIXME: If normal `transmute` ever gets smart enough to allow this
69+
// directly, use it instead of `transmute_unchecked`.
70+
let data: [MaybeUninit<T>; N] = unsafe { transmute_unchecked(self) };
71+
IntoIter { data, alive: IndexRange::zero_to(N) }
7872
}
7973
}
8074

core/src/intrinsics.rs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,6 +1376,20 @@ extern "rust-intrinsic" {
13761376
#[rustc_nounwind]
13771377
pub fn transmute<Src, Dst>(src: Src) -> Dst;
13781378

1379+
/// Like [`transmute`], but even less checked at compile-time: rather than
1380+
/// giving an error for `size_of::<Src>() != size_of::<Dst>()`, it's
1381+
/// **Undefined Behaviour** at runtime.
1382+
///
1383+
/// Prefer normal `transmute` where possible, for the extra checking, since
1384+
/// both do exactly the same thing at runtime, if they both compile.
1385+
///
1386+
/// This is not expected to ever be exposed directly to users, rather it
1387+
/// may eventually be exposed through some more-constrained API.
1388+
#[cfg(not(bootstrap))]
1389+
#[rustc_const_stable(feature = "const_transmute", since = "1.56.0")]
1390+
#[rustc_nounwind]
1391+
pub fn transmute_unchecked<Src, Dst>(src: Src) -> Dst;
1392+
13791393
/// Returns `true` if the actual type given as `T` requires drop
13801394
/// glue; returns `false` if the actual type provided for `T`
13811395
/// implements `Copy`.
@@ -2798,3 +2812,11 @@ pub const unsafe fn write_bytes<T>(dst: *mut T, val: u8, count: usize) {
27982812
write_bytes(dst, val, count)
27992813
}
28002814
}
2815+
2816+
/// Polyfill for bootstrap
2817+
#[cfg(bootstrap)]
2818+
pub const unsafe fn transmute_unchecked<Src, Dst>(src: Src) -> Dst {
2819+
use crate::mem::*;
2820+
// SAFETY: It's a transmute -- the caller promised it's fine.
2821+
unsafe { transmute_copy(&ManuallyDrop::new(src)) }
2822+
}

core/src/mem/maybe_uninit.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -945,14 +945,10 @@ impl<T> MaybeUninit<T> {
945945
// * `MaybeUninit<T>` and T are guaranteed to have the same layout
946946
// * `MaybeUninit` does not drop, so there are no double-frees
947947
// And thus the conversion is safe
948-
let ret = unsafe {
948+
unsafe {
949949
intrinsics::assert_inhabited::<[T; N]>();
950-
(&array as *const _ as *const [T; N]).read()
951-
};
952-
953-
// FIXME: required to avoid `~const Destruct` bound
954-
super::forget(array);
955-
ret
950+
intrinsics::transmute_unchecked(array)
951+
}
956952
}
957953

958954
/// Assuming all the elements are initialized, get a slice to them.

0 commit comments

Comments
 (0)