stack-switching: VMArray -> VMHostArray

posborne · posborne · commit 22bf039e801f · 2025-06-02T22:36:15.000Z
diff --git a/crates/wasmtime/src/runtime/vm/stack_switching.rs b/crates/wasmtime/src/runtime/vm/stack_switching.rs
@@ -215,7 +215,7 @@ impl VMStackLimits {
 #[derive(Debug, Clone)]
 /// Reference to a stack-allocated buffer ("array"), storing data of some type
 /// `T`.
-pub struct VMArray<T> {
+pub struct VMHostArray<T> {
     /// Number of currently occupied slots.
     pub length: u32,
     /// Number of slots in the data buffer. Note that this is *not* the size of
@@ -225,7 +225,7 @@ pub struct VMArray<T> {
     pub data: *mut T,
 }
 
-impl<T> VMArray<T> {
+impl<T> VMHostArray<T> {
     /// Creates empty `Array`
     pub fn empty() -> Self {
         Self {
@@ -252,32 +252,32 @@ fn check_vm_array_offsets() {
     let module = Module::new();
     let offsets = VMOffsets::new(HostPtr, &module);
     assert_eq!(
-        size_of::<VMArray<()>>(),
+        size_of::<VMHostArray<()>>(),
         usize::from(offsets.ptr.size_of_vmarray())
     );
     assert_eq!(
-        offset_of!(VMArray<()>, length),
+        offset_of!(VMHostArray<()>, length),
         usize::from(offsets.ptr.vmarray_length())
     );
     assert_eq!(
-        offset_of!(VMArray<()>, capacity),
+        offset_of!(VMHostArray<()>, capacity),
         usize::from(offsets.ptr.vmarray_capacity())
     );
     assert_eq!(
-        offset_of!(VMArray<()>, data),
+        offset_of!(VMHostArray<()>, data),
         usize::from(offsets.ptr.vmarray_data())
     );
 }
 
 /// Type used for passing payloads to and from continuations. The actual type
 /// argument should be wasmtime::runtime::vm::vmcontext::ValRaw, but we don't
 /// have access to that here.
-pub type VMPayloads = VMArray<u128>;
+pub type VMPayloads = VMHostArray<u128>;
 
 /// Type for a list of handlers, represented by the handled tag. Thus, the
 /// stored data is actually `*mut VMTagDefinition`, but we don't havr access to
 /// that here.
-pub type VMHandlerList = VMArray<*mut u8>;
+pub type VMHandlerList = VMHostArray<*mut u8>;
 
 /// The main type representing a continuation.
 #[repr(C)]
@@ -453,7 +453,7 @@ pub fn cont_new(
 
     // The initialization function will allocate the actual args/return value buffer and
     // update this object (if needed).
-    let contref_args_ptr = &mut contref.args as *mut _ as *mut VMArray<crate::ValRaw>;
+    let contref_args_ptr = &mut contref.args as *mut _ as *mut VMHostArray<crate::ValRaw>;
 
     contref.stack.initialize(
         func.cast::<crate::vm::VMFuncRef>(),
diff --git a/crates/wasmtime/src/runtime/vm/stack_switching/stack.rs b/crates/wasmtime/src/runtime/vm/stack_switching/stack.rs
@@ -6,7 +6,7 @@
 use anyhow::Result;
 use core::ops::Range;
 
-use crate::runtime::vm::stack_switching::VMArray;
+use crate::runtime::vm::stack_switching::VMHostArray;
 use crate::runtime::vm::{VMContext, VMFuncRef, ValRaw};
 
 cfg_if::cfg_if! {
@@ -104,7 +104,7 @@ impl VMContinuationStack {
         &self,
         func_ref: *const VMFuncRef,
         caller_vmctx: *mut VMContext,
-        args: *mut VMArray<ValRaw>,
+        args: *mut VMHostArray<ValRaw>,
         parameter_count: u32,
         return_value_count: u32,
     ) {
diff --git a/crates/wasmtime/src/runtime/vm/stack_switching/stack/dummy.rs b/crates/wasmtime/src/runtime/vm/stack_switching/stack/dummy.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use core::ops::Range;
 
-use crate::runtime::vm::stack_switching::VMArray;
+use crate::runtime::vm::stack_switching::VMHostArray;
 use crate::runtime::vm::{VMContext, VMFuncRef, ValRaw};
 
 #[allow(dead_code)]
@@ -67,7 +67,7 @@ impl VMContinuationStack {
         &self,
         _func_ref: *const VMFuncRef,
         _caller_vmctx: *mut VMContext,
-        _args: *mut VMArray<ValRaw>,
+        _args: *mut VMHostArray<ValRaw>,
         _parameter_count: u32,
         _return_value_count: u32,
     ) {
diff --git a/crates/wasmtime/src/runtime/vm/stack_switching/stack/unix.rs b/crates/wasmtime/src/runtime/vm/stack_switching/stack/unix.rs
@@ -65,7 +65,7 @@ use std::io;
 use std::ops::Range;
 use std::ptr;
 
-use crate::runtime::vm::stack_switching::VMArray;
+use crate::runtime::vm::stack_switching::VMHostArray;
 use crate::runtime::vm::{VMContext, VMFuncRef, VMOpaqueContext, ValRaw};
 
 #[derive(Debug, PartialEq, Eq)]
@@ -230,7 +230,7 @@ impl VMContinuationStack {
         &self,
         func_ref: *const VMFuncRef,
         caller_vmctx: *mut VMContext,
-        args: *mut VMArray<ValRaw>,
+        args: *mut VMHostArray<ValRaw>,
         parameter_count: u32,
         return_value_count: u32,
     ) {
@@ -270,7 +270,7 @@ impl VMContinuationStack {
                 // Data after the args buffer:
                 (0x28 + s, func_ref as usize),
                 (0x30 + s, caller_vmctx as usize),
-                (0x38 + s, args as *mut VMArray<ValRaw> as usize),
+                (0x38 + s, args as *mut VMHostArray<ValRaw> as usize),
                 (0x40 + s, return_value_count as usize),
             ];
 
@@ -306,7 +306,7 @@ unsafe extern "C" {
 unsafe extern "C" fn fiber_start(
     func_ref: *const VMFuncRef,
     caller_vmctx: *mut VMContext,
-    args: *mut VMArray<ValRaw>,
+    args: *mut VMHostArray<ValRaw>,
     return_value_count: u32,
 ) {
     unsafe {
