Merge pull request #64 from thomcc/improve-global-alloc

Improve our GlobalAlloc impl

Author: octavonce

src/lib.rs

@@ -29,26 +29,32 @@ use core::alloc::{GlobalAlloc, Layout};
 use core::ffi::c_void;
 use ffi::*;
 
-// Copied from https://github.com/rust-lang/rust/blob/master/src/libstd/sys_common/alloc.rs
-#[cfg(all(any(
-    target_arch = "x86",
-    target_arch = "arm",
-    target_arch = "mips",
-    target_arch = "powerpc",
-    target_arch = "powerpc64",
-    target_arch = "asmjs",
-    target_arch = "wasm32"
-)))]
-const MIN_ALIGN: usize = 8;
-
-#[cfg(all(any(
-    target_arch = "x86_64",
-    target_arch = "aarch64",
-    target_arch = "mips64",
-    target_arch = "s390x",
-    target_arch = "sparc64"
-)))]
-const MIN_ALIGN: usize = 16;
+// `MI_MAX_ALIGN_SIZE` is 16 unless manually overridden:
+// https://github.com/microsoft/mimalloc/blob/15220c68/include/mimalloc-types.h#L22
+//
+// If it changes on us, we should consider either manually overriding it, or
+// expose it from the -sys crate (in order to catch updates)
+const MI_MAX_ALIGN_SIZE: usize = 16;
+
+// Note: this doesn't take a layout directly because doing so would be wrong for
+// reallocation
+#[inline]
+fn may_use_unaligned_api(size: usize, alignment: usize) -> bool {
+    // Required by `GlobalAlloc`. Note that while allocators aren't allowed to
+    // unwind in rust, this is only in debug mode, and can only happen if the
+    // caller already caused UB by passing in an invalid layout.
+    debug_assert!(size != 0 && alignment.is_power_of_two());
+
+    // This logic is based on the discussion [here]. We don't bother with the
+    // 3rd suggested test due to it being high cost (calling `mi_good_size`)
+    // compared to the other checks, and also feeling like it relies on too much
+    // implementation-specific behavior.
+    //
+    // [here]: https://github.com/microsoft/mimalloc/issues/314#issuecomment-708541845
+
+    (alignment <= MI_MAX_ALIGN_SIZE && size >= alignment)
+        || (alignment == size && alignment <= 4096)
+}
 
 /// Drop-in mimalloc global allocator.
 ///
@@ -64,28 +70,18 @@ pub struct MiMalloc;
 unsafe impl GlobalAlloc for MiMalloc {
     #[inline]
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
-        if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
+        if may_use_unaligned_api(layout.size(), layout.align()) {
             mi_malloc(layout.size()) as *mut u8
         } else {
-            #[cfg(target_os = "macos")]
-            if layout.align() > (1 << 31) {
-                return core::ptr::null_mut();
-            }
-
             mi_malloc_aligned(layout.size(), layout.align()) as *mut u8
         }
     }
 
     #[inline]
     unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
-        if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
+        if may_use_unaligned_api(layout.size(), layout.align()) {
             mi_zalloc(layout.size()) as *mut u8
         } else {
-            #[cfg(target_os = "macos")]
-            if layout.align() > (1 << 31) {
-                return core::ptr::null_mut();
-            }
-
             mi_zalloc_aligned(layout.size(), layout.align()) as *mut u8
         }
     }
@@ -97,7 +93,7 @@ unsafe impl GlobalAlloc for MiMalloc {
 
     #[inline]
     unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
-        if layout.align() <= MIN_ALIGN && layout.align() <= layout.size() {
+        if may_use_unaligned_api(new_size, layout.align()) {
             mi_realloc(ptr as *mut c_void, new_size) as *mut u8
         } else {
             mi_realloc_aligned(ptr as *mut c_void, new_size, layout.align()) as *mut u8