Skip to content

Commit 72c676f

Browse files
borsbors
committed
Auto merge of rust-lang#128134 - joboet:move_pal_alloc, r=cupiver
std: move allocators to `sys` Part of rust-lang#117276.
2 parents a628540 + 4dc5b67 commit 72c676f

File tree

28 files changed

+78
-146
lines changed

28 files changed

+78
-146
lines changed

Diff for: ‎std/src/sys/pal/hermit/alloc.rs renamed to ‎std/src/sys/alloc/hermit.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use super::hermit_abi;
21
use crate::alloc::{GlobalAlloc, Layout, System};
32

43
#[stable(feature = "alloc_system_type", since = "1.28.0")]

Diff for: ‎std/src/sys/pal/common/alloc.rs renamed to ‎std/src/sys/alloc/mod.rs

+50-17
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
#![forbid(unsafe_op_in_unsafe_fn)]
2+
23
use crate::alloc::{GlobalAlloc, Layout, System};
3-
use crate::{cmp, ptr};
4+
use crate::ptr;
45

56
// The minimum alignment guaranteed by the architecture. This value is used to
67
// add fast paths for low alignment values.
7-
#[cfg(any(
8+
#[allow(dead_code)]
9+
const MIN_ALIGN: usize = if cfg!(any(
10+
all(target_arch = "riscv32", any(target_os = "espidf", target_os = "zkvm")),
11+
all(target_arch = "xtensa", target_os = "espidf"),
12+
)) {
13+
// The allocator on the esp-idf and zkvm platforms guarantees 4 byte alignment.
14+
4
15+
} else if cfg!(any(
816
target_arch = "x86",
917
target_arch = "arm",
1018
target_arch = "m68k",
@@ -16,11 +24,11 @@ use crate::{cmp, ptr};
1624
target_arch = "sparc",
1725
target_arch = "wasm32",
1826
target_arch = "hexagon",
19-
all(target_arch = "riscv32", not(any(target_os = "espidf", target_os = "zkvm"))),
20-
all(target_arch = "xtensa", not(target_os = "espidf")),
21-
))]
22-
pub const MIN_ALIGN: usize = 8;
23-
#[cfg(any(
27+
target_arch = "riscv32",
28+
target_arch = "xtensa",
29+
)) {
30+
8
31+
} else if cfg!(any(
2432
target_arch = "x86_64",
2533
target_arch = "aarch64",
2634
target_arch = "arm64ec",
@@ -31,16 +39,14 @@ pub const MIN_ALIGN: usize = 8;
3139
target_arch = "sparc64",
3240
target_arch = "riscv64",
3341
target_arch = "wasm64",
34-
))]
35-
pub const MIN_ALIGN: usize = 16;
36-
// The allocator on the esp-idf and zkvm platforms guarantee 4 byte alignment.
37-
#[cfg(all(any(
38-
all(target_arch = "riscv32", any(target_os = "espidf", target_os = "zkvm")),
39-
all(target_arch = "xtensa", target_os = "espidf"),
40-
)))]
41-
pub const MIN_ALIGN: usize = 4;
42+
)) {
43+
16
44+
} else {
45+
panic!("add a value for MIN_ALIGN")
46+
};
4247

43-
pub unsafe fn realloc_fallback(
48+
#[allow(dead_code)]
49+
unsafe fn realloc_fallback(
4450
alloc: &System,
4551
ptr: *mut u8,
4652
old_layout: Layout,
@@ -52,10 +58,37 @@ pub unsafe fn realloc_fallback(
5258

5359
let new_ptr = GlobalAlloc::alloc(alloc, new_layout);
5460
if !new_ptr.is_null() {
55-
let size = cmp::min(old_layout.size(), new_size);
61+
let size = usize::min(old_layout.size(), new_size);
5662
ptr::copy_nonoverlapping(ptr, new_ptr, size);
5763
GlobalAlloc::dealloc(alloc, ptr, old_layout);
5864
}
65+
5966
new_ptr
6067
}
6168
}
69+
70+
cfg_if::cfg_if! {
71+
if #[cfg(any(
72+
target_family = "unix",
73+
target_os = "wasi",
74+
target_os = "teeos",
75+
))] {
76+
mod unix;
77+
} else if #[cfg(target_os = "windows")] {
78+
mod windows;
79+
} else if #[cfg(target_os = "hermit")] {
80+
mod hermit;
81+
} else if #[cfg(all(target_vendor = "fortanix", target_env = "sgx"))] {
82+
mod sgx;
83+
} else if #[cfg(target_os = "solid_asp3")] {
84+
mod solid;
85+
} else if #[cfg(target_os = "uefi")] {
86+
mod uefi;
87+
} else if #[cfg(target_family = "wasm")] {
88+
mod wasm;
89+
} else if #[cfg(target_os = "xous")] {
90+
mod xous;
91+
} else if #[cfg(target_os = "zkvm")] {
92+
mod zkvm;
93+
}
94+
}

Diff for: ‎std/src/sys/pal/sgx/alloc.rs renamed to ‎std/src/sys/alloc/sgx.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
use core::sync::atomic::{AtomicBool, Ordering};
2-
3-
use super::abi::mem as sgx_mem;
4-
use super::waitqueue::SpinMutex;
51
use crate::alloc::{GlobalAlloc, Layout, System};
62
use crate::ptr;
3+
use crate::sync::atomic::{AtomicBool, Ordering};
4+
use crate::sys::pal::abi::mem as sgx_mem;
5+
use crate::sys::pal::waitqueue::SpinMutex;
76

87
// Using a SpinMutex because we never want to exit the enclave waiting for the
98
// allocator.

Diff for: ‎std/src/sys/pal/solid/alloc.rs renamed to ‎std/src/sys/alloc/solid.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
use super::{realloc_fallback, MIN_ALIGN};
12
use crate::alloc::{GlobalAlloc, Layout, System};
2-
use crate::sys::common::alloc::{realloc_fallback, MIN_ALIGN};
33

44
#[stable(feature = "alloc_system_type", since = "1.28.0")]
55
unsafe impl GlobalAlloc for System {

Diff for: ‎std/src/sys/pal/uefi/alloc.rs renamed to ‎std/src/sys/alloc/uefi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
44
use r_efi::protocols::loaded_image;
55

6-
use super::helpers;
76
use crate::alloc::{GlobalAlloc, Layout, System};
87
use crate::sync::OnceLock;
8+
use crate::sys::pal::helpers;
99

1010
#[stable(feature = "alloc_system_type", since = "1.28.0")]
1111
unsafe impl GlobalAlloc for System {

Diff for: ‎std/src/sys/pal/unix/alloc.rs renamed to ‎std/src/sys/alloc/unix.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
use super::{realloc_fallback, MIN_ALIGN};
12
use crate::alloc::{GlobalAlloc, Layout, System};
23
use crate::ptr;
3-
use crate::sys::common::alloc::{realloc_fallback, MIN_ALIGN};
44

55
#[stable(feature = "alloc_system_type", since = "1.28.0")]
66
unsafe impl GlobalAlloc for System {
@@ -11,7 +11,7 @@ unsafe impl GlobalAlloc for System {
1111
// Also see <https://github.com/rust-lang/rust/issues/45955> and
1212
// <https://github.com/rust-lang/rust/issues/62251#issuecomment-507580914>.
1313
if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
14-
libc::malloc(layout.size()) as *mut u8
14+
unsafe { libc::malloc(layout.size()) as *mut u8 }
1515
} else {
1616
// `posix_memalign` returns a non-aligned value if supplied a very
1717
// large alignment on older versions of Apple's platforms (unknown
@@ -25,35 +25,35 @@ unsafe impl GlobalAlloc for System {
2525
return ptr::null_mut();
2626
}
2727
}
28-
aligned_malloc(&layout)
28+
unsafe { aligned_malloc(&layout) }
2929
}
3030
}
3131

3232
#[inline]
3333
unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
3434
// See the comment above in `alloc` for why this check looks the way it does.
3535
if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
36-
libc::calloc(layout.size(), 1) as *mut u8
36+
unsafe { libc::calloc(layout.size(), 1) as *mut u8 }
3737
} else {
38-
let ptr = self.alloc(layout);
38+
let ptr = unsafe { self.alloc(layout) };
3939
if !ptr.is_null() {
40-
ptr::write_bytes(ptr, 0, layout.size());
40+
unsafe { ptr::write_bytes(ptr, 0, layout.size()) };
4141
}
4242
ptr
4343
}
4444
}
4545

4646
#[inline]
4747
unsafe fn dealloc(&self, ptr: *mut u8, _layout: Layout) {
48-
libc::free(ptr as *mut libc::c_void)
48+
unsafe { libc::free(ptr as *mut libc::c_void) }
4949
}
5050

5151
#[inline]
5252
unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
5353
if layout.align() <= MIN_ALIGN && layout.align() <= new_size {
54-
libc::realloc(ptr as *mut libc::c_void, new_size) as *mut u8
54+
unsafe { libc::realloc(ptr as *mut libc::c_void, new_size) as *mut u8 }
5555
} else {
56-
realloc_fallback(self, ptr, layout, new_size)
56+
unsafe { realloc_fallback(self, ptr, layout, new_size) }
5757
}
5858
}
5959
}
@@ -81,7 +81,7 @@ cfg_if::cfg_if! {
8181
// posix_memalign only has one, clear requirement: that the alignment be a multiple of
8282
// `sizeof(void*)`. Since these are all powers of 2, we can just use max.
8383
let align = layout.align().max(crate::mem::size_of::<usize>());
84-
let ret = libc::posix_memalign(&mut out, align, layout.size());
84+
let ret = unsafe { libc::posix_memalign(&mut out, align, layout.size()) };
8585
if ret != 0 { ptr::null_mut() } else { out as *mut u8 }
8686
}
8787
}

Diff for: ‎std/src/sys/pal/wasm/alloc.rs renamed to ‎std/src/sys/alloc/wasm.rs

File renamed without changes.

Diff for: ‎std/src/sys/pal/windows/alloc.rs renamed to ‎std/src/sys/alloc/windows.rs

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
use core::mem::MaybeUninit;
2-
1+
use super::{realloc_fallback, MIN_ALIGN};
32
use crate::alloc::{GlobalAlloc, Layout, System};
43
use crate::ffi::c_void;
4+
use crate::mem::MaybeUninit;
55
use crate::ptr;
66
use crate::sync::atomic::{AtomicPtr, Ordering};
77
use crate::sys::c;
8-
use crate::sys::common::alloc::{realloc_fallback, MIN_ALIGN};
98

109
#[cfg(test)]
1110
mod tests;
@@ -113,28 +112,28 @@ fn init_or_get_process_heap() -> c::HANDLE {
113112
extern "C" fn process_heap_init_and_alloc(
114113
_heap: MaybeUninit<c::HANDLE>, // We pass this argument to match the ABI of `HeapAlloc`
115114
flags: u32,
116-
dwBytes: usize,
115+
bytes: usize,
117116
) -> *mut c_void {
118117
let heap = init_or_get_process_heap();
119118
if core::intrinsics::unlikely(heap.is_null()) {
120119
return ptr::null_mut();
121120
}
122121
// SAFETY: `heap` is a non-null handle returned by `GetProcessHeap`.
123-
unsafe { HeapAlloc(heap, flags, dwBytes) }
122+
unsafe { HeapAlloc(heap, flags, bytes) }
124123
}
125124

126125
#[inline(never)]
127126
fn process_heap_alloc(
128127
_heap: MaybeUninit<c::HANDLE>, // We pass this argument to match the ABI of `HeapAlloc`,
129128
flags: u32,
130-
dwBytes: usize,
129+
bytes: usize,
131130
) -> *mut c_void {
132131
let heap = HEAP.load(Ordering::Relaxed);
133132
if core::intrinsics::likely(!heap.is_null()) {
134133
// SAFETY: `heap` is a non-null handle returned by `GetProcessHeap`.
135-
unsafe { HeapAlloc(heap, flags, dwBytes) }
134+
unsafe { HeapAlloc(heap, flags, bytes) }
136135
} else {
137-
process_heap_init_and_alloc(MaybeUninit::uninit(), flags, dwBytes)
136+
process_heap_init_and_alloc(MaybeUninit::uninit(), flags, bytes)
138137
}
139138
}
140139

Diff for: ‎std/src/sys/pal/windows/alloc/tests.rs renamed to ‎std/src/sys/alloc/windows/tests.rs

File renamed without changes.

Diff for: ‎std/src/sys/pal/xous/alloc.rs renamed to ‎std/src/sys/alloc/xous.rs

File renamed without changes.

Diff for: ‎std/src/sys/pal/zkvm/alloc.rs renamed to ‎std/src/sys/alloc/zkvm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use super::abi;
21
use crate::alloc::{GlobalAlloc, Layout, System};
2+
use crate::sys::pal::abi;
33

44
#[stable(feature = "alloc_system_type", since = "1.28.0")]
55
unsafe impl GlobalAlloc for System {

Diff for: ‎std/src/sys/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/// descriptors.
66
mod pal;
77

8+
mod alloc;
89
mod personality;
910

1011
pub mod anonymous_pipe;

Diff for: ‎std/src/sys/pal/common/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#![allow(dead_code)]
1212

13-
pub mod alloc;
1413
pub mod small_c_string;
1514

1615
#[cfg(test)]

Diff for: ‎std/src/sys/pal/hermit/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
use crate::os::raw::c_char;
2020

21-
pub mod alloc;
2221
pub mod args;
2322
pub mod env;
2423
pub mod fd;

Diff for: ‎std/src/sys/pal/sgx/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use crate::io::ErrorKind;
99
use crate::sync::atomic::{AtomicBool, Ordering};
1010

1111
pub mod abi;
12-
pub mod alloc;
1312
pub mod args;
1413
pub mod env;
1514
pub mod fd;

Diff for: ‎std/src/sys/pal/solid/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ pub mod itron {
1616
use super::unsupported;
1717
}
1818

19-
pub mod alloc;
2019
#[path = "../unsupported/args.rs"]
2120
pub mod args;
2221
pub mod env;

Diff for: ‎std/src/sys/pal/teeos/alloc.rs

-57
This file was deleted.

Diff for: ‎std/src/sys/pal/teeos/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
pub use self::rand::hashmap_random_keys;
1010

11-
pub mod alloc;
1211
#[path = "../unsupported/args.rs"]
1312
pub mod args;
1413
#[path = "../unsupported/env.rs"]

Diff for: ‎std/src/sys/pal/uefi/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
//! [`OsString`]: crate::ffi::OsString
1414
#![forbid(unsafe_op_in_unsafe_fn)]
1515

16-
pub mod alloc;
1716
pub mod args;
1817
pub mod env;
1918
#[path = "../unsupported/fs.rs"]
2019
pub mod fs;
20+
pub mod helpers;
2121
#[path = "../unsupported/io.rs"]
2222
pub mod io;
2323
#[path = "../unsupported/net.rs"]
@@ -30,8 +30,6 @@ pub mod stdio;
3030
pub mod thread;
3131
pub mod time;
3232

33-
mod helpers;
34-
3533
#[cfg(test)]
3634
mod tests;
3735

Diff for: ‎std/src/sys/pal/unix/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use crate::io::ErrorKind;
77
#[macro_use]
88
pub mod weak;
99

10-
pub mod alloc;
1110
pub mod args;
1211
pub mod env;
1312
pub mod fd;

0 commit comments

Comments
 (0)