hopefully fix build on windows/macos

Author: nia-e

src/alloc_bytes.rs

@@ -5,6 +5,7 @@ use std::{alloc, slice};
 use rustc_abi::{Align, Size};
 use rustc_middle::mir::interpret::AllocBytes;
 
+#[cfg(all(unix, any(target_arch = "x86", target_arch = "x86_64")))]
 use crate::discrete_alloc::MachineAlloc;
 use crate::helpers::ToU64 as _;
 
@@ -41,7 +42,10 @@ impl Drop for MiriAllocBytes {
 
         // SAFETY: Invariant, `self.ptr` points to memory allocated with `self.layout`.
         unsafe {
+            #[cfg(all(unix, any(target_arch = "x86", target_arch = "x86_64")))]
             MachineAlloc::dealloc(self.ptr, alloc_layout);
+            #[cfg(not(all(unix, any(target_arch = "x86", target_arch = "x86_64"))))]
+            alloc::dealloc(self.ptr, alloc_layout);
         }
     }
 }
@@ -95,7 +99,16 @@ impl AllocBytes for MiriAllocBytes {
         let size = slice.len();
         let align = align.bytes();
         // SAFETY: `alloc_fn` will only be used with `size != 0`.
-        let alloc_fn = |layout| unsafe { MachineAlloc::alloc(layout) };
+        let alloc_fn = |layout| unsafe {
+            #[cfg(all(unix, any(target_arch = "x86", target_arch = "x86_64")))]
+            {
+                MachineAlloc::alloc(layout)
+            }
+            #[cfg(not(all(unix, any(target_arch = "x86", target_arch = "x86_64"))))]
+            {
+                alloc::alloc(layout)
+            }
+        };
         let alloc_bytes = MiriAllocBytes::alloc_with(size.to_u64(), align, alloc_fn)
             .unwrap_or_else(|()| {
                 panic!("Miri ran out of memory: cannot create allocation of {size} bytes")
@@ -114,7 +127,16 @@ impl AllocBytes for MiriAllocBytes {
         let size = size.bytes();
         let align = align.bytes();
         // SAFETY: `alloc_fn` will only be used with `size != 0`.
-        let alloc_fn = |layout| unsafe { MachineAlloc::alloc_zeroed(layout) };
+        let alloc_fn = |layout| unsafe {
+            #[cfg(all(unix, any(target_arch = "x86", target_arch = "x86_64")))]
+            {
+                MachineAlloc::alloc_zeroed(layout)
+            }
+            #[cfg(not(all(unix, any(target_arch = "x86", target_arch = "x86_64"))))]
+            {
+                alloc::alloc_zeroed(layout)
+            }
+        };
         MiriAllocBytes::alloc_with(size, align, alloc_fn).ok()
     }
 

src/lib.rs

@@ -76,6 +76,7 @@ mod borrow_tracker;
 mod clock;
 mod concurrency;
 mod diagnostics;
+#[cfg(all(unix, any(target_arch = "x86", target_arch = "x86_64")))]
 mod discrete_alloc;
 mod eval;
 mod helpers;

src/shims/native_lib.rs

@@ -196,6 +196,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
     }
 }
 
+#[cfg(all(unix, any(target_arch = "x86", target_arch = "x86_64")))]
 unsafe fn do_native_call<T: libffi::high::CType>(ptr: CodePtr, args: &[ffi::Arg<'_>]) -> T {
     use shims::trace::Supervisor;
 
@@ -211,6 +212,12 @@ unsafe fn do_native_call<T: libffi::high::CType>(ptr: CodePtr, args: &[ffi::Arg<
     ret
 }
 
+#[cfg(not(all(unix, any(target_arch = "x86", target_arch = "x86_64"))))]
+#[inline(always)]
+unsafe fn do_native_call<T: libffi::high::CType>(ptr: CodePtr, args: &[ffi::Arg<'_>]) -> T {
+    ffi::call(ptr, args)
+}
+
 #[derive(Debug, Clone)]
 /// Enum of supported arguments to external C functions.
 // We introduce this enum instead of just calling `ffi::arg` and storing a list