71d3dac4a8
Partial future-proofing for Box<T, A> In some ways, this is similar to @eddyb's PR #47043 that went stale, but doesn't cover everything. Notably, this still leaves Box internalized as a pointer in places, so practically speaking, only ZSTs can be practically added to the Box type with the changes here (the compiler ICEs otherwise). The Box type is not changed here, that's left for the future because I want to test that further first, but this puts things in place in a way that hopefully will make things easier.
220 lines
6.7 KiB
Rust
220 lines
6.7 KiB
Rust
// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
#![unstable(feature = "allocator_api",
|
|
reason = "the precise API and guarantees it provides may be tweaked \
|
|
slightly, especially to possibly take into account the \
|
|
types being stored to make room for a future \
|
|
tracing garbage collector",
|
|
issue = "32838")]
|
|
|
|
use core::intrinsics::{min_align_of_val, size_of_val};
|
|
use core::ptr::{NonNull, Unique};
|
|
use core::usize;
|
|
|
|
#[doc(inline)]
|
|
pub use core::alloc::*;
|
|
|
|
#[cfg(stage0)]
|
|
extern "Rust" {
|
|
#[allocator]
|
|
#[rustc_allocator_nounwind]
|
|
fn __rust_alloc(size: usize, align: usize, err: *mut u8) -> *mut u8;
|
|
#[cold]
|
|
#[rustc_allocator_nounwind]
|
|
fn __rust_oom(err: *const u8) -> !;
|
|
#[rustc_allocator_nounwind]
|
|
fn __rust_dealloc(ptr: *mut u8, size: usize, align: usize);
|
|
#[rustc_allocator_nounwind]
|
|
fn __rust_realloc(ptr: *mut u8,
|
|
old_size: usize,
|
|
old_align: usize,
|
|
new_size: usize,
|
|
new_align: usize,
|
|
err: *mut u8) -> *mut u8;
|
|
#[rustc_allocator_nounwind]
|
|
fn __rust_alloc_zeroed(size: usize, align: usize, err: *mut u8) -> *mut u8;
|
|
}
|
|
|
|
#[cfg(not(stage0))]
|
|
extern "Rust" {
|
|
#[allocator]
|
|
#[rustc_allocator_nounwind]
|
|
fn __rust_alloc(size: usize, align: usize) -> *mut u8;
|
|
#[rustc_allocator_nounwind]
|
|
fn __rust_dealloc(ptr: *mut u8, size: usize, align: usize);
|
|
#[rustc_allocator_nounwind]
|
|
fn __rust_realloc(ptr: *mut u8,
|
|
old_size: usize,
|
|
align: usize,
|
|
new_size: usize) -> *mut u8;
|
|
#[rustc_allocator_nounwind]
|
|
fn __rust_alloc_zeroed(size: usize, align: usize) -> *mut u8;
|
|
}
|
|
|
|
#[derive(Copy, Clone, Default, Debug)]
|
|
pub struct Global;
|
|
|
|
#[unstable(feature = "allocator_api", issue = "32838")]
|
|
#[rustc_deprecated(since = "1.27.0", reason = "type renamed to `Global`")]
|
|
pub type Heap = Global;
|
|
|
|
#[unstable(feature = "allocator_api", issue = "32838")]
|
|
#[rustc_deprecated(since = "1.27.0", reason = "type renamed to `Global`")]
|
|
#[allow(non_upper_case_globals)]
|
|
pub const Heap: Global = Global;
|
|
|
|
unsafe impl GlobalAlloc for Global {
|
|
#[inline]
|
|
unsafe fn alloc(&self, layout: Layout) -> *mut Opaque {
|
|
#[cfg(not(stage0))]
|
|
let ptr = __rust_alloc(layout.size(), layout.align());
|
|
#[cfg(stage0)]
|
|
let ptr = __rust_alloc(layout.size(), layout.align(), &mut 0);
|
|
ptr as *mut Opaque
|
|
}
|
|
|
|
#[inline]
|
|
unsafe fn dealloc(&self, ptr: *mut Opaque, layout: Layout) {
|
|
__rust_dealloc(ptr as *mut u8, layout.size(), layout.align())
|
|
}
|
|
|
|
#[inline]
|
|
unsafe fn realloc(&self, ptr: *mut Opaque, layout: Layout, new_size: usize) -> *mut Opaque {
|
|
#[cfg(not(stage0))]
|
|
let ptr = __rust_realloc(ptr as *mut u8, layout.size(), layout.align(), new_size);
|
|
#[cfg(stage0)]
|
|
let ptr = __rust_realloc(ptr as *mut u8, layout.size(), layout.align(),
|
|
new_size, layout.align(), &mut 0);
|
|
ptr as *mut Opaque
|
|
}
|
|
|
|
#[inline]
|
|
unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut Opaque {
|
|
#[cfg(not(stage0))]
|
|
let ptr = __rust_alloc_zeroed(layout.size(), layout.align());
|
|
#[cfg(stage0)]
|
|
let ptr = __rust_alloc_zeroed(layout.size(), layout.align(), &mut 0);
|
|
ptr as *mut Opaque
|
|
}
|
|
}
|
|
|
|
unsafe impl Alloc for Global {
|
|
#[inline]
|
|
unsafe fn alloc(&mut self, layout: Layout) -> Result<NonNull<Opaque>, AllocErr> {
|
|
NonNull::new(GlobalAlloc::alloc(self, layout)).ok_or(AllocErr)
|
|
}
|
|
|
|
#[inline]
|
|
unsafe fn dealloc(&mut self, ptr: NonNull<Opaque>, layout: Layout) {
|
|
GlobalAlloc::dealloc(self, ptr.as_ptr(), layout)
|
|
}
|
|
|
|
#[inline]
|
|
unsafe fn realloc(&mut self,
|
|
ptr: NonNull<Opaque>,
|
|
layout: Layout,
|
|
new_size: usize)
|
|
-> Result<NonNull<Opaque>, AllocErr>
|
|
{
|
|
NonNull::new(GlobalAlloc::realloc(self, ptr.as_ptr(), layout, new_size)).ok_or(AllocErr)
|
|
}
|
|
|
|
#[inline]
|
|
unsafe fn alloc_zeroed(&mut self, layout: Layout) -> Result<NonNull<Opaque>, AllocErr> {
|
|
NonNull::new(GlobalAlloc::alloc_zeroed(self, layout)).ok_or(AllocErr)
|
|
}
|
|
}
|
|
|
|
/// The allocator for unique pointers.
|
|
// This function must not unwind. If it does, MIR trans will fail.
|
|
#[cfg(not(test))]
|
|
#[lang = "exchange_malloc"]
|
|
#[inline]
|
|
unsafe fn exchange_malloc(size: usize, align: usize) -> *mut u8 {
|
|
if size == 0 {
|
|
align as *mut u8
|
|
} else {
|
|
let layout = Layout::from_size_align_unchecked(size, align);
|
|
let ptr = Global.alloc(layout);
|
|
if !ptr.is_null() {
|
|
ptr as *mut u8
|
|
} else {
|
|
oom()
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(stage0)]
|
|
#[lang = "box_free"]
|
|
#[inline]
|
|
unsafe fn old_box_free<T: ?Sized>(ptr: *mut T) {
|
|
box_free(Unique::new_unchecked(ptr))
|
|
}
|
|
|
|
#[cfg_attr(not(any(test, stage0)), lang = "box_free")]
|
|
#[inline]
|
|
pub(crate) unsafe fn box_free<T: ?Sized>(ptr: Unique<T>) {
|
|
let ptr = ptr.as_ptr();
|
|
let size = size_of_val(&*ptr);
|
|
let align = min_align_of_val(&*ptr);
|
|
// We do not allocate for Box<T> when T is ZST, so deallocation is also not necessary.
|
|
if size != 0 {
|
|
let layout = Layout::from_size_align_unchecked(size, align);
|
|
Global.dealloc(ptr as *mut Opaque, layout);
|
|
}
|
|
}
|
|
|
|
#[cfg(stage0)]
|
|
pub fn oom() -> ! {
|
|
unsafe { ::core::intrinsics::abort() }
|
|
}
|
|
|
|
#[cfg(not(stage0))]
|
|
pub fn oom() -> ! {
|
|
extern {
|
|
#[lang = "oom"]
|
|
fn oom_impl() -> !;
|
|
}
|
|
unsafe { oom_impl() }
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
extern crate test;
|
|
use self::test::Bencher;
|
|
use boxed::Box;
|
|
use alloc::{Global, Alloc, Layout, oom};
|
|
|
|
#[test]
|
|
fn allocate_zeroed() {
|
|
unsafe {
|
|
let layout = Layout::from_size_align(1024, 1).unwrap();
|
|
let ptr = Global.alloc_zeroed(layout.clone())
|
|
.unwrap_or_else(|_| oom());
|
|
|
|
let mut i = ptr.cast::<u8>().as_ptr();
|
|
let end = i.offset(layout.size() as isize);
|
|
while i < end {
|
|
assert_eq!(*i, 0);
|
|
i = i.offset(1);
|
|
}
|
|
Global.dealloc(ptr, layout);
|
|
}
|
|
}
|
|
|
|
#[bench]
|
|
fn alloc_owned_small(b: &mut Bencher) {
|
|
b.iter(|| {
|
|
let _: Box<_> = box 10;
|
|
})
|
|
}
|
|
}
|