Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Fix i31-wrapped-as-externref in passive element segment (#13464)

Alex Crichton73b89a7f9315
diff --git a/crates/wasmtime/src/runtime/gc/enabled/anyref.rs b/crates/wasmtime/src/runtime/gc/enabled/anyref.rs
index 8a811d0aae..5e91e1ea8c 100644
--- a/crates/wasmtime/src/runtime/gc/enabled/anyref.rs
+++ b/crates/wasmtime/src/runtime/gc/enabled/anyref.rs
@@ -334,15 +334,7 @@ impl AnyRef {
}
pub(crate) fn _to_raw(&self, store: &mut AutoAssertNoGc<'_>) -> Result<u32> {
- let gc_ref = self.inner.try_clone_gc_ref(store)?;
- let raw = if gc_ref.is_i31() {
- gc_ref.as_raw_non_zero_u32()
- } else {
- store
- .require_gc_store_mut()?
- .expose_gc_ref_to_wasm(gc_ref)?
- };
- Ok(raw.get())
+ self.inner.expose_gc_ref_to_wasm(store).map(|r| r.get())
}
/// Get the type of this reference.
diff --git a/crates/wasmtime/src/runtime/gc/enabled/exnref.rs b/crates/wasmtime/src/runtime/gc/enabled/exnref.rs
index a66bec616f..5973308df9 100644
--- a/crates/wasmtime/src/runtime/gc/enabled/exnref.rs
+++ b/crates/wasmtime/src/runtime/gc/enabled/exnref.rs
@@ -416,15 +416,7 @@ impl ExnRef {
}
pub(crate) fn _to_raw(&self, store: &mut AutoAssertNoGc<'_>) -> Result<u32> {
- let gc_ref = self.inner.try_clone_gc_ref(store)?;
- let raw = if gc_ref.is_i31() {
- gc_ref.as_raw_non_zero_u32()
- } else {
- store
- .require_gc_store_mut()?
- .expose_gc_ref_to_wasm(gc_ref)?
- };
- Ok(raw.get())
+ self.inner.expose_gc_ref_to_wasm(store).map(|r| r.get())
}
/// Get the type of this reference.
diff --git a/crates/wasmtime/src/runtime/gc/enabled/externref.rs b/crates/wasmtime/src/runtime/gc/enabled/externref.rs
index c56378ede1..a4247fedb1 100644
--- a/crates/wasmtime/src/runtime/gc/enabled/externref.rs
+++ b/crates/wasmtime/src/runtime/gc/enabled/externref.rs
@@ -592,9 +592,7 @@ impl ExternRef {
}
pub(crate) fn _to_raw(&self, store: &mut AutoAssertNoGc) -> Result<u32> {
- let gc_ref = self.inner.try_clone_gc_ref(store)?;
- let raw = store.unwrap_gc_store_mut().expose_gc_ref_to_wasm(gc_ref)?;
- Ok(raw.get())
+ self.inner.expose_gc_ref_to_wasm(store).map(|r| r.get())
}
}
diff --git a/crates/wasmtime/src/runtime/gc/enabled/rooting.rs b/crates/wasmtime/src/runtime/gc/enabled/rooting.rs
index afaebbf681..848eebf3be 100644
--- a/crates/wasmtime/src/runtime/gc/enabled/rooting.rs
+++ b/crates/wasmtime/src/runtime/gc/enabled/rooting.rs
@@ -172,7 +172,7 @@ use alloc::sync::{Arc, Weak};
use core::any;
use core::marker;
use core::mem::{self, MaybeUninit};
-use core::num::{NonZeroU64, NonZeroUsize};
+use core::num::{NonZeroU32, NonZeroU64, NonZeroUsize};
use core::{
fmt::{self, Debug},
hash::{Hash, Hasher},
@@ -325,6 +325,26 @@ impl GcRootIndex {
let gc_ref = self.try_gc_ref(store)?.unchecked_copy();
Ok(store.clone_gc_ref(&gc_ref))
}
+
+ /// Exposes this value's raw `VMGcRef` to wasm as a `u32`.
+ pub(crate) fn expose_gc_ref_to_wasm(
+ &self,
+ store: &mut AutoAssertNoGc<'_>,
+ ) -> Result<NonZeroU32> {
+ let gc_ref = self.try_clone_gc_ref(store)?;
+
+ let raw = match store.optional_gc_store_mut() {
+ Some(s) => s.expose_gc_ref_to_wasm(gc_ref)?,
+ None => {
+ // NB: do not force the allocation of a GC heap just because the
+ // program is using `i31ref`s.
+ debug_assert!(gc_ref.is_i31());
+ gc_ref.as_raw_non_zero_u32()
+ }
+ };
+
+ Ok(raw)
+ }
}
/// This is a bit-packed version of
@@ -1210,18 +1230,7 @@ impl<T: GcRef> Rooted<T> {
ptr: &mut MaybeUninit<ValRaw>,
val_raw: impl Fn(u32) -> ValRaw,
) -> Result<()> {
- let gc_ref = self.inner.try_clone_gc_ref(store)?;
-
- let raw = match store.optional_gc_store_mut() {
- Some(s) => s.expose_gc_ref_to_wasm(gc_ref)?,
- None => {
- // NB: do not force the allocation of a GC heap just because the
- // program is using `i31ref`s.
- debug_assert!(gc_ref.is_i31());
- gc_ref.as_raw_non_zero_u32()
- }
- };
-
+ let raw = self.inner.expose_gc_ref_to_wasm(store)?;
ptr.write(val_raw(raw.get()));
Ok(())
}
@@ -1834,16 +1843,7 @@ where
ptr: &mut MaybeUninit<ValRaw>,
val_raw: impl Fn(u32) -> ValRaw,
) -> Result<()> {
- let gc_ref = self.try_clone_gc_ref(store)?;
-
- let raw = match store.optional_gc_store_mut() {
- Some(s) => s.expose_gc_ref_to_wasm(gc_ref)?,
- None => {
- debug_assert!(gc_ref.is_i31());
- gc_ref.as_raw_non_zero_u32()
- }
- };
-
+ let raw = self.inner.expose_gc_ref_to_wasm(store)?;
ptr.write(val_raw(raw.get()));
Ok(())
}
diff --git a/tests/misc_testsuite/gc/i31-as-externref-in-passive-element-segment.wast b/tests/misc_testsuite/gc/i31-as-externref-in-passive-element-segment.wast
new file mode 100644
index 0000000000..16cd3af9de
--- /dev/null
+++ b/tests/misc_testsuite/gc/i31-as-externref-in-passive-element-segment.wast
@@ -0,0 +1,6 @@
+;;! gc = true
+;;! bulk_memory = true
+
+(module
+ (elem externref (item (extern.convert_any (ref.i31 (i32.const 1)))))
+)