Fix GC tests under MIRI

fitzgen · Oct 31, 2024 · acd4bb2 · acd4bb2
1 parent edae0f1
commit acd4bb2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/crates/wasmtime/src/runtime/vm/gc/enabled/drc.rs b/crates/wasmtime/src/runtime/vm/gc/enabled/drc.rs
@@ -685,8 +685,8 @@ unsafe impl GcHeap for DrcHeap {
         activations_table.reset();
     }
 
-    fn heap_slice(&self) -> &[u8] {
-        let ptr = self.heap.as_ptr();
+    fn heap_slice(&self) -> &[UnsafeCell<u8>] {
+        let ptr = self.heap.as_ptr().cast();
         let len = self.heap.len();
         unsafe { core::slice::from_raw_parts(ptr, len) }
     }

diff --git a/crates/wasmtime/src/runtime/vm/gc/enabled/null.rs b/crates/wasmtime/src/runtime/vm/gc/enabled/null.rs
@@ -16,6 +16,7 @@ use crate::{
 use core::{
     alloc::Layout,
     any::Any,
+    cell::UnsafeCell,
     num::{NonZeroU32, NonZeroUsize},
 };
 use wasmtime_environ::{
@@ -199,8 +200,8 @@ unsafe impl GcHeap for NullHeap {
         self.no_gc_count -= 1;
     }
 
-    fn heap_slice(&self) -> &[u8] {
-        let ptr = self.heap.as_ptr();
+    fn heap_slice(&self) -> &[UnsafeCell<u8>] {
+        let ptr = self.heap.as_ptr().cast();
         let len = self.heap.len();
         unsafe { core::slice::from_raw_parts(ptr, len) }
     }

diff --git a/crates/wasmtime/src/runtime/vm/gc/gc_runtime.rs b/crates/wasmtime/src/runtime/vm/gc/gc_runtime.rs
@@ -5,7 +5,9 @@ use crate::runtime::vm::{
     ExternRefHostDataId, ExternRefHostDataTable, GcHeapObject, SendSyncPtr, TypedGcRef, VMArrayRef,
     VMExternRef, VMGcHeader, VMGcObjectDataMut, VMGcRef, VMStructRef,
 };
-use core::{alloc::Layout, any::Any, marker, mem, num::NonZeroUsize, ops::Range, ptr};
+use core::{
+    alloc::Layout, any::Any, cell::UnsafeCell, marker, mem, num::NonZeroUsize, ops::Range, ptr,
+};
 use wasmtime_environ::{GcArrayLayout, GcStructLayout, GcTypeLayouts, VMSharedTypeIndex};
 
 /// Trait for integrating a garbage collector with the runtime.
@@ -383,7 +385,7 @@ pub unsafe trait GcHeap: 'static + Send + Sync {
     /// The heap slice must be the GC heap region, and the region must remain
     /// valid (i.e. not moved or resized) for JIT code until `self` is dropped
     /// or `self.reset()` is called.
-    fn heap_slice(&self) -> &[u8];
+    fn heap_slice(&self) -> &[UnsafeCell<u8>];
 
     /// Get a mutable slice of the raw bytes of the GC heap.
     ///

diff --git a/crates/wasmtime/src/runtime/vm/instance.rs b/crates/wasmtime/src/runtime/vm/instance.rs
@@ -513,8 +513,8 @@ impl Instance {
 
     unsafe fn set_gc_heap(&mut self, gc_store: Option<&mut GcStore>) {
         if let Some(gc_store) = gc_store {
-            let heap = gc_store.gc_heap.heap_slice();
-            *self.gc_heap_base() = heap.as_ptr().cast_mut();
+            let heap = gc_store.gc_heap.heap_slice_mut();
+            *self.gc_heap_base() = heap.as_mut_ptr();
             *self.gc_heap_bound() = heap.len();
             *self.gc_heap_data() = gc_store.gc_heap.vmctx_gc_heap_data();
         } else {

diff --git a/tests/wast.rs b/tests/wast.rs
@@ -1,7 +1,6 @@
 use anyhow::{bail, Context};
 use bstr::ByteSlice;
 use libtest_mimic::{Arguments, FormatSetting, Trial};
-use rustix::path::Arg;
 use std::path::Path;
 use std::sync::{Condvar, LazyLock, Mutex};
 use wasmtime::{
@@ -43,7 +42,7 @@ fn add_tests(trials: &mut Vec<Trial>, path: &Path) {
         }
 
         let test_uses_gc_types = path.iter().any(|part| {
-            part.as_str().map_or(false, |s| {
+            part.to_str().map_or(false, |s| {
                 s.contains("gc")
                     || s.contains("function-references")
                     || s.contains("reference-types")