diff options
| author | Tim Diekmann <tim.diekmann@3dvision.de> | 2020-03-07 02:40:54 +0100 |
|---|---|---|
| committer | Tim Diekmann <tim.diekmann@3dvision.de> | 2020-03-07 02:40:54 +0100 |
| commit | 545ef9d83ab383bdc99376a2fe4164e46f4a3f6e (patch) | |
| tree | b6ac4c86c0c531b21778c34469dfc0cad9eb6539 | |
| parent | 2890b37b861247de3b8c6ba2ecbcd00048c728a1 (diff) | |
| download | rust-545ef9d83ab383bdc99376a2fe4164e46f4a3f6e.tar.gz rust-545ef9d83ab383bdc99376a2fe4164e46f4a3f6e.zip | |
Add `Layout::dangling()` to return a well-aligned `NonNull<u8>`
| -rw-r--r-- | src/libcore/alloc.rs | 12 | ||||
| -rw-r--r-- | src/libcore/tests/alloc.rs | 3 | ||||
| -rw-r--r-- | src/libcore/tests/lib.rs | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/libcore/alloc.rs b/src/libcore/alloc.rs index f3a2b73f2b8..4f401c75104 100644 --- a/src/libcore/alloc.rs +++ b/src/libcore/alloc.rs @@ -140,6 +140,18 @@ impl Layout { unsafe { Layout::from_size_align_unchecked(size, align) } } + /// Creates a `NonNull` that is dangling, but well-aligned for this Layout. + /// + /// Note that the pointer value may potentially represent a valid pointer to + /// a `T`, which means this must not be used as a "not yet initialized" + /// sentinel value. Types that lazily allocate must track initialization by + /// some other means. + #[unstable(feature = "alloc_layout_extra", issue = "55724")] + pub const fn dangling(&self) -> NonNull<u8> { + // align is non-zero and a power of two + unsafe { NonNull::new_unchecked(self.align() as *mut u8) } + } + /// Creates a layout describing the record that can hold a value /// of the same layout as `self`, but that also is aligned to /// alignment `align` (measured in bytes). diff --git a/src/libcore/tests/alloc.rs b/src/libcore/tests/alloc.rs index 63537ba23d8..c8592e40a69 100644 --- a/src/libcore/tests/alloc.rs +++ b/src/libcore/tests/alloc.rs @@ -1,10 +1,13 @@ use core::alloc::Layout; +use core::ptr::NonNull; #[test] fn const_unchecked_layout() { const SIZE: usize = 0x2000; const ALIGN: usize = 0x1000; const LAYOUT: Layout = unsafe { Layout::from_size_align_unchecked(SIZE, ALIGN) }; + const DANGLING: NonNull<u8> = LAYOUT.dangling(); assert_eq!(LAYOUT.size(), SIZE); assert_eq!(LAYOUT.align(), ALIGN); + assert_eq!(Some(DANGLING), NonNull::new(ALIGN as *mut u8)); } diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs index 991458db5b7..71a061af289 100644 --- a/src/libcore/tests/lib.rs +++ b/src/libcore/tests/lib.rs @@ -1,3 +1,4 @@ +#![feature(alloc_layout_extra)] #![feature(bool_to_option)] #![feature(bound_cloned)] #![feature(box_syntax)] |
