Skip to content

Commit 0bfb99e

Browse files
authored
Rollup merge of rust-lang#90081 - woppopo:const_write_bytes, r=oli-obk
Make `intrinsics::write_bytes` const This is required to constify `MaybeUninit::zeroed` and `(*mut T)::write_bytes`. Tracking issue: rust-lang#86302
2 parents 27d42bd + 82a2583 commit 0bfb99e

File tree

2 files changed

+48
-2
lines changed

2 files changed

+48
-2
lines changed

core/src/intrinsics.rs

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,13 +2244,29 @@ pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
22442244
/// assert_eq!(*v, 42);
22452245
/// ```
22462246
#[stable(feature = "rust1", since = "1.0.0")]
2247+
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
22472248
#[inline]
2248-
pub unsafe fn write_bytes<T>(dst: *mut T, val: u8, count: usize) {
2249+
pub const unsafe fn write_bytes<T>(dst: *mut T, val: u8, count: usize) {
22492250
extern "rust-intrinsic" {
2251+
#[rustc_const_unstable(feature = "const_ptr_write", issue = "86302")]
22502252
fn write_bytes<T>(dst: *mut T, val: u8, count: usize);
22512253
}
22522254

2253-
debug_assert!(is_aligned_and_not_null(dst), "attempt to write to unaligned or null pointer");
2255+
#[cfg(debug_assertions)]
2256+
fn runtime_check<T>(ptr: *mut T) {
2257+
debug_assert!(
2258+
is_aligned_and_not_null(ptr),
2259+
"attempt to write to unaligned or null pointer"
2260+
);
2261+
}
2262+
#[cfg(debug_assertions)]
2263+
const fn compiletime_check<T>(_ptr: *mut T) {}
2264+
#[cfg(debug_assertions)]
2265+
// SAFETY: runtime debug-assertions are a best-effort basis; it's fine to
2266+
// not do them during compile time
2267+
unsafe {
2268+
const_eval_select((dst,), compiletime_check, runtime_check);
2269+
}
22542270

22552271
// SAFETY: the safety contract for `write_bytes` must be upheld by the caller.
22562272
unsafe { write_bytes(dst, val, count) }

core/tests/intrinsics.rs

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,33 @@ fn test_assume_can_be_in_const_contexts() {
3535
let rs = unsafe { foo(42, 97) };
3636
assert_eq!(rs, 0);
3737
}
38+
39+
#[test]
40+
#[cfg(not(bootstrap))]
41+
const fn test_write_bytes_in_const_contexts() {
42+
use core::intrinsics::write_bytes;
43+
44+
const TEST: [u32; 3] = {
45+
let mut arr = [1u32, 2, 3];
46+
unsafe {
47+
write_bytes(arr.as_mut_ptr(), 0, 2);
48+
}
49+
arr
50+
};
51+
52+
assert!(TEST[0] == 0);
53+
assert!(TEST[1] == 0);
54+
assert!(TEST[2] == 3);
55+
56+
const TEST2: [u32; 3] = {
57+
let mut arr = [1u32, 2, 3];
58+
unsafe {
59+
write_bytes(arr.as_mut_ptr(), 1, 2);
60+
}
61+
arr
62+
};
63+
64+
assert!(TEST2[0] == 16843009);
65+
assert!(TEST2[1] == 16843009);
66+
assert!(TEST2[2] == 3);
67+
}

0 commit comments

Comments
 (0)