fix xcompile

Author: nia-e

src/alloc/alloc_bytes.rs

@@ -53,16 +53,10 @@ impl Drop for MiriAllocBytes {
         unsafe {
             match self.params {
                 MiriAllocParams::Global => alloc::dealloc(self.ptr, alloc_layout),
-                MiriAllocParams::Isolated(id) => {
-                    #[cfg(target_os = "linux")]
-                    {
-                        IsolatedAlloc::dealloc(self.ptr, alloc_layout, id)
-                    }
-                    #[cfg(not(target_os = "linux"))]
-                    {
-                        unreachable!()
-                    }
-                }
+                #[cfg(target_os = "linux")]
+                MiriAllocParams::Isolated(id) => IsolatedAlloc::dealloc(self.ptr, alloc_layout, id),
+                #[cfg(not(target_os = "linux"))]
+                MiriAllocParams::Isolated(_) => unreachable!(),
             }
         }
     }
@@ -127,16 +121,10 @@ impl AllocBytes for MiriAllocBytes {
         let alloc_fn = |layout| unsafe {
             match params {
                 MiriAllocParams::Global => alloc::alloc(layout),
-                MiriAllocParams::Isolated(id) => {
-                    #[cfg(target_os = "linux")]
-                    {
-                        IsolatedAlloc::alloc(layout, id)
-                    }
-                    #[cfg(not(target_os = "linux"))]
-                    {
-                        unreachable!()
-                    }
-                }
+                #[cfg(target_os = "linux")]
+                MiriAllocParams::Isolated(id) => IsolatedAlloc::alloc(layout, id),
+                #[cfg(not(target_os = "linux"))]
+                MiriAllocParams::Isolated(_) => unreachable!(),
             }
         };
         let alloc_bytes = MiriAllocBytes::alloc_with(size.to_u64(), align, params, alloc_fn)
@@ -156,16 +144,10 @@ impl AllocBytes for MiriAllocBytes {
         let alloc_fn = |layout| unsafe {
             match params {
                 MiriAllocParams::Global => alloc::alloc_zeroed(layout),
-                MiriAllocParams::Isolated(id) => {
-                    #[cfg(target_os = "linux")]
-                    {
-                        IsolatedAlloc::alloc_zeroed(layout, id)
-                    }
-                    #[cfg(not(target_os = "linux"))]
-                    {
-                        unreachable!()
-                    }
-                }
+                #[cfg(target_os = "linux")]
+                MiriAllocParams::Isolated(id) => IsolatedAlloc::alloc_zeroed(layout, id),
+                #[cfg(not(target_os = "linux"))]
+                MiriAllocParams::Isolated(_) => unreachable!(),
             }
         };
         MiriAllocBytes::alloc_with(size, align, params, alloc_fn).ok()

src/machine.rs

@@ -534,6 +534,7 @@ pub struct MiriMachine<'tcx> {
 
     /// The seed for the RNG, also used as a unique identifier for the machine.
     /// If multiple machines exist, this must be different for each.
+    #[cfg(target_os = "linux")]
     pub(crate) seed: u64,
 
     /// The allocation IDs to report when they are being allocated
@@ -720,6 +721,7 @@ impl<'tcx> MiriMachine<'tcx> {
             local_crates,
             extern_statics: FxHashMap::default(),
             rng: RefCell::new(rng),
+            #[cfg(target_os = "linux")]
             seed,
             tracked_alloc_ids: config.tracked_alloc_ids.clone(),
             track_alloc_accesses: config.track_alloc_accesses,
@@ -923,6 +925,7 @@ impl VisitProvenance for MiriMachine<'_> {
             backtrace_style: _,
             local_crates: _,
             rng: _,
+            #[cfg(target_os = "linux")]
             seed: _,
             tracked_alloc_ids: _,
             track_alloc_accesses: _,