Skip to content

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

Represent globals as a proper `union`, fix provenance (#14782)

Alex Crichtonce2794bbf28c
diff --git a/crates/cranelift/src/alias_region.rs b/crates/cranelift/src/alias_region.rs
index 456da99c6c..2637c18784 100644
--- a/crates/cranelift/src/alias_region.rs
+++ b/crates/cranelift/src/alias_region.rs
@@ -42,17 +42,12 @@ enum VmType {
VMStoreContext,
VMMemoryDefinition,
VMTableDefinition,
- // NB: these two are currently only referenced by macro-generated
+ // NB: this is currently only referenced by macro-generated
// `AliasRegions` helpers that are not all wired up to call sites yet.
#[allow(
dead_code,
reason = "generated uniformly for all VM types via `for_each_vm_type!`"
)]
- VMGlobalDefinition,
- #[allow(
- dead_code,
- reason = "generated uniformly for all VM types via `for_each_vm_type!`"
- )]
VMTagDefinition,
VMComponentContext,
VMDrcHeapData,
@@ -508,10 +503,8 @@ impl<'a, Offsets> Field<'a, Offsets> {
/// Cast this field to the given type.
///
- /// This can be used, for example, to cast a `Field` that points to a
- /// `VMGlobalDefinition`'s storage (a `[u8; 16]` represented as
- /// `ir::types::I8X16`) to the global's actual Wasm type's representation
- /// (`ir::types::I32` for a Wasm `i32`).
+ /// This can be used, for example, to load a field as a narrower or
+ /// differently-typed value than its declared Cranelift type.
pub fn cast(mut self, ty: ir::Type) -> Self {
self.ty = ty;
self
@@ -653,7 +646,6 @@ macro_rules! define_vm_type_alias_region_helpers {
// `VMLazyThread` is a pointer-sized bitpacked integer; see its definition in
// `for_each_vm_type!`.
(@field_ty $pt:expr, VMLazyThread) => { $pt };
- (@field_ty $pt:expr, [u8; 16]) => { ir::types::I8X16 };
(@field_ty $pt:expr, VMSharedTypeIndex) => { ir::types::I32 };
(@field_ty $pt:expr, DefinedTableIndex) => { ir::types::I32 };
(@field_ty $pt:expr, DefinedMemoryIndex) => { ir::types::I32 };
diff --git a/crates/environ/src/vmctxtypes.rs b/crates/environ/src/vmctxtypes.rs
index f3116e8eed..8da8df63a4 100644
--- a/crates/environ/src/vmctxtypes.rs
+++ b/crates/environ/src/vmctxtypes.rs
@@ -383,6 +383,11 @@ macro_rules! vmctx_field_size {
(($p:expr) VMLowering) => {
2u32 * u32::from($p)
};
+ // `VMGlobalDefinition` is a union of the representations of every type a
+ // global can have, the largest being `v128`.
+ (($p:expr) VMGlobalDefinition) => {
+ 16u32
+ };
// Anything else names one of the `VM*` types, and so has an
// `offsets::VMFoo` generated for it by `for_each_vm_type!`. Deferring to
// that keeps this macro from having to mirror the list of `VM*` types, and
diff --git a/crates/environ/src/vmoffsets.rs b/crates/environ/src/vmoffsets.rs
index dd8c6e9837..67c0065d32 100644
--- a/crates/environ/src/vmoffsets.rs
+++ b/crates/environ/src/vmoffsets.rs
@@ -55,7 +55,6 @@ macro_rules! define_vm_type_offsets {
// back down into four bytes.
(@size ($p:expr) NonZeroU32) => { 4u32 };
(@size ($p:expr) Option < VMGcRef >) => { 4u32 };
- (@size ($p:expr) [u8; 16]) => { 16u32 };
(@size ($p:expr) [u32; $n:expr]) => { 4u32 * u32::try_from($n).unwrap() };
(@size ($p:expr) VMSharedTypeIndex) => { u32::from(($p).size_of_vmshared_type_index()) };
(@size ($p:expr) DefinedTableIndex) => { 4u32 };
@@ -107,7 +106,6 @@ macro_rules! define_vm_type_offsets {
(@align ($p:expr) u32) => { 4u32 };
(@align ($p:expr) NonZeroU32) => { 4u32 };
(@align ($p:expr) Option < VMGcRef >) => { 4u32 };
- (@align ($p:expr) [u8; 16]) => { 16u32 };
(@align ($p:expr) [u32; $n:expr]) => { 4u32 };
(@align ($p:expr) VMSharedTypeIndex) => { u32::from(($p).align_of_vmshared_type_index()) };
(@align ($p:expr) DefinedTableIndex) => { 4u32 };
@@ -537,7 +535,7 @@ pub trait PtrSize {
/// This is the size of the largest value type (i.e. a V128).
#[inline]
fn maximum_value_size(&self) -> u8 {
- self.vm_global_definition().size()
+ 16
}
/// Return the size of `*mut VMMemoryDefinition`.
diff --git a/crates/environ/src/vmtypes.rs b/crates/environ/src/vmtypes.rs
index fbd9d31b01..834517f198 100644
--- a/crates/environ/src/vmtypes.rs
+++ b/crates/environ/src/vmtypes.rs
@@ -89,18 +89,6 @@ macro_rules! for_each_vm_type {
pub current_elements: usize,
}
- /// The storage for a WebAssembly global defined within the instance.
- ///
- /// TODO: Pack the globals more densely, rather than using the same size
- /// for every type.
- #[derive(Debug)]
- #[repr(C, align(16))]
- #[snake_name = vm_global_definition]
- pub struct VMGlobalDefinition {
- /// The raw storage for a global's value.
- storage: [u8; 16],
- }
-
/// A WebAssembly tag defined within the instance.
#[derive(Debug)]
#[repr(C)]
diff --git a/crates/wasmtime/src/runtime/externals/global.rs b/crates/wasmtime/src/runtime/externals/global.rs
index f3bb40ffd7..59ad8be326 100644
--- a/crates/wasmtime/src/runtime/externals/global.rs
+++ b/crates/wasmtime/src/runtime/externals/global.rs
@@ -6,7 +6,6 @@ use crate::{
store::{AutoAssertNoGc, InstanceId, StoreId, StoreInstanceId, StoreOpaque},
trampoline::generate_global_export,
};
-use core::ptr;
use core::ptr::NonNull;
use wasmtime_environ::DefinedGlobalIndex;
@@ -154,16 +153,18 @@ impl Global {
unsafe {
let definition = self.definition(store).as_ref();
match self._ty(&store).content() {
- ValType::I32 => Val::from(*definition.as_i32()),
- ValType::I64 => Val::from(*definition.as_i64()),
- ValType::F32 => Val::F32(*definition.as_u32()),
- ValType::F64 => Val::F64(*definition.as_u64()),
+ ValType::I32 => Val::from(definition.get_i32()),
+ ValType::I64 => Val::from(definition.get_i64()),
+ ValType::F32 => Val::F32(definition.get_f32_bits()),
+ ValType::F64 => Val::F64(definition.get_f64_bits()),
ValType::V128 => Val::V128(definition.get_u128().into()),
ValType::Ref(ref_ty) => {
let reference: Ref = match ref_ty.heap_type() {
- HeapType::Func | HeapType::ConcreteFunc(_) => {
- Func::_from_raw(store, definition.as_func_ref().cast()).into()
- }
+ HeapType::Func | HeapType::ConcreteFunc(_) => Ref::Func(
+ definition
+ .get_func_ref()
+ .map(|f| Func::from_vm_func_ref(store.id(), f)),
+ ),
HeapType::NoFunc => Ref::Func(None),
@@ -258,14 +259,13 @@ impl Global {
unsafe {
let definition = self.definition(&store).as_mut();
match val {
- Val::I32(i) => *definition.as_i32_mut() = *i,
- Val::I64(i) => *definition.as_i64_mut() = *i,
- Val::F32(f) => *definition.as_u32_mut() = *f,
- Val::F64(f) => *definition.as_u64_mut() = *f,
+ Val::I32(i) => definition.set_i32(*i),
+ Val::I64(i) => definition.set_i64(*i),
+ Val::F32(f) => definition.set_f32_bits(*f),
+ Val::F64(f) => definition.set_f64_bits(*f),
Val::V128(i) => definition.set_u128((*i).into()),
Val::FuncRef(f) => {
- *definition.as_func_ref_mut() =
- f.map_or(ptr::null_mut(), |f| f.vm_func_ref(&store).as_ptr().cast());
+ definition.set_func_ref(f.map(|f| f.vm_func_ref(&store)));
}
Val::ExternRef(e) => {
let new = match e {
diff --git a/crates/wasmtime/src/runtime/trampoline/global.rs b/crates/wasmtime/src/runtime/trampoline/global.rs
index b1ac7376c6..c416cd232d 100644
--- a/crates/wasmtime/src/runtime/trampoline/global.rs
+++ b/crates/wasmtime/src/runtime/trampoline/global.rs
@@ -2,7 +2,6 @@ use crate::runtime::vm::{StoreBox, VMGlobalDefinition};
use crate::store::{AutoAssertNoGc, StoreOpaque};
use crate::type_registry::RegisteredType;
use crate::{GlobalType, Mutability, Result, Val};
-use core::ptr;
use wasmtime_environ::Global;
#[repr(C)]
@@ -37,14 +36,13 @@ pub fn generate_global_export(
unsafe {
let global = &mut ctx.get().as_mut().global;
match val {
- Val::I32(x) => *global.as_i32_mut() = x,
- Val::I64(x) => *global.as_i64_mut() = x,
- Val::F32(x) => *global.as_f32_bits_mut() = x,
- Val::F64(x) => *global.as_f64_bits_mut() = x,
+ Val::I32(x) => global.set_i32(x),
+ Val::I64(x) => global.set_i64(x),
+ Val::F32(x) => global.set_f32_bits(x),
+ Val::F64(x) => global.set_f64_bits(x),
Val::V128(x) => global.set_u128(x.into()),
Val::FuncRef(f) => {
- *global.as_func_ref_mut() =
- f.map_or(ptr::null_mut(), |f| f.vm_func_ref(&store).as_ptr());
+ global.set_func_ref(f.map(|f| f.vm_func_ref(&store)));
}
Val::ExternRef(x) => {
let new = match x {
diff --git a/crates/wasmtime/src/runtime/vm/component.rs b/crates/wasmtime/src/runtime/vm/component.rs
index 040ac44657..17ea90f0ce 100644
--- a/crates/wasmtime/src/runtime/vm/component.rs
+++ b/crates/wasmtime/src/runtime/vm/component.rs
@@ -708,7 +708,7 @@ impl ComponentInstance {
// SAFETY: this is a valid initialization of all globals which are
// 32-bit values. The `may_leave` flag starts out `true`.
unsafe {
- *def.as_i32_mut() = 1;
+ def.set_i32(1);
self.instance_flags(i).as_raw().write(def);
}
}
@@ -1050,13 +1050,13 @@ impl InstanceFlags {
#[inline]
pub unsafe fn may_leave(&self) -> bool {
- unsafe { *self.as_raw().as_ref().as_i32() != 0 }
+ unsafe { self.as_raw().as_ref().get_i32() != 0 }
}
#[inline]
pub unsafe fn set_may_leave(&mut self, val: bool) {
unsafe {
- *self.as_raw().as_mut().as_i32_mut() = val as i32;
+ self.as_raw().as_mut().set_i32(val as i32);
}
}
diff --git a/crates/wasmtime/src/runtime/vm/instance.rs b/crates/wasmtime/src/runtime/vm/instance.rs
index ecc3abd5cc..7ecfa1eaf0 100644
--- a/crates/wasmtime/src/runtime/vm/instance.rs
+++ b/crates/wasmtime/src/runtime/vm/instance.rs
@@ -1325,10 +1325,10 @@ impl Instance {
for (index, val) in module.global_initializers.iter() {
let mut def = VMGlobalDefinition::new();
match val {
- GlobalConstValue::I32(i) => *def.as_i32_mut() = *i,
- GlobalConstValue::I64(i) => *def.as_i64_mut() = *i,
- GlobalConstValue::F32(i) => *def.as_f32_bits_mut() = *i,
- GlobalConstValue::F64(i) => *def.as_f64_bits_mut() = *i,
+ GlobalConstValue::I32(i) => def.set_i32(*i),
+ GlobalConstValue::I64(i) => def.set_i64(*i),
+ GlobalConstValue::F32(i) => def.set_f32_bits(*i),
+ GlobalConstValue::F64(i) => def.set_f64_bits(*i),
GlobalConstValue::V128(i) => def.set_u128(*i),
}
instance.global_ptr(*index).write(def);
diff --git a/crates/wasmtime/src/runtime/vm/vmcontext.rs b/crates/wasmtime/src/runtime/vm/vmcontext.rs
index f604f794bd..00f80fe232 100644
--- a/crates/wasmtime/src/runtime/vm/vmcontext.rs
+++ b/crates/wasmtime/src/runtime/vm/vmcontext.rs
@@ -12,7 +12,7 @@ use core::cell::UnsafeCell;
use core::ffi::c_void;
use core::fmt;
use core::marker::{self, PhantomPinned};
-use core::mem::{self, MaybeUninit};
+use core::mem::{self, ManuallyDrop, MaybeUninit};
#[cfg(feature = "gc-null")]
use core::num::NonZeroU32;
use core::ops::Range;
@@ -331,18 +331,30 @@ impl VMMemoryDefinition {
// `VmSafe` fields.
unsafe impl VmSafe for VMTableDefinition {}
-// SAFETY: `VMGlobalDefinition` is generated with `#[repr(C)]` and only contains
-// `VmSafe` fields.
+// SAFETY: `VMGlobalDefinition` is `#[repr(C)]` and only contains `VmSafe`
+// fields.
unsafe impl VmSafe for VMGlobalDefinition {}
#[cfg(test)]
mod test_vmglobal_definition {
use super::VMGlobalDefinition;
use std::mem::{align_of, size_of};
- use wasmtime_environ::{HostPtr, Module, StaticModuleIndex, VMOffsets};
+ use wasmtime_environ::{HostPtr, Module, PtrSize, StaticModuleIndex, VMOffsets};
+
+ #[test]
+ fn check_vmglobal_definition_size() {
+ // The compiler lays out globals using this size; see
+ // `vmctx_field_size!` in `wasmtime-environ`.
+ assert_eq!(size_of::<VMGlobalDefinition>(), 16);
+ assert_eq!(
+ size_of::<VMGlobalDefinition>(),
+ usize::from(HostPtr.maximum_value_size())
+ );
+ }
#[test]
fn check_vmglobal_definition_alignment() {
+ assert_eq!(align_of::<VMGlobalDefinition>(), 16);
assert!(align_of::<VMGlobalDefinition>() >= align_of::<i32>());
assert!(align_of::<VMGlobalDefinition>() >= align_of::<i64>());
assert!(align_of::<VMGlobalDefinition>() >= align_of::<f32>());
@@ -366,171 +378,192 @@ mod test_vmglobal_definition {
}
}
+/// The storage for a WebAssembly global defined within the instance.
+///
+/// Compiled code reads and writes this storage directly, as the field that
+/// matches the global's type. Scalars are stored in native-endian order, except
+/// `v128`, which is little-endian.
+///
+/// TODO: Pack the globals more densely, rather than using the same size for
+/// every type.
+#[repr(C, align(16))]
+pub union VMGlobalDefinition {
+ // These values are all stored in native-endian
+ i32: i32,
+ i64: i64,
+ f32: u32,
+ f64: u64,
+ gc_ref: ManuallyDrop<Option<VMGcRef>>,
+ func_ref: Option<VmPtr<VMFuncRef>>,
+ // This is stored in little-endian
+ v128: [u8; 16],
+}
+
impl VMGlobalDefinition {
/// Construct a `VMGlobalDefinition`.
pub fn new() -> Self {
- Self { storage: [0; 16] }
+ Self { v128: [0; 16] }
}
- /// Return a reference to the value as an i32.
- pub unsafe fn as_i32(&self) -> &i32 {
- unsafe { &*(self.storage.as_ref().as_ptr().cast::<i32>()) }
- }
-
- /// Return a mutable reference to the value as an i32.
- pub unsafe fn as_i32_mut(&mut self) -> &mut i32 {
- unsafe { &mut *(self.storage.as_mut().as_mut_ptr().cast::<i32>()) }
- }
-
- /// Return a reference to the value as a u32.
- pub unsafe fn as_u32(&self) -> &u32 {
- unsafe { &*(self.storage.as_ref().as_ptr().cast::<u32>()) }
- }
-
- /// Return a mutable reference to the value as an u32.
- pub unsafe fn as_u32_mut(&mut self) -> &mut u32 {
- unsafe { &mut *(self.storage.as_mut().as_mut_ptr().cast::<u32>()) }
- }
-
- /// Return a reference to the value as an i64.
- pub unsafe fn as_i64(&self) -> &i64 {
- unsafe { &*(self.storage.as_ref().as_ptr().cast::<i64>()) }
- }
-
- /// Return a mutable reference to the value as an i64.
- pub unsafe fn as_i64_mut(&mut self) -> &mut i64 {
- unsafe { &mut *(self.storage.as_mut().as_mut_ptr().cast::<i64>()) }
- }
-
- /// Return a reference to the value as an u64.
- pub unsafe fn as_u64(&self) -> &u64 {
- unsafe { &*(self.storage.as_ref().as_ptr().cast::<u64>()) }
- }
-
- /// Return a mutable reference to the value as an u64.
- pub unsafe fn as_u64_mut(&mut self) -> &mut u64 {
- unsafe { &mut *(self.storage.as_mut().as_mut_ptr().cast::<u64>()) }
- }
-
- /// Return a reference to the value as an f32.
- pub unsafe fn as_f32(&self) -> &f32 {
- unsafe { &*(self.storage.as_ref().as_ptr().cast::<f32>()) }
+ /// Returns the value of this `i32` global.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is `i32`.
+ pub unsafe fn get_i32(&self) -> i32 {
+ unsafe { self.i32 }
}
- /// Return a mutable reference to the value as an f32.
- pub unsafe fn as_f32_mut(&mut self) -> &mut f32 {
- unsafe { &mut *(self.storage.as_mut().as_mut_ptr().cast::<f32>()) }
+ /// Sets the value of this `i32` global.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is `i32`.
+ pub unsafe fn set_i32(&mut self, val: i32) {
+ self.i32 = val;
}
- /// Return a reference to the value as f32 bits.
- pub unsafe fn as_f32_bits(&self) -> &u32 {
- unsafe { &*(self.storage.as_ref().as_ptr().cast::<u32>()) }
+ /// Returns the value of this `i64` global.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is `i64`.
+ pub unsafe fn get_i64(&self) -> i64 {
+ unsafe { self.i64 }
}
- /// Return a mutable reference to the value as f32 bits.
- pub unsafe fn as_f32_bits_mut(&mut self) -> &mut u32 {
- unsafe { &mut *(self.storage.as_mut().as_mut_ptr().cast::<u32>()) }
+ /// Sets the value of this `i64` global.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is `i64`.
+ pub unsafe fn set_i64(&mut self, val: i64) {
+ self.i64 = val;
}
- /// Return a reference to the value as an f64.
- pub unsafe fn as_f64(&self) -> &f64 {
- unsafe { &*(self.storage.as_ref().as_ptr().cast::<f64>()) }
+ /// Returns the bits of this `f32` global.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is `f32`.
+ pub unsafe fn get_f32_bits(&self) -> u32 {
+ unsafe { self.f32 }
}
- /// Return a mutable reference to the value as an f64.
- pub unsafe fn as_f64_mut(&mut self) -> &mut f64 {
- unsafe { &mut *(self.storage.as_mut().as_mut_ptr().cast::<f64>()) }
+ /// Sets the bits of this `f32` global.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is `f32`.
+ pub unsafe fn set_f32_bits(&mut self, bits: u32) {
+ self.f32 = bits;
}
- /// Return a reference to the value as f64 bits.
- pub unsafe fn as_f64_bits(&self) -> &u64 {
- unsafe { &*(self.storage.as_ref().as_ptr().cast::<u64>()) }
+ /// Returns the bits of this `f64` global.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is `f64`.
+ pub unsafe fn get_f64_bits(&self) -> u64 {
+ unsafe { self.f64 }
}
- /// Return a mutable reference to the value as f64 bits.
- pub unsafe fn as_f64_bits_mut(&mut self) -> &mut u64 {
- unsafe { &mut *(self.storage.as_mut().as_mut_ptr().cast::<u64>()) }
+ /// Sets the bits of this `f64` global.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is `f64`.
+ pub unsafe fn set_f64_bits(&mut self, bits: u64) {
+ self.f64 = bits;
}
- /// Gets the underlying 128-bit vector value.
- //
- // Note that vectors are stored in little-endian format while other types
- // are stored in native-endian format.
+ /// Returns the value of this `v128` global.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is `v128`.
pub unsafe fn get_u128(&self) -> u128 {
- unsafe { u128::from_le(*(self.storage.as_ref().as_ptr().cast::<u128>())) }
+ u128::from_le_bytes(unsafe { self.v128 })
}
- /// Sets the 128-bit vector values.
- //
- // Note that vectors are stored in little-endian format while other types
- // are stored in native-endian format.
+ /// Sets the value of this `v128` global.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is `v128`.
pub unsafe fn set_u128(&mut self, val: u128) {
- unsafe {
- *self.storage.as_mut().as_mut_ptr().cast::<u128>() = val.to_le();
- }
- }
-
- /// Return a reference to the value as u128 bits.
- pub unsafe fn as_u128_bits(&self) -> &[u8; 16] {
- unsafe { &*(self.storage.as_ref().as_ptr().cast::<[u8; 16]>()) }
+ self.v128 = val.to_le_bytes();
}
- /// Return a mutable reference to the value as u128 bits.
- pub unsafe fn as_u128_bits_mut(&mut self) -> &mut [u8; 16] {
- unsafe { &mut *(self.storage.as_mut().as_mut_ptr().cast::<[u8; 16]>()) }
- }
-
- /// Return a reference to the global value as a borrowed GC reference.
+ /// Returns the value of this GC reference global.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is a GC reference,
+ /// for example `extrenref`, `anyref`, `exnref`, etc.
pub unsafe fn as_gc_ref(&self) -> Option<&VMGcRef> {
- let raw_ptr = self.storage.as_ref().as_ptr().cast::<Option<VMGcRef>>();
- let ret = unsafe { (*raw_ptr).as_ref() };
+ let ret = unsafe { (*self.gc_ref).as_ref() };
assert!(cfg!(feature = "gc") || ret.is_none());
ret
}
- /// Return a reference to the global value as a borrowed GC reference.
+ /// Returns the value of this GC reference global, mutably.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is a GC reference,
+ /// for example `extrenref`, `anyref`, `exnref`, etc.
pub unsafe fn as_gc_ref_mut(&mut self) -> Option<&mut VMGcRef> {
- let raw_ptr = self.storage.as_mut().as_mut_ptr().cast::<Option<VMGcRef>>();
- let ret = unsafe { (*raw_ptr).as_mut() };
+ let ret = unsafe { (*self.gc_ref).as_mut() };
assert!(cfg!(feature = "gc") || ret.is_none());
ret
}
- /// Initialize a global to the given GC reference.
+ /// Initialize this GC reference global to the given GC reference.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is a GC reference,
+ /// for example `extrenref`, `anyref`, `exnref`, etc.
pub unsafe fn init_gc_ref(
&mut self,
store: &mut StoreOpaque,
gc_ref: Option<&VMGcRef>,
) -> Result<()> {
- let dest = unsafe {
- &mut *(self
- .storage
- .as_mut()
- .as_mut_ptr()
- .cast::<MaybeUninit<Option<VMGcRef>>>())
- };
-
+ // SAFETY: `MaybeUninit<T>` has the same layout as `T`, and this global
+ // is uninitialized, so it must not be read as a `VMGcRef`.
+ let dest = unsafe { &mut *(&raw mut self.gc_ref).cast::<MaybeUninit<Option<VMGcRef>>>() };
store.init_gc_ref(dest, gc_ref)
}
- /// Write a GC reference into this global value.
+ /// Write a GC reference into this GC reference global.
pub unsafe fn write_gc_ref(
&mut self,
store: &mut StoreOpaque,
gc_ref: Option<&VMGcRef>,
) -> Result<()> {
- let dest = unsafe { &mut *(self.storage.as_mut().as_mut_ptr().cast::<Option<VMGcRef>>()) };
+ let dest = unsafe { &mut *self.gc_ref };
store.write_gc_ref(dest, gc_ref)
}
- /// Return a reference to the value as a `VMFuncRef`.
- pub unsafe fn as_func_ref(&self) -> *mut VMFuncRef {
- unsafe { *(self.storage.as_ref().as_ptr().cast::<*mut VMFuncRef>()) }
+ /// Returns the value of this funcref global.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is a `funcref` or
+ /// a concrete function type.
+ pub unsafe fn get_func_ref(&self) -> Option<NonNull<VMFuncRef>> {
+ unsafe { self.func_ref.map(|p| p.as_non_null()) }
}
- /// Return a mutable reference to the value as a `VMFuncRef`.
- pub unsafe fn as_func_ref_mut(&mut self) -> &mut *mut VMFuncRef {
- unsafe { &mut *(self.storage.as_mut().as_mut_ptr().cast::<*mut VMFuncRef>()) }
+ /// Sets the value of this funcref global.
+ ///
+ /// # Safety
+ ///
+ /// This function requires that the type of this global is a `funcref` or
+ /// a concrete function type.
+ pub unsafe fn set_func_ref(&mut self, func_ref: Option<NonNull<VMFuncRef>>) {
+ self.func_ref = func_ref.map(VmPtr::from);
}
}
diff --git a/tests/all/pulley.rs b/tests/all/pulley.rs
index d4cd458f91..01f7cde4e7 100644
--- a/tests/all/pulley.rs
+++ b/tests/all/pulley.rs
@@ -146,7 +146,7 @@ fn pulley_provenance_test() -> Result<()> {
.unwrap()
.unwrap();
assert_eq!(caller_func.as_u32(), 3);
- assert_eq!(pc.raw(), 418);
+ assert_eq!(pc.raw(), 465);
let parent_frame = caller_frame.parent(&mut caller).unwrap();
assert!(parent_frame.is_none());
@@ -217,6 +217,17 @@ fn pulley_provenance_test() -> Result<()> {
.get_typed_func::<(), ()>(&mut store, "ref-func-myself")?
.call(&mut store, ())?;
+ // Read a funcref global that was written by wasm, both by its initializer
+ // and by `global.set`.
+ let global = instance.get_global(&mut store, "funcref-global").unwrap();
+ for _ in 0..2 {
+ let func = global.get(&mut store).unwrap_funcref().copied().unwrap();
+ func.typed::<(), ()>(&store)?.call(&mut store, ())?;
+ instance
+ .get_typed_func::<(), ()>(&mut store, "set-funcref-global")?
+ .call(&mut store, ())?;
+ }
+
Ok(())
}
diff --git a/tests/all/pulley_provenance_test.wat b/tests/all/pulley_provenance_test.wat
index 4aecdb4cea..44c086980a 100644
--- a/tests/all/pulley_provenance_test.wat
+++ b/tests/all/pulley_provenance_test.wat
@@ -94,4 +94,9 @@
(func $me (export "ref-func-myself")
(drop (ref.func $me))
)
+
+ (global $funcref-global (export "funcref-global") (mut funcref) (ref.func $empty))
+ (func (export "set-funcref-global")
+ (global.set $funcref-global (ref.func $me))
+ )
)
diff --git a/tests/disas/alias-region-globals.wat b/tests/disas/alias-region-globals.wat
index 93d45af832..b0aa7b1a54 100644
--- a/tests/disas/alias-region-globals.wat
+++ b/tests/disas/alias-region-globals.wat
@@ -17,7 +17,7 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 44 ""
+;; region2 = 57 ""
;; region3 = 87 ""
;; region4 = 250 ""
;; gv0 = vmctx
diff --git a/tests/disas/alias-region-memories.wat b/tests/disas/alias-region-memories.wat
index f46feed529..02f99d9ec9 100644
--- a/tests/disas/alias-region-memories.wat
+++ b/tests/disas/alias-region-memories.wat
@@ -17,7 +17,7 @@
;; function u0:0(i64 vmctx, i64, i32, i32) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 13 ""
+;; region2 = 75 ""
;; region3 = 215 ""
;; region4 = 105 ""
;; region5 = 61 ""
diff --git a/tests/disas/alias-region-tables.wat b/tests/disas/alias-region-tables.wat
index 2dd3daa897..3ac5f5239a 100644
--- a/tests/disas/alias-region-tables.wat
+++ b/tests/disas/alias-region-tables.wat
@@ -18,16 +18,15 @@
;; function u0:0(i64 vmctx, i64, i32, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 21 ""
+;; region2 = 13 ""
;; region3 = 93 ""
;; region4 = 211 ""
;; region5 = 99 ""
;; region6 = 117 ""
;; region7 = 130 ""
-;; region8 = 6 ""
-;; region9 = 106 ""
-;; region10 = 116 ""
-;; region11 = 60 ""
+;; region8 = 134 ""
+;; region9 = 120 ""
+;; region10 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -68,13 +67,13 @@
;; @004d jump block3(v48)
;;
;; block3(v45: i64):
-;; @004d v51 = load.i32 user7 aligned readonly region9 v45+16
+;; @004d v51 = load.i32 user7 aligned readonly region1 v45+16
;; @004d v49 = load.i64 notrap aligned readonly can_move region7 v0+40
;; @004d v50 = load.i32 notrap aligned readonly can_move region8 v49
;; @004d v52 = icmp eq v51, v50
;; @004d trapz v52, user8
-;; @004d v54 = load.i64 notrap aligned readonly region10 v45+8
-;; @004d v55 = load.i64 notrap aligned readonly region11 v45+24
+;; @004d v54 = load.i64 notrap aligned readonly region9 v45+8
+;; @004d v55 = load.i64 notrap aligned readonly region10 v45+24
;; @004d v56 = call_indirect sig0, v54(v55, v0)
;; @0050 jump block1
;;
diff --git a/tests/disas/array-call-trampoline.wat b/tests/disas/array-call-trampoline.wat
index 5fa0587b0a..639b6eebbe 100644
--- a/tests/disas/array-call-trampoline.wat
+++ b/tests/disas/array-call-trampoline.wat
@@ -9,7 +9,7 @@
)
)
;; function u268435456:0(i64 vmctx, i64, i64, i64) -> i8 system_v {
-;; region0 = 21 ""
+;; region0 = 17 ""
;; region1 = 123 ""
;; region2 = 231 ""
;; region3 = 243 ""
diff --git a/tests/disas/block-params-br_if-single-pred.wat b/tests/disas/block-params-br_if-single-pred.wat
index 690506b993..6fa77fa6f0 100644
--- a/tests/disas/block-params-br_if-single-pred.wat
+++ b/tests/disas/block-params-br_if-single-pred.wat
@@ -23,8 +23,8 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 68 ""
+;; region2 = 42 ""
+;; region3 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/block-params-if-else-same-values.wat b/tests/disas/block-params-if-else-same-values.wat
index 8699bf357c..5b10029b5b 100644
--- a/tests/disas/block-params-if-else-same-values.wat
+++ b/tests/disas/block-params-if-else-same-values.wat
@@ -23,8 +23,8 @@
;; function u0:0(i64 vmctx, i64, i32, i32, i32) -> i32, i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 68 ""
+;; region2 = 42 ""
+;; region3 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/call-indirect-with-gc.wat b/tests/disas/call-indirect-with-gc.wat
index 9996f77b52..4928cf016c 100644
--- a/tests/disas/call-indirect-with-gc.wat
+++ b/tests/disas/call-indirect-with-gc.wat
@@ -16,10 +16,9 @@
;; region3 = 211 ""
;; region4 = 99 ""
;; region5 = 130 ""
-;; region6 = 191 ""
-;; region7 = 106 ""
-;; region8 = 116 ""
-;; region9 = 60 ""
+;; region6 = 22 ""
+;; region7 = 120 ""
+;; region8 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,13 +49,13 @@
;; @0035 jump block3(v20)
;;
;; block3(v17: i64):
-;; @0035 v23 = load.i32 user7 aligned readonly region7 v17+16
+;; @0035 v23 = load.i32 user7 aligned readonly region1 v17+16
;; @0035 v21 = load.i64 notrap aligned readonly can_move region5 v0+40
;; @0035 v22 = load.i32 notrap aligned readonly can_move region6 v21+4
;; @0035 v24 = icmp eq v23, v22
;; @0035 trapz v24, user8
-;; @0035 v26 = load.i64 notrap aligned readonly region8 v17+8
-;; @0035 v27 = load.i64 notrap aligned readonly region9 v17+24
+;; @0035 v26 = load.i64 notrap aligned readonly region7 v17+8
+;; @0035 v27 = load.i64 notrap aligned readonly region8 v17+24
;; @0035 v28 = call_indirect sig0, v26(v27, v0, v2)
;; @0038 jump block1
;;
diff --git a/tests/disas/call-indirect-without-gc.wat b/tests/disas/call-indirect-without-gc.wat
index 5094f77be1..300b52024a 100644
--- a/tests/disas/call-indirect-without-gc.wat
+++ b/tests/disas/call-indirect-without-gc.wat
@@ -16,10 +16,9 @@
;; region3 = 211 ""
;; region4 = 99 ""
;; region5 = 130 ""
-;; region6 = 191 ""
-;; region7 = 106 ""
-;; region8 = 116 ""
-;; region9 = 60 ""
+;; region6 = 22 ""
+;; region7 = 120 ""
+;; region8 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,13 +49,13 @@
;; @0035 jump block3(v20)
;;
;; block3(v17: i64):
-;; @0035 v23 = load.i32 user7 aligned readonly region7 v17+16
+;; @0035 v23 = load.i32 user7 aligned readonly region1 v17+16
;; @0035 v21 = load.i64 notrap aligned readonly can_move region5 v0+40
;; @0035 v22 = load.i32 notrap aligned readonly can_move region6 v21+4
;; @0035 v24 = icmp eq v23, v22
;; @0035 trapz v24, user8
-;; @0035 v26 = load.i64 notrap aligned readonly region8 v17+8
-;; @0035 v27 = load.i64 notrap aligned readonly region9 v17+24
+;; @0035 v26 = load.i64 notrap aligned readonly region7 v17+8
+;; @0035 v27 = load.i64 notrap aligned readonly region8 v17+24
;; @0035 v28 = call_indirect sig0, v26(v27, v0, v2)
;; @0038 jump block1
;;
diff --git a/tests/disas/call-indirect.wat b/tests/disas/call-indirect.wat
index b80c5a530e..237772bab6 100644
--- a/tests/disas/call-indirect.wat
+++ b/tests/disas/call-indirect.wat
@@ -14,10 +14,9 @@
;; region3 = 211 ""
;; region4 = 99 ""
;; region5 = 130 ""
-;; region6 = 191 ""
-;; region7 = 106 ""
-;; region8 = 116 ""
-;; region9 = 60 ""
+;; region6 = 22 ""
+;; region7 = 120 ""
+;; region8 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -51,12 +50,12 @@
;; block3(v17: i64):
;; @0035 v21 = load.i64 notrap aligned readonly can_move region5 v0+40
;; @0035 v22 = load.i32 notrap aligned readonly can_move region6 v21+4
-;; @0035 v23 = load.i32 user7 aligned readonly region7 v17+16
+;; @0035 v23 = load.i32 user7 aligned readonly region1 v17+16
;; @0035 v24 = icmp eq v23, v22
;; @0035 v25 = uextend.i32 v24
;; @0035 trapz v25, user8
-;; @0035 v26 = load.i64 notrap aligned readonly region8 v17+8
-;; @0035 v27 = load.i64 notrap aligned readonly region9 v17+24
+;; @0035 v26 = load.i64 notrap aligned readonly region7 v17+8
+;; @0035 v27 = load.i64 notrap aligned readonly region8 v17+24
;; @0035 v28 = call_indirect sig0, v26(v27, v0, v2)
;; @0038 jump block1
;;
diff --git a/tests/disas/component-model/checked-intrinsics-inlined-no-spectre.wat b/tests/disas/component-model/checked-intrinsics-inlined-no-spectre.wat
index 274ee906c5..5b1f16e846 100644
--- a/tests/disas/component-model/checked-intrinsics-inlined-no-spectre.wat
+++ b/tests/disas/component-model/checked-intrinsics-inlined-no-spectre.wat
@@ -50,7 +50,7 @@
;; function u0:0(i64 vmctx, i64, i64, i64) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
+;; region2 = 42 ""
;; region3 = 175 ""
;; region4 = 113 ""
;; gv0 = vmctx
diff --git a/tests/disas/component-model/checked-intrinsics-inlined.wat b/tests/disas/component-model/checked-intrinsics-inlined.wat
index e3e2f6a07c..8b6584da93 100644
--- a/tests/disas/component-model/checked-intrinsics-inlined.wat
+++ b/tests/disas/component-model/checked-intrinsics-inlined.wat
@@ -51,7 +51,7 @@
;; function u0:0(i64 vmctx, i64, i64, i64) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
+;; region2 = 42 ""
;; region3 = 175 ""
;; region4 = 113 ""
;; gv0 = vmctx
diff --git a/tests/disas/component-model/compile-time-builtins.wat b/tests/disas/component-model/compile-time-builtins.wat
index 962dcdd5a9..4ed2df18eb 100644
--- a/tests/disas/component-model/compile-time-builtins.wat
+++ b/tests/disas/component-model/compile-time-builtins.wat
@@ -176,10 +176,10 @@
;; function u1:0(i64 vmctx, i64) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 44 ""
-;; region4 = 78 ""
-;; region5 = 227 ""
+;; region2 = 42 ""
+;; region3 = 57 ""
+;; region4 = 209 ""
+;; region5 = 132 ""
;; region6 = 175 ""
;; region7 = 113 ""
;; gv0 = vmctx
diff --git a/tests/disas/component-model/direct-adapter-calls-inlining.wat b/tests/disas/component-model/direct-adapter-calls-inlining.wat
index 1c6113da1d..c904a5f07d 100644
--- a/tests/disas/component-model/direct-adapter-calls-inlining.wat
+++ b/tests/disas/component-model/direct-adapter-calls-inlining.wat
@@ -57,10 +57,10 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 44 ""
-;; region4 = 78 ""
-;; region5 = 227 ""
+;; region2 = 42 ""
+;; region3 = 57 ""
+;; region4 = 209 ""
+;; region5 = 132 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/direct-adapter-calls.wat b/tests/disas/component-model/direct-adapter-calls.wat
index 5e7261d697..8bcaf82afc 100644
--- a/tests/disas/component-model/direct-adapter-calls.wat
+++ b/tests/disas/component-model/direct-adapter-calls.wat
@@ -77,7 +77,7 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
+;; region2 = 42 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -98,10 +98,10 @@
;; function u2:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 44 ""
-;; region3 = 78 ""
-;; region4 = 25 ""
-;; region5 = 227 ""
+;; region2 = 57 ""
+;; region3 = 209 ""
+;; region4 = 42 ""
+;; region5 = 132 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/exported-module-makes-adapters-indirect.wat b/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
index 5f7b7ed307..30b031f803 100644
--- a/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
+++ b/tests/disas/component-model/exported-module-makes-adapters-indirect.wat
@@ -61,8 +61,8 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 68 ""
+;; region2 = 42 ""
+;; region3 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat b/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
index 92c822db59..6cd15924b2 100644
--- a/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
+++ b/tests/disas/component-model/inlining-and-unsafe-intrinsics.wat
@@ -45,7 +45,7 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
+;; region2 = 42 ""
;; region3 = 175 ""
;; region4 = 113 ""
;; gv0 = vmctx
diff --git a/tests/disas/component-model/inlining-bug.wat b/tests/disas/component-model/inlining-bug.wat
index 7d971fc1ee..656e2a184c 100644
--- a/tests/disas/component-model/inlining-bug.wat
+++ b/tests/disas/component-model/inlining-bug.wat
@@ -37,7 +37,7 @@
;; function u2:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
+;; region2 = 42 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/inlining-fuzz-bug.wat b/tests/disas/component-model/inlining-fuzz-bug.wat
index 1cb8eb06f0..1fce05c3a8 100644
--- a/tests/disas/component-model/inlining-fuzz-bug.wat
+++ b/tests/disas/component-model/inlining-fuzz-bug.wat
@@ -40,7 +40,7 @@
;; function u2:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
+;; region2 = 42 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/issue-11458.wat b/tests/disas/component-model/issue-11458.wat
index 8c8c2098f1..3da196ff6c 100644
--- a/tests/disas/component-model/issue-11458.wat
+++ b/tests/disas/component-model/issue-11458.wat
@@ -22,7 +22,7 @@
;; function u1:0(i64 vmctx, i64, i32) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
+;; region2 = 42 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/known-imported-adapter-memory.wat b/tests/disas/component-model/known-imported-adapter-memory.wat
index 5fd5368960..60b2c0387d 100644
--- a/tests/disas/component-model/known-imported-adapter-memory.wat
+++ b/tests/disas/component-model/known-imported-adapter-memory.wat
@@ -120,8 +120,8 @@
;; function u2:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 13 ""
+;; region2 = 42 ""
+;; region3 = 75 ""
;; region4 = 215 ""
;; region5 = 105 ""
;; region6 = 184 ""
@@ -149,11 +149,11 @@
;; function u3:0(i64 vmctx, i64, i32, i32) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 44 ""
-;; region3 = 78 ""
-;; region4 = 25 ""
-;; region5 = 227 ""
-;; region6 = 13 ""
+;; region2 = 57 ""
+;; region3 = 209 ""
+;; region4 = 42 ""
+;; region5 = 132 ""
+;; region6 = 75 ""
;; region7 = 215 ""
;; region8 = 105 ""
;; region9 = 171 ""
diff --git a/tests/disas/component-model/known-imported-entities.wat b/tests/disas/component-model/known-imported-entities.wat
index 35afc5b954..f8a5bcc216 100644
--- a/tests/disas/component-model/known-imported-entities.wat
+++ b/tests/disas/component-model/known-imported-entities.wat
@@ -122,7 +122,7 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 13 ""
+;; region2 = 75 ""
;; region3 = 215 ""
;; region4 = 105 ""
;; region5 = 171 ""
@@ -144,7 +144,7 @@
;; function u1:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 44 ""
+;; region2 = 57 ""
;; region3 = 250 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -163,7 +163,7 @@
;; function u1:2(i64 vmctx, i64) -> i64 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 21 ""
+;; region2 = 13 ""
;; region3 = 93 ""
;; region4 = 211 ""
;; region5 = 117 ""
diff --git a/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat b/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
index ae762b015f..9def7d7a7e 100644
--- a/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
+++ b/tests/disas/component-model/multiple-instantiations-makes-adapters-indirect.wat
@@ -67,8 +67,8 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 68 ""
+;; region2 = 42 ""
+;; region3 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/multiple-instantiations-makes-imports-unknown.wat b/tests/disas/component-model/multiple-instantiations-makes-imports-unknown.wat
index d4bb116842..eeaa1e1994 100644
--- a/tests/disas/component-model/multiple-instantiations-makes-imports-unknown.wat
+++ b/tests/disas/component-model/multiple-instantiations-makes-imports-unknown.wat
@@ -220,7 +220,7 @@
;; function u2:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 13 ""
+;; region2 = 75 ""
;; region3 = 215 ""
;; region4 = 105 ""
;; region5 = 61 ""
@@ -242,7 +242,7 @@
;; function u2:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 44 ""
+;; region2 = 57 ""
;; region3 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -261,7 +261,7 @@
;; function u2:2(i64 vmctx, i64) -> i64 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 21 ""
+;; region2 = 13 ""
;; region3 = 93 ""
;; region4 = 211 ""
;; region5 = 99 ""
diff --git a/tests/disas/component-model/reexported-ambiguous-entities.wat b/tests/disas/component-model/reexported-ambiguous-entities.wat
index fdae163e64..03dfefe783 100644
--- a/tests/disas/component-model/reexported-ambiguous-entities.wat
+++ b/tests/disas/component-model/reexported-ambiguous-entities.wat
@@ -243,7 +243,7 @@
;; function u2:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 13 ""
+;; region2 = 75 ""
;; region3 = 215 ""
;; region4 = 105 ""
;; region5 = 61 ""
@@ -265,7 +265,7 @@
;; function u2:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 44 ""
+;; region2 = 57 ""
;; region3 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -284,7 +284,7 @@
;; function u2:2(i64 vmctx, i64) -> i64 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 21 ""
+;; region2 = 13 ""
;; region3 = 93 ""
;; region4 = 211 ""
;; region5 = 99 ""
@@ -325,7 +325,7 @@
;; function u3:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 13 ""
+;; region2 = 75 ""
;; region3 = 215 ""
;; region4 = 105 ""
;; region5 = 61 ""
@@ -347,7 +347,7 @@
;; function u3:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 44 ""
+;; region2 = 57 ""
;; region3 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -366,7 +366,7 @@
;; function u3:2(i64 vmctx, i64) -> i64 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 21 ""
+;; region2 = 13 ""
;; region3 = 93 ""
;; region4 = 211 ""
;; region5 = 99 ""
diff --git a/tests/disas/component-model/reexported-entities-to-imported-module.wat b/tests/disas/component-model/reexported-entities-to-imported-module.wat
index 1c29f765dd..c8e0246f1d 100644
--- a/tests/disas/component-model/reexported-entities-to-imported-module.wat
+++ b/tests/disas/component-model/reexported-entities-to-imported-module.wat
@@ -140,7 +140,7 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 13 ""
+;; region2 = 75 ""
;; region3 = 215 ""
;; region4 = 105 ""
;; region5 = 61 ""
@@ -162,7 +162,7 @@
;; function u1:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 44 ""
+;; region2 = 57 ""
;; region3 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -181,7 +181,7 @@
;; function u1:2(i64 vmctx, i64) -> i64 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 21 ""
+;; region2 = 13 ""
;; region3 = 93 ""
;; region4 = 211 ""
;; region5 = 99 ""
diff --git a/tests/disas/component-model/reexported-known-entities.wat b/tests/disas/component-model/reexported-known-entities.wat
index d306ad76cd..b172f07f3e 100644
--- a/tests/disas/component-model/reexported-known-entities.wat
+++ b/tests/disas/component-model/reexported-known-entities.wat
@@ -146,7 +146,7 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 13 ""
+;; region2 = 75 ""
;; region3 = 215 ""
;; region4 = 105 ""
;; region5 = 171 ""
@@ -168,7 +168,7 @@
;; function u1:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 44 ""
+;; region2 = 57 ""
;; region3 = 250 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -187,7 +187,7 @@
;; function u1:2(i64 vmctx, i64) -> i64 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 21 ""
+;; region2 = 13 ""
;; region3 = 93 ""
;; region4 = 211 ""
;; region5 = 117 ""
@@ -228,7 +228,7 @@
;; function u2:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 13 ""
+;; region2 = 75 ""
;; region3 = 215 ""
;; region4 = 105 ""
;; region5 = 171 ""
@@ -250,7 +250,7 @@
;; function u2:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 44 ""
+;; region2 = 57 ""
;; region3 = 250 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -269,7 +269,7 @@
;; function u2:2(i64 vmctx, i64) -> i64 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 21 ""
+;; region2 = 13 ""
;; region3 = 93 ""
;; region4 = 211 ""
;; region5 = 117 ""
diff --git a/tests/disas/component-model/same-vmctx/disagreeing-instantiations.wat b/tests/disas/component-model/same-vmctx/disagreeing-instantiations.wat
index aadab128ee..8cbfa66e18 100644
--- a/tests/disas/component-model/same-vmctx/disagreeing-instantiations.wat
+++ b/tests/disas/component-model/same-vmctx/disagreeing-instantiations.wat
@@ -37,8 +37,8 @@
;; function u1:0(i64 vmctx, i64) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 68 ""
+;; region2 = 42 ""
+;; region3 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/same-vmctx/multiple-instantiations-same-instance-each.wat b/tests/disas/component-model/same-vmctx/multiple-instantiations-same-instance-each.wat
index 78baa7de73..2fd2286ff0 100644
--- a/tests/disas/component-model/same-vmctx/multiple-instantiations-same-instance-each.wat
+++ b/tests/disas/component-model/same-vmctx/multiple-instantiations-same-instance-each.wat
@@ -32,8 +32,8 @@
;; function u1:0(i64 vmctx, i64) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 68 ""
+;; region2 = 42 ""
+;; region3 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/same-vmctx/no-instantiations.wat b/tests/disas/component-model/same-vmctx/no-instantiations.wat
index adbccdff80..c9fc9045ea 100644
--- a/tests/disas/component-model/same-vmctx/no-instantiations.wat
+++ b/tests/disas/component-model/same-vmctx/no-instantiations.wat
@@ -20,8 +20,8 @@
;; function u0:0(i64 vmctx, i64) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 68 ""
+;; region2 = 42 ""
+;; region3 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/same-vmctx/one-instantiation-same-instance.wat b/tests/disas/component-model/same-vmctx/one-instantiation-same-instance.wat
index 56507e8258..a7d06a4904 100644
--- a/tests/disas/component-model/same-vmctx/one-instantiation-same-instance.wat
+++ b/tests/disas/component-model/same-vmctx/one-instantiation-same-instance.wat
@@ -28,7 +28,7 @@
;; function u1:0(i64 vmctx, i64) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
+;; region2 = 42 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/same-vmctx/one-instantiation-two-instances.wat b/tests/disas/component-model/same-vmctx/one-instantiation-two-instances.wat
index bb247c26de..62bbef693a 100644
--- a/tests/disas/component-model/same-vmctx/one-instantiation-two-instances.wat
+++ b/tests/disas/component-model/same-vmctx/one-instantiation-two-instances.wat
@@ -38,7 +38,7 @@
;; function u1:0(i64 vmctx, i64) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
+;; region2 = 42 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/same-vmctx/partially-disagreeing-instantiations.wat b/tests/disas/component-model/same-vmctx/partially-disagreeing-instantiations.wat
index 083daf5ff0..4fc87474a7 100644
--- a/tests/disas/component-model/same-vmctx/partially-disagreeing-instantiations.wat
+++ b/tests/disas/component-model/same-vmctx/partially-disagreeing-instantiations.wat
@@ -40,8 +40,8 @@
;; function u1:0(i64 vmctx, i64) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 68 ""
+;; region2 = 42 ""
+;; region3 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/sync-adapter-calls.wat b/tests/disas/component-model/sync-adapter-calls.wat
index 3abc2b8492..42a8ea9965 100644
--- a/tests/disas/component-model/sync-adapter-calls.wat
+++ b/tests/disas/component-model/sync-adapter-calls.wat
@@ -54,10 +54,10 @@
;; function u1:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 44 ""
-;; region4 = 78 ""
-;; region5 = 227 ""
+;; region2 = 42 ""
+;; region3 = 57 ""
+;; region4 = 209 ""
+;; region5 = 132 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/component-model/thread-transparency/opaque.wat b/tests/disas/component-model/thread-transparency/opaque.wat
index e9e1e8fd73..7c29c91e50 100644
--- a/tests/disas/component-model/thread-transparency/opaque.wat
+++ b/tests/disas/component-model/thread-transparency/opaque.wat
@@ -65,18 +65,19 @@
;; ss0 = explicit_slot 24, align = 8
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 44 ""
-;; region4 = 78 ""
+;; region2 = 42 ""
+;; region3 = 57 ""
+;; region4 = 209 ""
;; region5 = 68 ""
-;; region6 = 198 ""
-;; region7 = 100 ""
-;; region8 = 254 ""
+;; region6 = 237 ""
+;; region7 = 126 ""
+;; region8 = 221 ""
;; region9 = 112 ""
-;; region10 = 176 ""
+;; region10 = 71 ""
;; region11 = 149 ""
-;; region12 = 224 ""
-;; region13 = 227 ""
+;; region12 = 93 ""
+;; region13 = 132 ""
+;; region14 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/duplicate-function-types.wat b/tests/disas/duplicate-function-types.wat
index 35a70889e8..f006c310e3 100644
--- a/tests/disas/duplicate-function-types.wat
+++ b/tests/disas/duplicate-function-types.wat
@@ -19,15 +19,14 @@
;; function u0:0(i64 vmctx, i64, i32) -> i32, i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 21 ""
+;; region2 = 13 ""
;; region3 = 93 ""
;; region4 = 211 ""
;; region5 = 99 ""
;; region6 = 130 ""
-;; region7 = 6 ""
-;; region8 = 106 ""
-;; region9 = 116 ""
-;; region10 = 60 ""
+;; region7 = 134 ""
+;; region8 = 120 ""
+;; region9 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -63,12 +62,12 @@
;; block3(v18: i64):
;; @002d v22 = load.i64 notrap aligned readonly can_move region6 v0+40
;; @002d v23 = load.i32 notrap aligned readonly can_move region7 v22
-;; @002d v24 = load.i32 user7 aligned readonly region8 v18+16
+;; @002d v24 = load.i32 user7 aligned readonly region1 v18+16
;; @002d v25 = icmp eq v24, v23
;; @002d v26 = uextend.i32 v25
;; @002d trapz v26, user8
-;; @002d v27 = load.i64 notrap aligned readonly region9 v18+8
-;; @002d v28 = load.i64 notrap aligned readonly region10 v18+24
+;; @002d v27 = load.i64 notrap aligned readonly region8 v18+8
+;; @002d v28 = load.i64 notrap aligned readonly region9 v18+24
;; @002d v29 = call_indirect sig0, v27(v28, v0)
;; @0032 v31 = load.i64 notrap aligned readonly can_move region2 v0+48
;; @0032 v32 = load.i64 notrap aligned region4 v31+8
@@ -96,12 +95,12 @@
;; block5(v46: i64):
;; @0032 v50 = load.i64 notrap aligned readonly can_move region6 v0+40
;; @0032 v51 = load.i32 notrap aligned readonly can_move region7 v50
-;; @0032 v52 = load.i32 user7 aligned readonly region8 v46+16
+;; @0032 v52 = load.i32 user7 aligned readonly region1 v46+16
;; @0032 v53 = icmp eq v52, v51
;; @0032 v54 = uextend.i32 v53
;; @0032 trapz v54, user8
-;; @0032 v55 = load.i64 notrap aligned readonly region9 v46+8
-;; @0032 v56 = load.i64 notrap aligned readonly region10 v46+24
+;; @0032 v55 = load.i64 notrap aligned readonly region8 v46+8
+;; @0032 v56 = load.i64 notrap aligned readonly region9 v46+24
;; @0032 v57 = call_indirect sig0, v55(v56, v0)
;; @0035 jump block1
;;
diff --git a/tests/disas/epoch-interruption.wat b/tests/disas/epoch-interruption.wat
index a0ac4895bc..3315e69e36 100644
--- a/tests/disas/epoch-interruption.wat
+++ b/tests/disas/epoch-interruption.wat
@@ -8,7 +8,7 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 235 ""
-;; region3 = 18 ""
+;; region3 = 6 ""
;; region4 = 109 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/foo.wat b/tests/disas/foo.wat
index 7ad62a742e..e0b4960e53 100644
--- a/tests/disas/foo.wat
+++ b/tests/disas/foo.wat
@@ -20,15 +20,14 @@
;; region2 = 215 ""
;; region3 = 105 ""
;; region4 = 171 ""
-;; region5 = 21 ""
+;; region5 = 13 ""
;; region6 = 93 ""
;; region7 = 211 ""
;; region8 = 99 ""
;; region9 = 130 ""
-;; region10 = 191 ""
-;; region11 = 106 ""
-;; region12 = 116 ""
-;; region13 = 60 ""
+;; region10 = 22 ""
+;; region11 = 120 ""
+;; region12 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -64,13 +63,13 @@
;; @0043 jump block3(v26)
;;
;; block3(v23: i64):
-;; @0043 v29 = load.i32 user7 aligned readonly region11 v23+16
+;; @0043 v29 = load.i32 user7 aligned readonly region1 v23+16
;; @0043 v27 = load.i64 notrap aligned readonly can_move region9 v0+40
;; @0043 v28 = load.i32 notrap aligned readonly can_move region10 v27+4
;; @0043 v30 = icmp eq v29, v28
;; @0043 trapz v30, user8
-;; @0043 v32 = load.i64 notrap aligned readonly region12 v23+8
-;; @0043 v33 = load.i64 notrap aligned readonly region13 v23+24
+;; @0043 v32 = load.i64 notrap aligned readonly region11 v23+8
+;; @0043 v33 = load.i64 notrap aligned readonly region12 v23+24
;; @0043 v34 = call_indirect sig0, v32(v33, v0, v2)
;; @004a v40 = load.i32 little region4 v6
;; @004d v42 = load.i64 notrap aligned region7 v8+8
@@ -94,11 +93,11 @@
;; @004d jump block5(v59)
;;
;; block5(v56: i64):
-;; @004d v62 = load.i32 user7 aligned readonly region11 v56+16
+;; @004d v62 = load.i32 user7 aligned readonly region1 v56+16
;; @004d v63 = icmp eq v62, v28
;; @004d trapz v63, user8
-;; @004d v65 = load.i64 notrap aligned readonly region12 v56+8
-;; @004d v66 = load.i64 notrap aligned readonly region13 v56+24
+;; @004d v65 = load.i64 notrap aligned readonly region11 v56+8
+;; @004d v66 = load.i64 notrap aligned readonly region12 v56+24
;; @004d v67 = call_indirect sig0, v65(v66, v0, v2)
;; @0050 jump block1
;;
diff --git a/tests/disas/gc/alias-region-exn-payload.wat b/tests/disas/gc/alias-region-exn-payload.wat
index cc6ed40c92..078c519225 100644
--- a/tests/disas/gc/alias-region-exn-payload.wat
+++ b/tests/disas/gc/alias-region-exn-payload.wat
@@ -28,13 +28,13 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 237 ""
+;; region3 = 177 ""
;; region4 = 206 ""
;; region5 = 196 ""
;; region6 = 130 ""
-;; region7 = 26 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
+;; region7 = 227 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
;; region10 = 110 ""
;; region11 = 142 ""
;; region12 = 229 ""
diff --git a/tests/disas/gc/array-new-data.wat b/tests/disas/gc/array-new-data.wat
index c9d7d794eb..5dcbbadf20 100644
--- a/tests/disas/gc/array-new-data.wat
+++ b/tests/disas/gc/array-new-data.wat
@@ -82,16 +82,17 @@
;; region2 = 90 ""
;; region3 = 136 ""
;; region4 = 65 ""
-;; region5 = 177 ""
-;; region6 = 98 ""
+;; region5 = 210 ""
+;; region6 = 115 ""
;; region7 = 130 ""
-;; region8 = 6 ""
+;; region8 = 134 ""
;; region9 = 196 ""
-;; region10 = 239 ""
-;; region11 = 134 ""
-;; region12 = 108 ""
-;; region13 = 206 ""
-;; region14 = 135 ""
+;; region10 = 77 ""
+;; region11 = 87 ""
+;; region12 = 175 ""
+;; region13 = 108 ""
+;; region14 = 206 ""
+;; region15 = 135 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -145,7 +146,7 @@
;; v145 = load.i32 notrap aligned readonly can_move region8 v144
;; @0025 store user2 region11 v145, v48+4
;; v146 = band.i64 v29, v28 ; v28 = -16
-;; @0025 istore32 user2 region2 v146, v48+8
+;; @0025 istore32 user2 region12 v146, v48+8
;; @0025 jump block4(v24, v48)
;;
;; block3 cold:
@@ -162,17 +163,17 @@
;;
;; block4(v52: i32, v53: i64):
;; v112 = stack_addr.i64 ss0
-;; store notrap aligned region14 v52, v112
+;; store notrap aligned region15 v52, v112
;; @0025 v54 = iconst.i64 16
;; @0025 v55 = iadd v53, v54 ; v54 = 16
-;; @0025 store.i32 user2 region12 v3, v55
+;; @0025 store.i32 user2 region13 v3, v55
;; @0025 trapz v52, user16
;; v147 = load.i64 notrap aligned readonly can_move region0 v0+8
;; v148 = load.i64 notrap aligned readonly can_move region9 v147+32
;; @0025 v57 = uextend.i64 v52
;; @0025 v60 = iadd v148, v57
;; @0025 v62 = iadd v60, v54 ; v54 = 16
-;; @0025 v63 = load.i32 user2 readonly region12 v62
+;; @0025 v63 = load.i32 user2 readonly region13 v62
;; @0025 v64 = uextend.i64 v63
;; @0025 v70 = icmp.i64 ugt v7, v64
;; @0025 trapnz v70, user17
@@ -181,7 +182,7 @@
;; @0025 v88 = icmp.i64 ugt v10, v82
;; @0025 trapnz v88, heap_oob
;; @0025 v89 = load.i64 notrap aligned region3 v0+48
-;; @0025 v100 = load.i64 notrap aligned region13 v147+40
+;; @0025 v100 = load.i64 notrap aligned region14 v147+40
;; @0025 v75 = iconst.i64 20
;; @0025 v76 = iadd v60, v75 ; v75 = 20
;; @0025 v102 = uadd_overflow_trap v76, v7, user2
@@ -193,6 +194,6 @@
;; @0029 jump block1
;;
;; block1:
-;; v105 = load.i32 notrap aligned region14 v112
+;; v105 = load.i32 notrap aligned region15 v112
;; @0029 return v105
;; }
diff --git a/tests/disas/gc/array-new-default-anyref.wat b/tests/disas/gc/array-new-default-anyref.wat
index 8ccb0964df..9b9c3adc64 100644
--- a/tests/disas/gc/array-new-default-anyref.wat
+++ b/tests/disas/gc/array-new-default-anyref.wat
@@ -13,14 +13,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 108 ""
;; region12 = 206 ""
;; region13 = 5 ""
diff --git a/tests/disas/gc/array-new-default-exnref.wat b/tests/disas/gc/array-new-default-exnref.wat
index 83422c30a2..b052e1f304 100644
--- a/tests/disas/gc/array-new-default-exnref.wat
+++ b/tests/disas/gc/array-new-default-exnref.wat
@@ -13,14 +13,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 108 ""
;; region12 = 206 ""
;; region13 = 5 ""
diff --git a/tests/disas/gc/array-new-default-externref.wat b/tests/disas/gc/array-new-default-externref.wat
index 12cedb5d33..ef0fd6503f 100644
--- a/tests/disas/gc/array-new-default-externref.wat
+++ b/tests/disas/gc/array-new-default-externref.wat
@@ -13,14 +13,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 108 ""
;; region12 = 206 ""
;; region13 = 5 ""
diff --git a/tests/disas/gc/array-new-default-f32.wat b/tests/disas/gc/array-new-default-f32.wat
index ac6fcafb43..3362c95b83 100644
--- a/tests/disas/gc/array-new-default-f32.wat
+++ b/tests/disas/gc/array-new-default-f32.wat
@@ -14,14 +14,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 108 ""
;; region12 = 206 ""
;; region13 = 135 ""
diff --git a/tests/disas/gc/array-new-default-f64.wat b/tests/disas/gc/array-new-default-f64.wat
index 4ac51b43b0..47aab21ead 100644
--- a/tests/disas/gc/array-new-default-f64.wat
+++ b/tests/disas/gc/array-new-default-f64.wat
@@ -14,14 +14,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 108 ""
;; region12 = 206 ""
;; region13 = 135 ""
diff --git a/tests/disas/gc/array-new-default-funcref.wat b/tests/disas/gc/array-new-default-funcref.wat
index a7e6db554d..b0837b1c7a 100644
--- a/tests/disas/gc/array-new-default-funcref.wat
+++ b/tests/disas/gc/array-new-default-funcref.wat
@@ -14,14 +14,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 108 ""
;; region12 = 206 ""
;; region13 = 5 ""
diff --git a/tests/disas/gc/array-new-default-i16.wat b/tests/disas/gc/array-new-default-i16.wat
index f2caa8e7f0..ddd4bccd95 100644
--- a/tests/disas/gc/array-new-default-i16.wat
+++ b/tests/disas/gc/array-new-default-i16.wat
@@ -14,14 +14,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 108 ""
;; region12 = 206 ""
;; region13 = 135 ""
diff --git a/tests/disas/gc/array-new-default-i32.wat b/tests/disas/gc/array-new-default-i32.wat
index ee4f0f0001..79a1e7e59b 100644
--- a/tests/disas/gc/array-new-default-i32.wat
+++ b/tests/disas/gc/array-new-default-i32.wat
@@ -14,14 +14,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 108 ""
;; region12 = 206 ""
;; region13 = 135 ""
diff --git a/tests/disas/gc/array-new-default-i64.wat b/tests/disas/gc/array-new-default-i64.wat
index 49318743df..c1c426eb5e 100644
--- a/tests/disas/gc/array-new-default-i64.wat
+++ b/tests/disas/gc/array-new-default-i64.wat
@@ -14,14 +14,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 108 ""
;; region12 = 206 ""
;; region13 = 135 ""
diff --git a/tests/disas/gc/array-new-default-i8.wat b/tests/disas/gc/array-new-default-i8.wat
index d22672c071..79cf13f574 100644
--- a/tests/disas/gc/array-new-default-i8.wat
+++ b/tests/disas/gc/array-new-default-i8.wat
@@ -14,14 +14,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 108 ""
;; region12 = 206 ""
;; region13 = 135 ""
diff --git a/tests/disas/gc/call-indirect-final-type.wat b/tests/disas/gc/call-indirect-final-type.wat
index 852a5c8403..84183829a8 100644
--- a/tests/disas/gc/call-indirect-final-type.wat
+++ b/tests/disas/gc/call-indirect-final-type.wat
@@ -22,10 +22,9 @@
;; region3 = 211 ""
;; region4 = 117 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 106 ""
-;; region8 = 116 ""
-;; region9 = 60 ""
+;; region6 = 134 ""
+;; region7 = 120 ""
+;; region8 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -56,13 +55,13 @@
;; @002b jump block3(v20)
;;
;; block3(v17: i64):
-;; @002b v23 = load.i32 user7 aligned readonly region7 v17+16
+;; @002b v23 = load.i32 user7 aligned readonly region1 v17+16
;; @002b v21 = load.i64 notrap aligned readonly can_move region5 v0+40
;; @002b v22 = load.i32 notrap aligned readonly can_move region6 v21
;; @002b v24 = icmp eq v23, v22
;; @002b trapz v24, user8
-;; @002b v26 = load.i64 notrap aligned readonly region8 v17+8
-;; @002b v27 = load.i64 notrap aligned readonly region9 v17+24
+;; @002b v26 = load.i64 notrap aligned readonly region7 v17+8
+;; @002b v27 = load.i64 notrap aligned readonly region8 v17+24
;; @002b v28 = call_indirect sig0, v26(v27, v0, v2)
;; @002e jump block1
;;
@@ -77,10 +76,9 @@
;; region3 = 211 ""
;; region4 = 117 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 106 ""
-;; region8 = 116 ""
-;; region9 = 60 ""
+;; region6 = 134 ""
+;; region7 = 120 ""
+;; region8 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -111,12 +109,12 @@
;; @0035 jump block3(v20)
;;
;; block3(v17: i64):
-;; @0035 v23 = load.i32 user7 aligned readonly region7 v17+16
+;; @0035 v23 = load.i32 user7 aligned readonly region1 v17+16
;; @0035 v21 = load.i64 notrap aligned readonly can_move region5 v0+40
;; @0035 v22 = load.i32 notrap aligned readonly can_move region6 v21
;; @0035 v24 = icmp eq v23, v22
;; @0035 trapz v24, user8
-;; @0035 v26 = load.i64 notrap aligned readonly region8 v17+8
-;; @0035 v27 = load.i64 notrap aligned readonly region9 v17+24
+;; @0035 v26 = load.i64 notrap aligned readonly region7 v17+8
+;; @0035 v27 = load.i64 notrap aligned readonly region8 v17+24
;; @0035 return_call_indirect sig0, v26(v27, v0, v2)
;; }
diff --git a/tests/disas/gc/copying/alias-region-header.wat b/tests/disas/gc/copying/alias-region-header.wat
index fdc49b0d64..bf07e168c4 100644
--- a/tests/disas/gc/copying/alias-region-header.wat
+++ b/tests/disas/gc/copying/alias-region-header.wat
@@ -19,14 +19,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 147 ""
;; region12 = 206 ""
;; gv0 = vmctx
diff --git a/tests/disas/gc/copying/array-new-fixed-of-gc-refs.wat b/tests/disas/gc/copying/array-new-fixed-of-gc-refs.wat
index fc510584ff..5043f7765b 100644
--- a/tests/disas/gc/copying/array-new-fixed-of-gc-refs.wat
+++ b/tests/disas/gc/copying/array-new-fixed-of-gc-refs.wat
@@ -15,14 +15,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 108 ""
;; region12 = 206 ""
;; region13 = 5 ""
diff --git a/tests/disas/gc/copying/array-new-fixed.wat b/tests/disas/gc/copying/array-new-fixed.wat
index 6d13d52651..3f956429b1 100644
--- a/tests/disas/gc/copying/array-new-fixed.wat
+++ b/tests/disas/gc/copying/array-new-fixed.wat
@@ -12,14 +12,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 108 ""
;; region12 = 206 ""
;; region13 = 5 ""
diff --git a/tests/disas/gc/copying/array-new.wat b/tests/disas/gc/copying/array-new.wat
index 3e2c5e006a..ee56de0691 100644
--- a/tests/disas/gc/copying/array-new.wat
+++ b/tests/disas/gc/copying/array-new.wat
@@ -12,14 +12,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 108 ""
;; region12 = 206 ""
;; region13 = 5 ""
diff --git a/tests/disas/gc/copying/br-on-cast-fail.wat b/tests/disas/gc/copying/br-on-cast-fail.wat
index f5fdd113a4..ee67b0786b 100644
--- a/tests/disas/gc/copying/br-on-cast-fail.wat
+++ b/tests/disas/gc/copying/br-on-cast-fail.wat
@@ -20,12 +20,12 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
-;; region8 = 25 ""
-;; region9 = 68 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
+;; region8 = 42 ""
+;; region9 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/br-on-cast.wat b/tests/disas/gc/copying/br-on-cast.wat
index 3215bced8f..acd274b06c 100644
--- a/tests/disas/gc/copying/br-on-cast.wat
+++ b/tests/disas/gc/copying/br-on-cast.wat
@@ -20,12 +20,12 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
-;; region8 = 25 ""
-;; region9 = 68 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
+;; region8 = 42 ""
+;; region9 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/call-indirect-and-subtyping.wat b/tests/disas/gc/copying/call-indirect-and-subtyping.wat
index 355f7484fc..5c1a419d86 100644
--- a/tests/disas/gc/copying/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/copying/call-indirect-and-subtyping.wat
@@ -21,10 +21,9 @@
;; region2 = 93 ""
;; region3 = 117 ""
;; region4 = 130 ""
-;; region5 = 6 ""
-;; region6 = 106 ""
-;; region7 = 116 ""
-;; region8 = 60 ""
+;; region5 = 134 ""
+;; region6 = 120 ""
+;; region7 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -56,7 +55,7 @@
;; @005c jump block3(v18)
;;
;; block3(v15: i64):
-;; @005c v21 = load.i32 user7 aligned readonly region6 v15+16
+;; @005c v21 = load.i32 user7 aligned readonly region1 v15+16
;; @005c v19 = load.i64 notrap aligned readonly can_move region4 v0+40
;; @005c v20 = load.i32 notrap aligned readonly can_move region5 v19
;; @005c v22 = icmp eq v21, v20
@@ -69,8 +68,8 @@
;;
;; block5(v25: i32):
;; @005c trapz v25, user8
-;; @005c v26 = load.i64 notrap aligned readonly region7 v15+8
-;; @005c v27 = load.i64 notrap aligned readonly region8 v15+24
+;; @005c v26 = load.i64 notrap aligned readonly region6 v15+8
+;; @005c v27 = load.i64 notrap aligned readonly region7 v15+24
;; @005c call_indirect sig0, v26(v27, v0)
;; @005f jump block1
;;
diff --git a/tests/disas/gc/copying/funcref-in-gc-heap-new.wat b/tests/disas/gc/copying/funcref-in-gc-heap-new.wat
index e79c987728..71292c0652 100644
--- a/tests/disas/gc/copying/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/copying/funcref-in-gc-heap-new.wat
@@ -13,14 +13,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 147 ""
;; region12 = 135 ""
;; gv0 = vmctx
diff --git a/tests/disas/gc/copying/ref-cast.wat b/tests/disas/gc/copying/ref-cast.wat
index 9da28af169..7bbee7f659 100644
--- a/tests/disas/gc/copying/ref-cast.wat
+++ b/tests/disas/gc/copying/ref-cast.wat
@@ -12,10 +12,10 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-test-array.wat b/tests/disas/gc/copying/ref-test-array.wat
index 1d6e9ee53b..2f211e4460 100644
--- a/tests/disas/gc/copying/ref-test-array.wat
+++ b/tests/disas/gc/copying/ref-test-array.wat
@@ -11,7 +11,7 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-test-concrete-func-type.wat b/tests/disas/gc/copying/ref-test-concrete-func-type.wat
index 1543dbdb22..130fd84435 100644
--- a/tests/disas/gc/copying/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/copying/ref-test-concrete-func-type.wat
@@ -11,8 +11,7 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 130 ""
-;; region3 = 6 ""
-;; region4 = 106 ""
+;; region3 = 134 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -28,7 +27,7 @@
;; @0020 jump block3
;;
;; block3:
-;; @0020 v9 = load.i32 notrap aligned readonly region4 v2+16
+;; @0020 v9 = load.i32 notrap aligned readonly region1 v2+16
;; @0020 v7 = load.i64 notrap aligned readonly can_move region2 v0+40
;; @0020 v8 = load.i32 notrap aligned readonly can_move region3 v7
;; @0020 v10 = icmp eq v9, v8
diff --git a/tests/disas/gc/copying/ref-test-concrete-type.wat b/tests/disas/gc/copying/ref-test-concrete-type.wat
index 8da6058c4a..4638540604 100644
--- a/tests/disas/gc/copying/ref-test-concrete-type.wat
+++ b/tests/disas/gc/copying/ref-test-concrete-type.wat
@@ -12,10 +12,10 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-test-eq.wat b/tests/disas/gc/copying/ref-test-eq.wat
index 870a619b4a..4c1bda0ea1 100644
--- a/tests/disas/gc/copying/ref-test-eq.wat
+++ b/tests/disas/gc/copying/ref-test-eq.wat
@@ -11,7 +11,7 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/ref-test-struct.wat b/tests/disas/gc/copying/ref-test-struct.wat
index af5a2fe2a0..d8083969a3 100644
--- a/tests/disas/gc/copying/ref-test-struct.wat
+++ b/tests/disas/gc/copying/ref-test-struct.wat
@@ -11,7 +11,7 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/copying/struct-new-default.wat b/tests/disas/gc/copying/struct-new-default.wat
index ba4b02e281..199fe07aec 100644
--- a/tests/disas/gc/copying/struct-new-default.wat
+++ b/tests/disas/gc/copying/struct-new-default.wat
@@ -14,14 +14,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 147 ""
;; region12 = 225 ""
;; region13 = 152 ""
diff --git a/tests/disas/gc/copying/struct-new.wat b/tests/disas/gc/copying/struct-new.wat
index 85a663467c..0343960120 100644
--- a/tests/disas/gc/copying/struct-new.wat
+++ b/tests/disas/gc/copying/struct-new.wat
@@ -15,14 +15,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 147 ""
;; region12 = 225 ""
;; region13 = 152 ""
diff --git a/tests/disas/gc/drc/alias-region-header.wat b/tests/disas/gc/drc/alias-region-header.wat
index 5c26e0bcfd..b700e3e4d5 100644
--- a/tests/disas/gc/drc/alias-region-header.wat
+++ b/tests/disas/gc/drc/alias-region-header.wat
@@ -26,13 +26,13 @@
;; region2 = 196 ""
;; region3 = 206 ""
;; region4 = 147 ""
-;; region5 = 175 ""
-;; region6 = 239 ""
+;; region5 = 115 ""
+;; region6 = 77 ""
;; region7 = 65 ""
-;; region8 = 210 ""
-;; region9 = 121 ""
-;; region10 = 115 ""
-;; region11 = 137 ""
+;; region8 = 238 ""
+;; region9 = 71 ""
+;; region10 = 176 ""
+;; region11 = 245 ""
;; region12 = 135 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat b/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat
index 09eae95242..0082297d47 100644
--- a/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat
+++ b/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat
@@ -16,12 +16,12 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 130 ""
-;; region3 = 6 ""
+;; region3 = 134 ""
;; region4 = 196 ""
;; region5 = 108 ""
;; region6 = 206 ""
;; region7 = 5 ""
-;; region8 = 175 ""
+;; region8 = 115 ""
;; region9 = 135 ""
;; region10 = 187 ""
;; region11 = 26 ""
diff --git a/tests/disas/gc/drc/array-new-fixed.wat b/tests/disas/gc/drc/array-new-fixed.wat
index ebb503cbc7..f4f2862ac0 100644
--- a/tests/disas/gc/drc/array-new-fixed.wat
+++ b/tests/disas/gc/drc/array-new-fixed.wat
@@ -13,7 +13,7 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 130 ""
-;; region3 = 6 ""
+;; region3 = 134 ""
;; region4 = 196 ""
;; region5 = 108 ""
;; region6 = 206 ""
diff --git a/tests/disas/gc/drc/array-new.wat b/tests/disas/gc/drc/array-new.wat
index a28eaa88d2..d1d8d47bc8 100644
--- a/tests/disas/gc/drc/array-new.wat
+++ b/tests/disas/gc/drc/array-new.wat
@@ -13,7 +13,7 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 130 ""
-;; region3 = 6 ""
+;; region3 = 134 ""
;; region4 = 196 ""
;; region5 = 108 ""
;; region6 = 206 ""
diff --git a/tests/disas/gc/drc/br-on-cast-fail.wat b/tests/disas/gc/drc/br-on-cast-fail.wat
index ec7e544b02..277a006153 100644
--- a/tests/disas/gc/drc/br-on-cast-fail.wat
+++ b/tests/disas/gc/drc/br-on-cast-fail.wat
@@ -21,12 +21,12 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
-;; region8 = 25 ""
-;; region9 = 68 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
+;; region8 = 42 ""
+;; region9 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/br-on-cast.wat b/tests/disas/gc/drc/br-on-cast.wat
index 4223ce0c6e..6cbe84deee 100644
--- a/tests/disas/gc/drc/br-on-cast.wat
+++ b/tests/disas/gc/drc/br-on-cast.wat
@@ -21,12 +21,12 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
-;; region8 = 25 ""
-;; region9 = 68 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
+;; region8 = 42 ""
+;; region9 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/call-indirect-and-subtyping.wat b/tests/disas/gc/drc/call-indirect-and-subtyping.wat
index 07fadca7d4..224e220af9 100644
--- a/tests/disas/gc/drc/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/drc/call-indirect-and-subtyping.wat
@@ -22,10 +22,9 @@
;; region2 = 93 ""
;; region3 = 117 ""
;; region4 = 130 ""
-;; region5 = 6 ""
-;; region6 = 106 ""
-;; region7 = 116 ""
-;; region8 = 60 ""
+;; region5 = 134 ""
+;; region6 = 120 ""
+;; region7 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -57,7 +56,7 @@
;; @005c jump block3(v18)
;;
;; block3(v15: i64):
-;; @005c v21 = load.i32 user7 aligned readonly region6 v15+16
+;; @005c v21 = load.i32 user7 aligned readonly region1 v15+16
;; @005c v19 = load.i64 notrap aligned readonly can_move region4 v0+40
;; @005c v20 = load.i32 notrap aligned readonly can_move region5 v19
;; @005c v22 = icmp eq v21, v20
@@ -70,8 +69,8 @@
;;
;; block5(v25: i32):
;; @005c trapz v25, user8
-;; @005c v26 = load.i64 notrap aligned readonly region7 v15+8
-;; @005c v27 = load.i64 notrap aligned readonly region8 v15+24
+;; @005c v26 = load.i64 notrap aligned readonly region6 v15+8
+;; @005c v27 = load.i64 notrap aligned readonly region7 v15+24
;; @005c call_indirect sig0, v26(v27, v0)
;; @005f jump block1
;;
diff --git a/tests/disas/gc/drc/externref-globals.wat b/tests/disas/gc/drc/externref-globals.wat
index 3fee836528..b3fc04db3c 100644
--- a/tests/disas/gc/drc/externref-globals.wat
+++ b/tests/disas/gc/drc/externref-globals.wat
@@ -19,13 +19,13 @@
;; region2 = 250 ""
;; region3 = 196 ""
;; region4 = 206 ""
-;; region5 = 239 ""
+;; region5 = 77 ""
;; region6 = 65 ""
-;; region7 = 210 ""
-;; region8 = 121 ""
-;; region9 = 175 ""
-;; region10 = 115 ""
-;; region11 = 137 ""
+;; region7 = 238 ""
+;; region8 = 71 ""
+;; region9 = 115 ""
+;; region10 = 176 ""
+;; region11 = 245 ""
;; region12 = 135 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -106,7 +106,7 @@
;; region2 = 250 ""
;; region3 = 196 ""
;; region4 = 206 ""
-;; region5 = 175 ""
+;; region5 = 115 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/funcref-in-gc-heap-new.wat b/tests/disas/gc/drc/funcref-in-gc-heap-new.wat
index 302ee00f24..ad886b0ed9 100644
--- a/tests/disas/gc/drc/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/drc/funcref-in-gc-heap-new.wat
@@ -14,7 +14,7 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 130 ""
-;; region3 = 6 ""
+;; region3 = 134 ""
;; region4 = 196 ""
;; region5 = 147 ""
;; region6 = 135 ""
diff --git a/tests/disas/gc/drc/ref-cast.wat b/tests/disas/gc/drc/ref-cast.wat
index d5c239dba3..b2de063e53 100644
--- a/tests/disas/gc/drc/ref-cast.wat
+++ b/tests/disas/gc/drc/ref-cast.wat
@@ -13,10 +13,10 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/ref-test-array.wat b/tests/disas/gc/drc/ref-test-array.wat
index 48125ed28c..e61bb2ebb2 100644
--- a/tests/disas/gc/drc/ref-test-array.wat
+++ b/tests/disas/gc/drc/ref-test-array.wat
@@ -12,7 +12,7 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/ref-test-concrete-func-type.wat b/tests/disas/gc/drc/ref-test-concrete-func-type.wat
index 3897b1845d..144c899135 100644
--- a/tests/disas/gc/drc/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/drc/ref-test-concrete-func-type.wat
@@ -12,8 +12,7 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 130 ""
-;; region3 = 6 ""
-;; region4 = 106 ""
+;; region3 = 134 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -29,7 +28,7 @@
;; @0020 jump block3
;;
;; block3:
-;; @0020 v9 = load.i32 notrap aligned readonly region4 v2+16
+;; @0020 v9 = load.i32 notrap aligned readonly region1 v2+16
;; @0020 v7 = load.i64 notrap aligned readonly can_move region2 v0+40
;; @0020 v8 = load.i32 notrap aligned readonly can_move region3 v7
;; @0020 v10 = icmp eq v9, v8
diff --git a/tests/disas/gc/drc/ref-test-concrete-type.wat b/tests/disas/gc/drc/ref-test-concrete-type.wat
index 3e615dfeb3..76dabbebd6 100644
--- a/tests/disas/gc/drc/ref-test-concrete-type.wat
+++ b/tests/disas/gc/drc/ref-test-concrete-type.wat
@@ -13,10 +13,10 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/ref-test-eq.wat b/tests/disas/gc/drc/ref-test-eq.wat
index 35963553fd..d32ca70afc 100644
--- a/tests/disas/gc/drc/ref-test-eq.wat
+++ b/tests/disas/gc/drc/ref-test-eq.wat
@@ -12,7 +12,7 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/ref-test-struct.wat b/tests/disas/gc/drc/ref-test-struct.wat
index ba776ec0b6..5c670ce475 100644
--- a/tests/disas/gc/drc/ref-test-struct.wat
+++ b/tests/disas/gc/drc/ref-test-struct.wat
@@ -12,7 +12,7 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/struct-get.wat b/tests/disas/gc/drc/struct-get.wat
index 0b45f332a8..086f08f5d4 100644
--- a/tests/disas/gc/drc/struct-get.wat
+++ b/tests/disas/gc/drc/struct-get.wat
@@ -110,13 +110,13 @@
;; region2 = 196 ""
;; region3 = 206 ""
;; region4 = 152 ""
-;; region5 = 239 ""
+;; region5 = 77 ""
;; region6 = 65 ""
-;; region7 = 210 ""
-;; region8 = 121 ""
-;; region9 = 175 ""
-;; region10 = 115 ""
-;; region11 = 137 ""
+;; region7 = 238 ""
+;; region8 = 71 ""
+;; region9 = 115 ""
+;; region10 = 176 ""
+;; region11 = 245 ""
;; region12 = 135 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/gc/drc/struct-new-default.wat b/tests/disas/gc/drc/struct-new-default.wat
index 2f86137248..53d5e381da 100644
--- a/tests/disas/gc/drc/struct-new-default.wat
+++ b/tests/disas/gc/drc/struct-new-default.wat
@@ -15,13 +15,13 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 130 ""
-;; region3 = 6 ""
+;; region3 = 134 ""
;; region4 = 196 ""
;; region5 = 147 ""
;; region6 = 225 ""
;; region7 = 152 ""
;; region8 = 206 ""
-;; region9 = 175 ""
+;; region9 = 115 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/drc/struct-new.wat b/tests/disas/gc/drc/struct-new.wat
index 53e0ef4ded..ffb7d5a009 100644
--- a/tests/disas/gc/drc/struct-new.wat
+++ b/tests/disas/gc/drc/struct-new.wat
@@ -16,13 +16,13 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 130 ""
-;; region3 = 6 ""
+;; region3 = 134 ""
;; region4 = 196 ""
;; region5 = 147 ""
;; region6 = 225 ""
;; region7 = 152 ""
;; region8 = 206 ""
-;; region9 = 175 ""
+;; region9 = 115 ""
;; region10 = 135 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/gc/drc/struct-set.wat b/tests/disas/gc/drc/struct-set.wat
index 7b86c75889..3c4389e239 100644
--- a/tests/disas/gc/drc/struct-set.wat
+++ b/tests/disas/gc/drc/struct-set.wat
@@ -77,7 +77,7 @@
;; region2 = 196 ""
;; region3 = 206 ""
;; region4 = 152 ""
-;; region5 = 175 ""
+;; region5 = 115 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/issue-14452.wat b/tests/disas/gc/issue-14452.wat
index ae441653de..28fa5a1c15 100644
--- a/tests/disas/gc/issue-14452.wat
+++ b/tests/disas/gc/issue-14452.wat
@@ -32,19 +32,19 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
-;; region11 = 21 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
+;; region11 = 106 ""
;; region12 = 229 ""
;; region13 = 96 ""
-;; region14 = 25 ""
-;; region15 = 68 ""
+;; region14 = 42 ""
+;; region15 = 174 ""
;; region16 = 135 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/gc/null/alias-region-header.wat b/tests/disas/gc/null/alias-region-header.wat
index 5d8562cb28..4181985971 100644
--- a/tests/disas/gc/null/alias-region-header.wat
+++ b/tests/disas/gc/null/alias-region-header.wat
@@ -27,13 +27,13 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 237 ""
+;; region3 = 177 ""
;; region4 = 206 ""
;; region5 = 196 ""
;; region6 = 130 ""
-;; region7 = 6 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
+;; region7 = 134 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
;; region10 = 147 ""
;; region11 = 108 ""
;; region12 = 135 ""
diff --git a/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat b/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat
index e83c0df2d7..b43279f30c 100644
--- a/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat
+++ b/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat
@@ -16,13 +16,13 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 237 ""
+;; region3 = 177 ""
;; region4 = 206 ""
;; region5 = 196 ""
;; region6 = 130 ""
-;; region7 = 6 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
+;; region7 = 134 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
;; region10 = 108 ""
;; region11 = 5 ""
;; region12 = 135 ""
diff --git a/tests/disas/gc/null/array-new-fixed.wat b/tests/disas/gc/null/array-new-fixed.wat
index f186f1bf3a..85ab516b33 100644
--- a/tests/disas/gc/null/array-new-fixed.wat
+++ b/tests/disas/gc/null/array-new-fixed.wat
@@ -13,13 +13,13 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 237 ""
+;; region3 = 177 ""
;; region4 = 206 ""
;; region5 = 196 ""
;; region6 = 130 ""
-;; region7 = 6 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
+;; region7 = 134 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
;; region10 = 108 ""
;; region11 = 5 ""
;; gv0 = vmctx
diff --git a/tests/disas/gc/null/array-new.wat b/tests/disas/gc/null/array-new.wat
index 96219cda54..55cccaf921 100644
--- a/tests/disas/gc/null/array-new.wat
+++ b/tests/disas/gc/null/array-new.wat
@@ -13,13 +13,13 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 237 ""
+;; region3 = 177 ""
;; region4 = 206 ""
;; region5 = 196 ""
;; region6 = 130 ""
-;; region7 = 6 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
+;; region7 = 134 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
;; region10 = 108 ""
;; region11 = 5 ""
;; gv0 = vmctx
diff --git a/tests/disas/gc/null/br-on-cast-fail.wat b/tests/disas/gc/null/br-on-cast-fail.wat
index 7446c9533a..befb54c6c6 100644
--- a/tests/disas/gc/null/br-on-cast-fail.wat
+++ b/tests/disas/gc/null/br-on-cast-fail.wat
@@ -21,12 +21,12 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
-;; region8 = 25 ""
-;; region9 = 68 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
+;; region8 = 42 ""
+;; region9 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/br-on-cast.wat b/tests/disas/gc/null/br-on-cast.wat
index e950dc64e4..951f8cce4b 100644
--- a/tests/disas/gc/null/br-on-cast.wat
+++ b/tests/disas/gc/null/br-on-cast.wat
@@ -21,12 +21,12 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
-;; region8 = 25 ""
-;; region9 = 68 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
+;; region8 = 42 ""
+;; region9 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/call-indirect-and-subtyping.wat b/tests/disas/gc/null/call-indirect-and-subtyping.wat
index 1c1ccb392d..97b32b9eef 100644
--- a/tests/disas/gc/null/call-indirect-and-subtyping.wat
+++ b/tests/disas/gc/null/call-indirect-and-subtyping.wat
@@ -22,10 +22,9 @@
;; region2 = 93 ""
;; region3 = 117 ""
;; region4 = 130 ""
-;; region5 = 6 ""
-;; region6 = 106 ""
-;; region7 = 116 ""
-;; region8 = 60 ""
+;; region5 = 134 ""
+;; region6 = 120 ""
+;; region7 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -57,7 +56,7 @@
;; @005c jump block3(v18)
;;
;; block3(v15: i64):
-;; @005c v21 = load.i32 user7 aligned readonly region6 v15+16
+;; @005c v21 = load.i32 user7 aligned readonly region1 v15+16
;; @005c v19 = load.i64 notrap aligned readonly can_move region4 v0+40
;; @005c v20 = load.i32 notrap aligned readonly can_move region5 v19
;; @005c v22 = icmp eq v21, v20
@@ -70,8 +69,8 @@
;;
;; block5(v25: i32):
;; @005c trapz v25, user8
-;; @005c v26 = load.i64 notrap aligned readonly region7 v15+8
-;; @005c v27 = load.i64 notrap aligned readonly region8 v15+24
+;; @005c v26 = load.i64 notrap aligned readonly region6 v15+8
+;; @005c v27 = load.i64 notrap aligned readonly region7 v15+24
;; @005c call_indirect sig0, v26(v27, v0)
;; @005f jump block1
;;
diff --git a/tests/disas/gc/null/funcref-in-gc-heap-new.wat b/tests/disas/gc/null/funcref-in-gc-heap-new.wat
index 9bf4a91c1c..6d817cedd0 100644
--- a/tests/disas/gc/null/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/null/funcref-in-gc-heap-new.wat
@@ -13,13 +13,13 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 237 ""
+;; region3 = 177 ""
;; region4 = 206 ""
;; region5 = 196 ""
;; region6 = 130 ""
-;; region7 = 6 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
+;; region7 = 134 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
;; region10 = 147 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/gc/null/ref-cast.wat b/tests/disas/gc/null/ref-cast.wat
index be12caff53..dab2054073 100644
--- a/tests/disas/gc/null/ref-cast.wat
+++ b/tests/disas/gc/null/ref-cast.wat
@@ -13,10 +13,10 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/ref-test-array.wat b/tests/disas/gc/null/ref-test-array.wat
index 51a1a1bf51..6581a110cd 100644
--- a/tests/disas/gc/null/ref-test-array.wat
+++ b/tests/disas/gc/null/ref-test-array.wat
@@ -12,7 +12,7 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/ref-test-concrete-func-type.wat b/tests/disas/gc/null/ref-test-concrete-func-type.wat
index 0e37ba601c..0eb97d9342 100644
--- a/tests/disas/gc/null/ref-test-concrete-func-type.wat
+++ b/tests/disas/gc/null/ref-test-concrete-func-type.wat
@@ -12,8 +12,7 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 130 ""
-;; region3 = 6 ""
-;; region4 = 106 ""
+;; region3 = 134 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -29,7 +28,7 @@
;; @0020 jump block3
;;
;; block3:
-;; @0020 v9 = load.i32 notrap aligned readonly region4 v2+16
+;; @0020 v9 = load.i32 notrap aligned readonly region1 v2+16
;; @0020 v7 = load.i64 notrap aligned readonly can_move region2 v0+40
;; @0020 v8 = load.i32 notrap aligned readonly can_move region3 v7
;; @0020 v10 = icmp eq v9, v8
diff --git a/tests/disas/gc/null/ref-test-concrete-type.wat b/tests/disas/gc/null/ref-test-concrete-type.wat
index 81ff1790d7..22ae83f81e 100644
--- a/tests/disas/gc/null/ref-test-concrete-type.wat
+++ b/tests/disas/gc/null/ref-test-concrete-type.wat
@@ -13,10 +13,10 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/ref-test-eq.wat b/tests/disas/gc/null/ref-test-eq.wat
index 1b818b436a..d8833e3211 100644
--- a/tests/disas/gc/null/ref-test-eq.wat
+++ b/tests/disas/gc/null/ref-test-eq.wat
@@ -12,7 +12,7 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/ref-test-struct.wat b/tests/disas/gc/null/ref-test-struct.wat
index 1c7c872898..788485b7ec 100644
--- a/tests/disas/gc/null/ref-test-struct.wat
+++ b/tests/disas/gc/null/ref-test-struct.wat
@@ -12,7 +12,7 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/null/struct-new-default.wat b/tests/disas/gc/null/struct-new-default.wat
index bf8ff3fc69..29ad75f12a 100644
--- a/tests/disas/gc/null/struct-new-default.wat
+++ b/tests/disas/gc/null/struct-new-default.wat
@@ -15,13 +15,13 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 237 ""
+;; region3 = 177 ""
;; region4 = 206 ""
;; region5 = 196 ""
;; region6 = 130 ""
-;; region7 = 6 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
+;; region7 = 134 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
;; region10 = 147 ""
;; region11 = 225 ""
;; region12 = 152 ""
diff --git a/tests/disas/gc/null/struct-new.wat b/tests/disas/gc/null/struct-new.wat
index 5a482f134d..2c9ea8eaad 100644
--- a/tests/disas/gc/null/struct-new.wat
+++ b/tests/disas/gc/null/struct-new.wat
@@ -16,13 +16,13 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 237 ""
+;; region3 = 177 ""
;; region4 = 206 ""
;; region5 = 196 ""
;; region6 = 130 ""
-;; region7 = 6 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
+;; region7 = 134 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
;; region10 = 147 ""
;; region11 = 225 ""
;; region12 = 152 ""
diff --git a/tests/disas/gc/ref-test-cast-final-type.wat b/tests/disas/gc/ref-test-cast-final-type.wat
index 1d85da7a1c..94b949a98c 100644
--- a/tests/disas/gc/ref-test-cast-final-type.wat
+++ b/tests/disas/gc/ref-test-cast-final-type.wat
@@ -19,10 +19,10 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -73,10 +73,10 @@
;; region1 = 160 ""
;; region2 = 196 ""
;; region3 = 206 ""
-;; region4 = 239 ""
+;; region4 = 77 ""
;; region5 = 130 ""
-;; region6 = 6 ""
-;; region7 = 134 ""
+;; region6 = 134 ""
+;; region7 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/gc/struct-new-default.wat b/tests/disas/gc/struct-new-default.wat
index fa16643557..b40dbb77b6 100644
--- a/tests/disas/gc/struct-new-default.wat
+++ b/tests/disas/gc/struct-new-default.wat
@@ -16,14 +16,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 147 ""
;; region12 = 225 ""
;; region13 = 152 ""
diff --git a/tests/disas/gc/struct-new.wat b/tests/disas/gc/struct-new.wat
index 4de40ebf07..757a858e68 100644
--- a/tests/disas/gc/struct-new.wat
+++ b/tests/disas/gc/struct-new.wat
@@ -16,14 +16,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 65 ""
-;; region3 = 177 ""
-;; region4 = 98 ""
+;; region3 = 210 ""
+;; region4 = 115 ""
;; region5 = 130 ""
-;; region6 = 6 ""
+;; region6 = 134 ""
;; region7 = 196 ""
-;; region8 = 239 ""
-;; region9 = 134 ""
-;; region10 = 90 ""
+;; region8 = 77 ""
+;; region9 = 87 ""
+;; region10 = 175 ""
;; region11 = 147 ""
;; region12 = 225 ""
;; region13 = 152 ""
diff --git a/tests/disas/gc/typed-select-and-stack-maps.wat b/tests/disas/gc/typed-select-and-stack-maps.wat
index 5a8f75b574..13a3dca7af 100644
--- a/tests/disas/gc/typed-select-and-stack-maps.wat
+++ b/tests/disas/gc/typed-select-and-stack-maps.wat
@@ -43,8 +43,8 @@
;; ss0 = explicit_slot 4, align = 4
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 68 ""
+;; region2 = 42 ""
+;; region3 = 174 ""
;; region4 = 135 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -73,8 +73,8 @@
;; function u0:1(i64 vmctx, i64, i32, i32, i32) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 68 ""
+;; region2 = 42 ""
+;; region3 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/global-get.wat b/tests/disas/global-get.wat
index 9d324da7b2..1ce7881cf0 100644
--- a/tests/disas/global-get.wat
+++ b/tests/disas/global-get.wat
@@ -33,7 +33,7 @@
;; function u0:0(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 44 ""
+;; region2 = 57 ""
;; region3 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -52,7 +52,7 @@
;; function u0:1(i64 vmctx, i64) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 44 ""
+;; region2 = 57 ""
;; region3 = 87 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/icall-loop.wat b/tests/disas/icall-loop.wat
index 7ce1f2ff8e..e62e4f8342 100644
--- a/tests/disas/icall-loop.wat
+++ b/tests/disas/icall-loop.wat
@@ -28,10 +28,9 @@
;; region2 = 93 ""
;; region3 = 117 ""
;; region4 = 130 ""
-;; region5 = 6 ""
-;; region6 = 106 ""
-;; region7 = 116 ""
-;; region8 = 60 ""
+;; region5 = 134 ""
+;; region6 = 120 ""
+;; region7 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -68,11 +67,11 @@
;; @002b jump block5(v19)
;;
;; block5(v16: i64):
-;; @002b v22 = load.i32 user7 aligned readonly region6 v16+16
+;; @002b v22 = load.i32 user7 aligned readonly region1 v16+16
;; @002b v23 = icmp eq v22, v21
;; @002b trapz v23, user8
-;; @002b v25 = load.i64 notrap aligned readonly region7 v16+8
-;; @002b v26 = load.i64 notrap aligned readonly region8 v16+24
+;; @002b v25 = load.i64 notrap aligned readonly region6 v16+8
+;; @002b v26 = load.i64 notrap aligned readonly region7 v16+24
;; @002b v27 = call_indirect sig0, v25(v26, v0)
;; @002e jump block2
;; }
@@ -83,10 +82,9 @@
;; region2 = 93 ""
;; region3 = 117 ""
;; region4 = 130 ""
-;; region5 = 6 ""
-;; region6 = 106 ""
-;; region7 = 116 ""
-;; region8 = 60 ""
+;; region5 = 134 ""
+;; region6 = 120 ""
+;; region7 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -120,11 +118,11 @@
;; @0038 jump block5(v18)
;;
;; block5(v15: i64):
-;; @0038 v21 = load.i32 user7 aligned readonly region6 v15+16
+;; @0038 v21 = load.i32 user7 aligned readonly region1 v15+16
;; @0038 v22 = icmp eq v21, v20
;; @0038 trapz v22, user8
-;; @0038 v24 = load.i64 notrap aligned readonly region7 v15+8
-;; @0038 v25 = load.i64 notrap aligned readonly region8 v15+24
+;; @0038 v24 = load.i64 notrap aligned readonly region6 v15+8
+;; @0038 v25 = load.i64 notrap aligned readonly region7 v15+24
;; @0038 v26 = call_indirect sig0, v24(v25, v0)
;; @003b jump block2
;; }
diff --git a/tests/disas/icall-simd.wat b/tests/disas/icall-simd.wat
index c09643a28d..a5f396e73e 100644
--- a/tests/disas/icall-simd.wat
+++ b/tests/disas/icall-simd.wat
@@ -14,10 +14,9 @@
;; region2 = 93 ""
;; region3 = 117 ""
;; region4 = 130 ""
-;; region5 = 6 ""
-;; region6 = 106 ""
-;; region7 = 116 ""
-;; region8 = 60 ""
+;; region5 = 134 ""
+;; region6 = 120 ""
+;; region7 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,12 +49,12 @@
;; block3(v16: i64):
;; @0033 v20 = load.i64 notrap aligned readonly can_move region4 v0+40
;; @0033 v21 = load.i32 notrap aligned readonly can_move region5 v20
-;; @0033 v22 = load.i32 user7 aligned readonly region6 v16+16
+;; @0033 v22 = load.i32 user7 aligned readonly region1 v16+16
;; @0033 v23 = icmp eq v22, v21
;; @0033 v24 = uextend.i32 v23
;; @0033 trapz v24, user8
-;; @0033 v25 = load.i64 notrap aligned readonly region7 v16+8
-;; @0033 v26 = load.i64 notrap aligned readonly region8 v16+24
+;; @0033 v25 = load.i64 notrap aligned readonly region6 v16+8
+;; @0033 v26 = load.i64 notrap aligned readonly region7 v16+24
;; @0033 v27 = call_indirect sig0, v25(v26, v0, v3)
;; @0036 jump block1
;;
diff --git a/tests/disas/icall.wat b/tests/disas/icall.wat
index 3fff7193e4..3f40285704 100644
--- a/tests/disas/icall.wat
+++ b/tests/disas/icall.wat
@@ -14,10 +14,9 @@
;; region2 = 93 ""
;; region3 = 117 ""
;; region4 = 130 ""
-;; region5 = 6 ""
-;; region6 = 106 ""
-;; region7 = 116 ""
-;; region8 = 60 ""
+;; region5 = 134 ""
+;; region6 = 120 ""
+;; region7 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -50,12 +49,12 @@
;; block3(v16: i64):
;; @0033 v20 = load.i64 notrap aligned readonly can_move region4 v0+40
;; @0033 v21 = load.i32 notrap aligned readonly can_move region5 v20
-;; @0033 v22 = load.i32 user7 aligned readonly region6 v16+16
+;; @0033 v22 = load.i32 user7 aligned readonly region1 v16+16
;; @0033 v23 = icmp eq v22, v21
;; @0033 v24 = uextend.i32 v23
;; @0033 trapz v24, user8
-;; @0033 v25 = load.i64 notrap aligned readonly region7 v16+8
-;; @0033 v26 = load.i64 notrap aligned readonly region8 v16+24
+;; @0033 v25 = load.i64 notrap aligned readonly region6 v16+8
+;; @0033 v26 = load.i64 notrap aligned readonly region7 v16+24
;; @0033 v27 = call_indirect sig0, v25(v26, v0, v3)
;; @0036 jump block1
;;
diff --git a/tests/disas/indirect-call-no-caching.wat b/tests/disas/indirect-call-no-caching.wat
index 83ff5f9e84..10f0a2c5a2 100644
--- a/tests/disas/indirect-call-no-caching.wat
+++ b/tests/disas/indirect-call-no-caching.wat
@@ -74,10 +74,9 @@
;; region2 = 93 ""
;; region3 = 117 ""
;; region4 = 130 ""
-;; region5 = 6 ""
-;; region6 = 106 ""
-;; region7 = 116 ""
-;; region8 = 60 ""
+;; region5 = 134 ""
+;; region6 = 120 ""
+;; region7 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -110,12 +109,12 @@
;; block3(v15: i64):
;; @0050 v19 = load.i64 notrap aligned readonly can_move region4 v0+40
;; @0050 v20 = load.i32 notrap aligned readonly can_move region5 v19
-;; @0050 v21 = load.i32 user7 aligned readonly region6 v15+16
+;; @0050 v21 = load.i32 user7 aligned readonly region1 v15+16
;; @0050 v22 = icmp eq v21, v20
;; @0050 v23 = uextend.i32 v22
;; @0050 trapz v23, user8
-;; @0050 v24 = load.i64 notrap aligned readonly region7 v15+8
-;; @0050 v25 = load.i64 notrap aligned readonly region8 v15+24
+;; @0050 v24 = load.i64 notrap aligned readonly region6 v15+8
+;; @0050 v25 = load.i64 notrap aligned readonly region7 v15+24
;; @0050 v26 = call_indirect sig0, v24(v25, v0)
;; @0053 jump block1
;;
diff --git a/tests/disas/memory-copy-epochs.wat b/tests/disas/memory-copy-epochs.wat
index fcb83afe67..9fa6e2bc32 100644
--- a/tests/disas/memory-copy-epochs.wat
+++ b/tests/disas/memory-copy-epochs.wat
@@ -12,7 +12,7 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 235 ""
-;; region3 = 18 ""
+;; region3 = 6 ""
;; region4 = 109 ""
;; region5 = 215 ""
;; region6 = 105 ""
diff --git a/tests/disas/memory-min-max-same.wat b/tests/disas/memory-min-max-same.wat
index 439e68f586..d9fe386559 100644
--- a/tests/disas/memory-min-max-same.wat
+++ b/tests/disas/memory-min-max-same.wat
@@ -36,8 +36,8 @@
;; function u0:0(i64 vmctx, i64, i32) tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 25 ""
-;; region3 = 68 ""
+;; region2 = 42 ""
+;; region3 = 174 ""
;; region4 = 215 ""
;; region5 = 105 ""
;; region6 = 171 ""
diff --git a/tests/disas/pic.wat b/tests/disas/pic.wat
index c95162d5c1..5c87d28346 100644
--- a/tests/disas/pic.wat
+++ b/tests/disas/pic.wat
@@ -76,8 +76,8 @@
;; region3 = 215 ""
;; region4 = 105 ""
;; region5 = 171 ""
-;; region6 = 25 ""
-;; region7 = 68 ""
+;; region6 = 42 ""
+;; region7 = 174 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
diff --git a/tests/disas/readonly-funcrefs.wat b/tests/disas/readonly-funcrefs.wat
index 1eee75d24c..d272af04bc 100644
--- a/tests/disas/readonly-funcrefs.wat
+++ b/tests/disas/readonly-funcrefs.wat
@@ -39,10 +39,9 @@
;; region2 = 93 ""
;; region3 = 117 ""
;; region4 = 130 ""
-;; region5 = 6 ""
-;; region6 = 106 ""
-;; region7 = 116 ""
-;; region8 = 60 ""
+;; region5 = 134 ""
+;; region6 = 120 ""
+;; region7 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -72,13 +71,13 @@
;; @0031 jump block3(v18)
;;
;; block3(v15: i64):
-;; @0031 v21 = load.i32 user7 aligned readonly region6 v15+16
+;; @0031 v21 = load.i32 user7 aligned readonly region1 v15+16
;; @0031 v19 = load.i64 notrap aligned readonly can_move region4 v0+40
;; @0031 v20 = load.i32 notrap aligned readonly can_move region5 v19
;; @0031 v22 = icmp eq v21, v20
;; @0031 trapz v22, user8
-;; @0031 v24 = load.i64 notrap aligned readonly region7 v15+8
-;; @0031 v25 = load.i64 notrap aligned readonly region8 v15+24
+;; @0031 v24 = load.i64 notrap aligned readonly region6 v15+8
+;; @0031 v25 = load.i64 notrap aligned readonly region7 v15+24
;; @0031 call_indirect sig0, v24(v25, v0)
;; @0034 jump block1
;;
diff --git a/tests/disas/riscv64-component-builtins.wat b/tests/disas/riscv64-component-builtins.wat
index 4dec521ad3..efeb97057e 100644
--- a/tests/disas/riscv64-component-builtins.wat
+++ b/tests/disas/riscv64-component-builtins.wat
@@ -14,11 +14,11 @@
;; region0 = 123 ""
;; region1 = 85 ""
;; region2 = 72 ""
-;; region3 = 38 ""
-;; region4 = 245 ""
-;; region5 = 117 ""
+;; region3 = 17 ""
+;; region4 = 99 ""
+;; region5 = 112 ""
;; region6 = 12 ""
-;; region7 = 184 ""
+;; region7 = 122 ""
;; sig0 = (i64 sext, i32 sext, i32 sext, i32 sext) -> i64 sext system_v
;; sig1 = (i64 sext vmctx) system_v
;;
diff --git a/tests/disas/stack-switching/resume-suspend-data-passing.wat b/tests/disas/stack-switching/resume-suspend-data-passing.wat
index 6a35fbafb4..ede3a6ebd0 100644
--- a/tests/disas/stack-switching/resume-suspend-data-passing.wat
+++ b/tests/disas/stack-switching/resume-suspend-data-passing.wat
@@ -42,15 +42,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 106 ""
-;; region3 = 206 ""
-;; region4 = 214 ""
-;; region5 = 13 ""
-;; region6 = 55 ""
-;; region7 = 26 ""
-;; region8 = 118 ""
-;; region9 = 82 ""
-;; region10 = 255 ""
-;; region11 = 221 ""
+;; region3 = 125 ""
+;; region4 = 139 ""
+;; region5 = 234 ""
+;; region6 = 82 ""
+;; region7 = 192 ""
+;; region8 = 145 ""
+;; region9 = 144 ""
+;; region10 = 124 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -123,15 +122,15 @@
;; @0044 store notrap aligned region8 v91, v93+4 ; v91 = 1
;; @0044 store.i64 notrap aligned region4 v34, v93+8
;; @0044 store.i32 notrap aligned region6 v4, v34
-;; @0044 store notrap aligned region9 v91, v93 ; v91 = 1
+;; @0044 store notrap aligned region4 v91, v93 ; v91 = 1
;; v94 = iconst.i32 3
-;; @0044 store notrap aligned region10 v94, v9+32 ; v94 = 3
+;; @0044 store notrap aligned region9 v94, v9+32 ; v94 = 3
;; v95 = iconst.i64 0
;; @0044 store notrap aligned region3 v95, v11+88 ; v95 = 0
;; @0044 store notrap aligned region3 v95, v11+96 ; v95 = 0
;; v96 = iconst.i64 120
;; v97 = iadd.i64 v11, v96 ; v96 = 120
-;; @0044 v49 = load.i64 notrap aligned region11 v97
+;; @0044 v49 = load.i64 notrap aligned region10 v97
;; v98 = iconst.i64 -24
;; v99 = iadd v49, v98 ; v98 = -24
;; @0044 v45 = uextend.i64 v21
@@ -148,7 +147,7 @@
;; @0044 v59 = load.i64 notrap aligned region4 v93+8
;; @0044 v60 = load.i32 notrap aligned region6 v59
;; v110 = iconst.i32 0
-;; @0044 store notrap aligned region9 v110, v93 ; v110 = 0
+;; @0044 store notrap aligned region4 v110, v93 ; v110 = 0
;; @0044 store notrap aligned region8 v110, v93+4 ; v110 = 0
;; v111 = iconst.i64 0
;; @0044 store notrap aligned region4 v111, v93+8 ; v111 = 0
@@ -160,7 +159,7 @@
;; block11:
;; @0044 v66 = load.i64 notrap aligned region4 v93+8
;; v106 = iconst.i32 0
-;; @0044 store notrap aligned region9 v106, v93 ; v106 = 0
+;; @0044 store notrap aligned region4 v106, v93 ; v106 = 0
;; @0044 store notrap aligned region8 v106, v93+4 ; v106 = 0
;; v107 = iconst.i64 0
;; @0044 store notrap aligned region4 v107, v93+8 ; v107 = 0
@@ -182,23 +181,23 @@
;; ss0 = explicit_slot 8, align = 8
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 28 ""
-;; region3 = 26 ""
+;; region2 = 191 ""
+;; region3 = 192 ""
;; region4 = 106 ""
-;; region5 = 206 ""
-;; region6 = 255 ""
+;; region5 = 125 ""
+;; region6 = 144 ""
;; region7 = 231 ""
;; region8 = 243 ""
;; region9 = 209 ""
-;; region10 = 23 ""
-;; region11 = 224 ""
-;; region12 = 13 ""
-;; region13 = 179 ""
-;; region14 = 118 ""
-;; region15 = 214 ""
-;; region16 = 55 ""
-;; region17 = 82 ""
-;; region18 = 221 ""
+;; region10 = 100 ""
+;; region11 = 176 ""
+;; region12 = 62 ""
+;; region13 = 198 ""
+;; region14 = 145 ""
+;; region15 = 139 ""
+;; region16 = 82 ""
+;; region17 = 234 ""
+;; region18 = 124 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -290,8 +289,8 @@
;; @0062 store.i64 notrap aligned region15 v52, v155+8
;; v156 = iadd.i64 v0, v53 ; v53 = 48
;; @0062 store notrap aligned region16 v156, v52
-;; @0062 store notrap aligned region17 v152, v155 ; v152 = 1
-;; @0062 store notrap aligned region12 v152, v28+56 ; v152 = 1
+;; @0062 store notrap aligned region15 v152, v155 ; v152 = 1
+;; @0062 store notrap aligned region17 v152, v28+56 ; v152 = 1
;; v157 = iconst.i64 120
;; v158 = iadd v25, v157 ; v157 = 120
;; @0062 v63 = load.i64 notrap aligned region18 v158
@@ -305,10 +304,10 @@
;; @0062 store notrap aligned region4 v28, v26+96
;; @0062 store notrap aligned region6 v152, v28+32 ; v152 = 1
;; v162 = iconst.i32 0
-;; @0062 store notrap aligned region17 v162, v155 ; v162 = 0
+;; @0062 store notrap aligned region15 v162, v155 ; v162 = 0
;; @0062 store notrap aligned region14 v162, v155+4 ; v162 = 0
;; @0062 store notrap aligned region15 v150, v155+8 ; v150 = 0
-;; @0062 store notrap aligned region12 v150, v28+56 ; v150 = 0
+;; @0062 store notrap aligned region17 v150, v28+56 ; v150 = 0
;; @0062 brif v66, block9, block6
;;
;; block9:
@@ -332,13 +331,13 @@
;; v174 = iconst.i32 0
;; v175 = iconst.i64 144
;; v176 = iadd.i64 v69, v175 ; v175 = 144
-;; @0062 store notrap aligned region17 v174, v176 ; v174 = 0
+;; @0062 store notrap aligned region15 v174, v176 ; v174 = 0
;; @0062 store notrap aligned region14 v174, v176+4 ; v174 = 0
;; v177 = iconst.i64 0
;; @0062 store notrap aligned region15 v177, v176+8 ; v177 = 0
;; v178 = iconst.i64 168
;; v179 = iadd.i64 v69, v178 ; v178 = 168
-;; @0062 store notrap aligned region17 v174, v179 ; v174 = 0
+;; @0062 store notrap aligned region15 v174, v179 ; v174 = 0
;; @0062 store notrap aligned region14 v174, v179+4 ; v174 = 0
;; @0062 store notrap aligned region15 v177, v179+8 ; v177 = 0
;; @0062 try_call fn2(v0), sig2, block11, [ context v0 ]
@@ -373,7 +372,7 @@
;; @0062 v121 = load.i64 notrap aligned region15 v170+8
;; @0062 v122 = load.i32 notrap aligned region16 v121
;; v171 = iconst.i32 0
-;; @0062 store notrap aligned region17 v171, v170 ; v171 = 0
+;; @0062 store notrap aligned region15 v171, v170 ; v171 = 0
;; @0062 jump block4
;;
;; block10:
@@ -395,7 +394,7 @@
;; @0062 v134 = iadd.i64 v69, v133 ; v133 = 144
;; @0062 v135 = load.i64 notrap aligned region15 v134+8
;; v163 = iconst.i32 0
-;; @0062 store notrap aligned region17 v163, v134 ; v163 = 0
+;; @0062 store notrap aligned region15 v163, v134 ; v163 = 0
;; @0062 store notrap aligned region14 v163, v134+4 ; v163 = 0
;; v164 = iconst.i64 0
;; @0062 store notrap aligned region15 v164, v134+8 ; v164 = 0
diff --git a/tests/disas/stack-switching/resume-suspend.wat b/tests/disas/stack-switching/resume-suspend.wat
index de6f00a38f..24fb61d3a3 100644
--- a/tests/disas/stack-switching/resume-suspend.wat
+++ b/tests/disas/stack-switching/resume-suspend.wat
@@ -27,15 +27,14 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 106 ""
-;; region3 = 206 ""
-;; region4 = 214 ""
-;; region5 = 13 ""
-;; region6 = 55 ""
-;; region7 = 26 ""
-;; region8 = 118 ""
-;; region9 = 255 ""
-;; region10 = 221 ""
-;; region11 = 82 ""
+;; region3 = 125 ""
+;; region4 = 139 ""
+;; region5 = 234 ""
+;; region6 = 82 ""
+;; region7 = 192 ""
+;; region8 = 145 ""
+;; region9 = 144 ""
+;; region10 = 124 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -121,7 +120,7 @@
;; @003b v54 = load.i64 notrap aligned region4 v87+8
;; @003b v55 = load.i32 notrap aligned region6 v54
;; v88 = iconst.i32 0
-;; @003b store notrap aligned region11 v88, v87 ; v88 = 0
+;; @003b store notrap aligned region4 v88, v87 ; v88 = 0
;; @003b store notrap aligned region8 v88, v87+4 ; v88 = 0
;; v89 = iconst.i64 0
;; @003b store notrap aligned region4 v89, v87+8 ; v89 = 0
@@ -134,7 +133,7 @@
;; v84 = iadd.i64 v6, v28 ; v28 = 168
;; @003b v61 = load.i64 notrap aligned region4 v84+8
;; v85 = iconst.i32 0
-;; @003b store notrap aligned region11 v85, v84 ; v85 = 0
+;; @003b store notrap aligned region4 v85, v84 ; v85 = 0
;; @003b store notrap aligned region8 v85, v84+4 ; v85 = 0
;; v86 = iconst.i64 0
;; @003b store notrap aligned region4 v86, v84+8 ; v86 = 0
@@ -148,23 +147,23 @@
;; ss0 = explicit_slot 8, align = 8
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 28 ""
-;; region3 = 26 ""
+;; region2 = 191 ""
+;; region3 = 192 ""
;; region4 = 106 ""
-;; region5 = 206 ""
-;; region6 = 255 ""
+;; region5 = 125 ""
+;; region6 = 144 ""
;; region7 = 231 ""
;; region8 = 243 ""
;; region9 = 209 ""
-;; region10 = 23 ""
-;; region11 = 224 ""
-;; region12 = 13 ""
-;; region13 = 179 ""
-;; region14 = 118 ""
-;; region15 = 214 ""
-;; region16 = 55 ""
-;; region17 = 82 ""
-;; region18 = 221 ""
+;; region10 = 100 ""
+;; region11 = 176 ""
+;; region12 = 62 ""
+;; region13 = 198 ""
+;; region14 = 145 ""
+;; region15 = 139 ""
+;; region16 = 82 ""
+;; region17 = 234 ""
+;; region18 = 124 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -240,8 +239,8 @@
;; @004e v59 = iconst.i64 48
;; @004e v60 = iadd.i64 v0, v59 ; v59 = 48
;; @004e store notrap aligned region16 v60, v58
-;; @004e store notrap aligned region17 v40, v56 ; v40 = 1
-;; @004e store notrap aligned region12 v40, v34+56 ; v40 = 1
+;; @004e store notrap aligned region15 v40, v56 ; v40 = 1
+;; @004e store notrap aligned region17 v40, v34+56 ; v40 = 1
;; @004e v67 = iconst.i64 120
;; @004e v68 = iadd v31, v67 ; v67 = 120
;; @004e v69 = load.i64 notrap aligned region18 v68
@@ -255,10 +254,10 @@
;; @004e store notrap aligned region4 v34, v32+96
;; @004e store notrap aligned region6 v40, v34+32 ; v40 = 1
;; v165 = iconst.i32 0
-;; @004e store notrap aligned region17 v165, v56 ; v165 = 0
+;; @004e store notrap aligned region15 v165, v56 ; v165 = 0
;; @004e store notrap aligned region14 v165, v56+4 ; v165 = 0
;; @004e store notrap aligned region15 v2, v56+8 ; v2 = 0
-;; @004e store notrap aligned region12 v2, v34+56 ; v2 = 0
+;; @004e store notrap aligned region17 v2, v34+56 ; v2 = 0
;; @004e brif v72, block7, block4
;;
;; block7:
@@ -282,13 +281,13 @@
;; v174 = iconst.i32 0
;; v175 = iconst.i64 144
;; v176 = iadd.i64 v75, v175 ; v175 = 144
-;; @004e store notrap aligned region17 v174, v176 ; v174 = 0
+;; @004e store notrap aligned region15 v174, v176 ; v174 = 0
;; @004e store notrap aligned region14 v174, v176+4 ; v174 = 0
;; v177 = iconst.i64 0
;; @004e store notrap aligned region15 v177, v176+8 ; v177 = 0
;; v178 = iconst.i64 168
;; v179 = iadd.i64 v75, v178 ; v178 = 168
-;; @004e store notrap aligned region17 v174, v179 ; v174 = 0
+;; @004e store notrap aligned region15 v174, v179 ; v174 = 0
;; @004e store notrap aligned region14 v174, v179+4 ; v174 = 0
;; @004e store notrap aligned region15 v177, v179+8 ; v177 = 0
;; @004e try_call fn2(v0), sig2, block9, [ context v0 ]
@@ -322,7 +321,7 @@
;; @004e v126 = iadd.i64 v75, v125 ; v125 = 168
;; @004e v127 = load.i64 notrap aligned region15 v126+8
;; v171 = iconst.i32 0
-;; @004e store notrap aligned region17 v171, v126 ; v171 = 0
+;; @004e store notrap aligned region15 v171, v126 ; v171 = 0
;; @004e v120 = uextend.i128 v118
;; v172 = iconst.i64 64
;; v173 = ishl v120, v172 ; v172 = 64
@@ -349,7 +348,7 @@
;; @004e v139 = iadd.i64 v75, v138 ; v138 = 144
;; @004e v140 = load.i64 notrap aligned region15 v139+8
;; v166 = iconst.i32 0
-;; @004e store notrap aligned region17 v166, v139 ; v166 = 0
+;; @004e store notrap aligned region15 v166, v139 ; v166 = 0
;; @004e store notrap aligned region14 v166, v139+4 ; v166 = 0
;; v167 = iconst.i64 0
;; @004e store notrap aligned region15 v167, v139+8 ; v167 = 0
diff --git a/tests/disas/stack-switching/symmetric-switch.wat b/tests/disas/stack-switching/symmetric-switch.wat
index b57ef0b94a..8ed1d475e8 100644
--- a/tests/disas/stack-switching/symmetric-switch.wat
+++ b/tests/disas/stack-switching/symmetric-switch.wat
@@ -30,23 +30,23 @@
;; ss1 = explicit_slot 24, align = 8
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 28 ""
+;; region2 = 191 ""
;; region3 = 106 ""
-;; region4 = 206 ""
-;; region5 = 214 ""
-;; region6 = 13 ""
+;; region4 = 125 ""
+;; region5 = 139 ""
+;; region6 = 234 ""
;; region7 = 82 ""
-;; region8 = 55 ""
-;; region9 = 26 ""
-;; region10 = 118 ""
-;; region11 = 255 ""
-;; region12 = 231 ""
-;; region13 = 243 ""
-;; region14 = 209 ""
-;; region15 = 23 ""
-;; region16 = 224 ""
-;; region17 = 179 ""
-;; region18 = 221 ""
+;; region8 = 192 ""
+;; region9 = 145 ""
+;; region10 = 144 ""
+;; region11 = 231 ""
+;; region12 = 243 ""
+;; region13 = 209 ""
+;; region14 = 100 ""
+;; region15 = 176 ""
+;; region16 = 62 ""
+;; region17 = 198 ""
+;; region18 = 124 ""
;; region19 = 187 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
@@ -105,7 +105,7 @@
;; @003e v36 = iadd v34, v35 ; v35 = 40
;; @003e v37 = load.i64 notrap aligned region5 v36+8
;; @003e v38 = load.i32 notrap aligned region6 v34+56
-;; @003e v39 = load.i32 notrap aligned region7 v36
+;; @003e v39 = load.i32 notrap aligned region5 v36
;; @003e jump block4(v38)
;;
;; block4(v40: i32):
@@ -117,7 +117,7 @@
;; @003e v43 = imul.i32 v40, v42 ; v42 = 8
;; @003e v44 = uextend.i64 v43
;; @003e v45 = iadd.i64 v37, v44
-;; @003e v46 = load.i64 notrap aligned region8 v45
+;; @003e v46 = load.i64 notrap aligned region7 v45
;; @003e v47 = icmp eq v46, v25
;; @003e v48 = iconst.i32 1
;; @003e v49 = iadd.i32 v40, v48 ; v48 = 1
@@ -127,17 +127,17 @@
;; @003e trap user22
;;
;; block6:
-;; @003e store.i64 notrap aligned region9 v30, v28+112
+;; @003e store.i64 notrap aligned region8 v30, v28+112
;; @003e v50 = iconst.i64 168
;; @003e v51 = iadd.i64 v28, v50 ; v50 = 168
;; @003e v52 = iconst.i32 1
;; @003e v53 = stack_addr.i64 ss0
-;; @003e store notrap aligned region10 v52, v51+4 ; v52 = 1
+;; @003e store notrap aligned region9 v52, v51+4 ; v52 = 1
;; @003e store notrap aligned region5 v53, v51+8
;; @003e v54 = iconst.i64 0
;; @003e v55 = iadd.i64 v28, v54 ; v54 = 0
;; @003e v56 = iconst.i32 3
-;; @003e store notrap aligned region11 v56, v55+32 ; v56 = 3
+;; @003e store notrap aligned region10 v56, v55+32 ; v56 = 3
;; @003e v57 = iconst.i64 0
;; @003e v58 = iconst.i64 0
;; @003e store notrap aligned region4 v57, v30+88 ; v57 = 0
@@ -145,12 +145,12 @@
;; @003e v59 = load.i64 notrap aligned readonly can_move region0 v0+8
;; @003e v60 = iconst.i64 0
;; @003e v61 = iadd v55, v60 ; v60 = 0
-;; @003e v62 = load.i64 notrap aligned region12 v59+72
-;; @003e v63 = load.i64 notrap aligned region13 v59+64
-;; @003e v64 = load.i64 notrap aligned region14 v59+80
-;; @003e store notrap aligned region15 v62, v61+8
-;; @003e store notrap aligned region16 v63, v61+16
-;; @003e store notrap aligned region6 v64, v61+24
+;; @003e v62 = load.i64 notrap aligned region11 v59+72
+;; @003e v63 = load.i64 notrap aligned region12 v59+64
+;; @003e v64 = load.i64 notrap aligned region13 v59+80
+;; @003e store notrap aligned region14 v62, v61+8
+;; @003e store notrap aligned region15 v63, v61+16
+;; @003e store notrap aligned region16 v64, v61+24
;; @003e v65 = load.i64 notrap aligned region2 v28+104
;; @003e v66 = uextend.i128 v28
;; @003e v67 = uextend.i128 v65
@@ -160,7 +160,7 @@
;; @003e v71 = bor v70, v66
;; @003e v73 = iconst.i64 0
;; @003e v74 = iadd.i64 v15, v73 ; v73 = 0
-;; @003e v75 = load.i32 notrap aligned region11 v74+32
+;; @003e v75 = load.i32 notrap aligned region10 v74+32
;; @003e v76 = iconst.i32 0
;; @003e v77 = icmp ne v75, v76 ; v76 = 0
;; @003e brif v77, block9, block8
@@ -169,8 +169,8 @@
;; @003e v78 = iconst.i64 144
;; @003e v79 = iadd.i64 v15, v78 ; v78 = 144
;; @003e v80 = load.i64 notrap aligned region5 v79+8
-;; @003e v81 = load.i32 notrap aligned region7 v79
-;; @003e v82 = load.i32 notrap aligned region10 v79+4
+;; @003e v81 = load.i32 notrap aligned region5 v79
+;; @003e v82 = load.i32 notrap aligned region9 v79+4
;; @003e v83 = uextend.i64 v81
;; @003e v84 = uextend.i64 v82
;; @003e v85 = iconst.i64 1
@@ -178,7 +178,7 @@
;; @003e v87 = icmp ule v86, v84
;; @003e trapz v87, user1
;; @003e v88 = ireduce.i32 v86
-;; @003e store notrap aligned region7 v88, v79
+;; @003e store notrap aligned region5 v88, v79
;; @003e v89 = iconst.i64 16
;; @003e v90 = imul v83, v89 ; v89 = 16
;; @003e v91 = iadd v80, v90
@@ -188,8 +188,8 @@
;; @003e v92 = iconst.i64 168
;; @003e v93 = iadd.i64 v15, v92 ; v92 = 168
;; @003e v94 = load.i64 notrap aligned region5 v93+8
-;; @003e v95 = load.i32 notrap aligned region7 v93
-;; @003e v96 = load.i32 notrap aligned region10 v93+4
+;; @003e v95 = load.i32 notrap aligned region5 v93
+;; @003e v96 = load.i32 notrap aligned region9 v93+4
;; @003e v97 = uextend.i64 v95
;; @003e v98 = uextend.i64 v96
;; @003e v99 = iconst.i64 1
@@ -197,19 +197,19 @@
;; @003e v101 = icmp ule v100, v98
;; @003e trapz v101, user1
;; @003e v102 = ireduce.i32 v100
-;; @003e store notrap aligned region7 v102, v93
+;; @003e store notrap aligned region5 v102, v93
;; @003e v103 = iconst.i64 16
;; @003e v104 = imul v97, v103 ; v103 = 16
;; @003e v105 = iadd v94, v104
;; @003e jump block10(v105)
;;
;; block10(v72: i64):
-;; @003e store.i128 notrap aligned region8 v71, v72
+;; @003e store.i128 notrap aligned region7 v71, v72
;; @003e v106 = iconst.i64 0
;; @003e v107 = iadd.i64 v15, v106 ; v106 = 0
;; @003e v108 = iconst.i32 1
-;; @003e store notrap aligned region11 v108, v107+32 ; v108 = 1
-;; @003e v109 = load.i64 notrap aligned region9 v15+112
+;; @003e store notrap aligned region10 v108, v107+32 ; v108 = 1
+;; @003e v109 = load.i64 notrap aligned region8 v15+112
;; @003e store.i64 notrap aligned region4 v33, v109+88
;; @003e store.i64 notrap aligned region4 v34, v109+96
;; @003e v110 = iconst.i64 2
@@ -220,12 +220,12 @@
;; @003e v113 = iadd v107, v112 ; v112 = 0
;; @003e v114 = load.i64 notrap aligned region17 v113
;; @003e store notrap aligned region1 v114, v59+24
-;; @003e v115 = load.i64 notrap aligned region15 v113+8
-;; @003e store notrap aligned region12 v115, v59+72
-;; @003e v116 = load.i64 notrap aligned region16 v113+16
-;; @003e store notrap aligned region13 v116, v59+64
-;; @003e v117 = load.i64 notrap aligned region6 v113+24
-;; @003e store notrap aligned region14 v117, v59+80
+;; @003e v115 = load.i64 notrap aligned region14 v113+8
+;; @003e store notrap aligned region11 v115, v59+72
+;; @003e v116 = load.i64 notrap aligned region15 v113+16
+;; @003e store notrap aligned region12 v116, v59+64
+;; @003e v117 = load.i64 notrap aligned region16 v113+24
+;; @003e store notrap aligned region13 v117, v59+80
;; @003e v118 = iconst.i64 120
;; @003e v119 = iadd.i64 v30, v118 ; v118 = 120
;; @003e v120 = load.i64 notrap aligned region18 v119
@@ -237,18 +237,18 @@
;; @003e v126 = iconst.i64 -24
;; @003e v127 = iadd v125, v126 ; v126 = -24
;; @003e v128 = stack_addr.i64 ss1
-;; @003e v129 = load.i64 notrap aligned region8 v127
+;; @003e v129 = load.i64 notrap aligned region7 v127
;; @003e store notrap aligned region19 v129, v128
-;; @003e v130 = load.i64 notrap aligned region8 v122
-;; @003e store notrap aligned region8 v130, v127
-;; @003e v131 = load.i64 notrap aligned region8 v127+8
+;; @003e v130 = load.i64 notrap aligned region7 v122
+;; @003e store notrap aligned region7 v130, v127
+;; @003e v131 = load.i64 notrap aligned region7 v127+8
;; @003e store notrap aligned region19 v131, v128+8
-;; @003e v132 = load.i64 notrap aligned region8 v122+8
-;; @003e store notrap aligned region8 v132, v127+8
-;; @003e v133 = load.i64 notrap aligned region8 v127+16
+;; @003e v132 = load.i64 notrap aligned region7 v122+8
+;; @003e store notrap aligned region7 v132, v127+8
+;; @003e v133 = load.i64 notrap aligned region7 v127+16
;; @003e store notrap aligned region19 v133, v128+16
-;; @003e v134 = load.i64 notrap aligned region8 v122+16
-;; @003e store notrap aligned region8 v134, v127+16
+;; @003e v134 = load.i64 notrap aligned region7 v122+16
+;; @003e store notrap aligned region7 v134, v127+16
;; @003e v135 = iconst.i64 3
;; @003e v136 = iconst.i64 32
;; @003e v137 = ishl v135, v136 ; v135 = 3, v136 = 32
@@ -263,11 +263,11 @@
;; @003e v143 = iconst.i64 168
;; @003e v144 = iadd.i64 v28, v143 ; v143 = 168
;; @003e v145 = load.i64 notrap aligned region5 v144+8
-;; @003e v146 = load.i32 notrap aligned region8 v145
+;; @003e v146 = load.i32 notrap aligned region7 v145
;; @003e v147 = iconst.i32 0
-;; @003e store notrap aligned region7 v147, v144 ; v147 = 0
+;; @003e store notrap aligned region5 v147, v144 ; v147 = 0
;; @003e v148 = iconst.i32 0
-;; @003e store notrap aligned region10 v148, v144+4 ; v148 = 0
+;; @003e store notrap aligned region9 v148, v144+4 ; v148 = 0
;; @003e v149 = iconst.i64 0
;; @003e store notrap aligned region5 v149, v144+8 ; v149 = 0
;; @003e try_call fn2(v0, v146), sig2, block13, [ context v0 ]
@@ -280,9 +280,9 @@
;; @003e v151 = iadd.i64 v28, v150 ; v150 = 168
;; @003e v152 = load.i64 notrap aligned region5 v151+8
;; @003e v153 = iconst.i32 0
-;; @003e store notrap aligned region7 v153, v151 ; v153 = 0
+;; @003e store notrap aligned region5 v153, v151 ; v153 = 0
;; @003e v154 = iconst.i32 0
-;; @003e store notrap aligned region10 v154, v151+4 ; v154 = 0
+;; @003e store notrap aligned region9 v154, v151+4 ; v154 = 0
;; @003e v155 = iconst.i64 0
;; @003e store notrap aligned region5 v155, v151+8 ; v155 = 0
;; @0041 jump block1
@@ -310,23 +310,23 @@
;; ss0 = explicit_slot 8, align = 8
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 28 ""
-;; region3 = 26 ""
+;; region2 = 191 ""
+;; region3 = 192 ""
;; region4 = 106 ""
-;; region5 = 206 ""
-;; region6 = 255 ""
+;; region5 = 125 ""
+;; region6 = 144 ""
;; region7 = 231 ""
;; region8 = 243 ""
;; region9 = 209 ""
-;; region10 = 23 ""
-;; region11 = 224 ""
-;; region12 = 13 ""
-;; region13 = 179 ""
-;; region14 = 118 ""
-;; region15 = 214 ""
-;; region16 = 55 ""
-;; region17 = 82 ""
-;; region18 = 221 ""
+;; region10 = 100 ""
+;; region11 = 176 ""
+;; region12 = 62 ""
+;; region13 = 198 ""
+;; region14 = 145 ""
+;; region15 = 139 ""
+;; region16 = 82 ""
+;; region17 = 234 ""
+;; region18 = 124 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -418,9 +418,9 @@
;; @004b v54 = iconst.i32 1
;; @004b v55 = load.i64 notrap aligned region15 v49+8
;; @004b store notrap aligned region16 v53, v55
-;; @004b store notrap aligned region17 v54, v49 ; v54 = 1
+;; @004b store notrap aligned region15 v54, v49 ; v54 = 1
;; @004b v56 = iconst.i32 0
-;; @004b store notrap aligned region12 v56, v27+56 ; v56 = 0
+;; @004b store notrap aligned region17 v56, v27+56 ; v56 = 0
;; @004b v57 = iconst.i64 1
;; @004b v58 = iconst.i64 32
;; @004b v59 = ishl v57, v58 ; v57 = 1, v58 = 32
@@ -439,12 +439,12 @@
;; @004b v70 = iconst.i32 1
;; @004b store notrap aligned region6 v70, v27+32 ; v70 = 1
;; @004b v71 = iconst.i32 0
-;; @004b store notrap aligned region17 v71, v49 ; v71 = 0
+;; @004b store notrap aligned region15 v71, v49 ; v71 = 0
;; @004b v72 = iconst.i32 0
;; @004b store notrap aligned region14 v72, v49+4 ; v72 = 0
;; @004b v73 = iconst.i64 0
;; @004b store notrap aligned region15 v73, v49+8 ; v73 = 0
-;; @004b store notrap aligned region12 v28, v27+56 ; v28 = 0
+;; @004b store notrap aligned region17 v28, v27+56 ; v28 = 0
;; @004b brif v65, block6, block3
;;
;; block6:
@@ -472,7 +472,7 @@
;; @004b v87 = iconst.i64 144
;; @004b v88 = iadd.i64 v68, v87 ; v87 = 144
;; @004b v89 = iconst.i32 0
-;; @004b store notrap aligned region17 v89, v88 ; v89 = 0
+;; @004b store notrap aligned region15 v89, v88 ; v89 = 0
;; @004b v90 = iconst.i32 0
;; @004b store notrap aligned region14 v90, v88+4 ; v90 = 0
;; @004b v91 = iconst.i64 0
@@ -480,7 +480,7 @@
;; @004b v92 = iconst.i64 168
;; @004b v93 = iadd.i64 v68, v92 ; v92 = 168
;; @004b v94 = iconst.i32 0
-;; @004b store notrap aligned region17 v94, v93 ; v94 = 0
+;; @004b store notrap aligned region15 v94, v93 ; v94 = 0
;; @004b v95 = iconst.i32 0
;; @004b store notrap aligned region14 v95, v93+4 ; v95 = 0
;; @004b v96 = iconst.i64 0
@@ -546,7 +546,7 @@
;; @004b v128 = iadd.i64 v68, v127 ; v127 = 144
;; @004b v129 = load.i64 notrap aligned region15 v128+8
;; @004b v130 = iconst.i32 0
-;; @004b store notrap aligned region17 v130, v128 ; v130 = 0
+;; @004b store notrap aligned region15 v130, v128 ; v130 = 0
;; @004b v131 = iconst.i32 0
;; @004b store notrap aligned region14 v131, v128+4 ; v131 = 0
;; @004b v132 = iconst.i64 0
diff --git a/tests/disas/table-copy.wat b/tests/disas/table-copy.wat
index 589b13ff94..24a7981810 100644
--- a/tests/disas/table-copy.wat
+++ b/tests/disas/table-copy.wat
@@ -71,7 +71,7 @@
;; function u0:3(i64 vmctx, i64, i32, i32, i32, i32) -> i32 tail {
;; region0 = 123 ""
;; region1 = 160 ""
-;; region2 = 21 ""
+;; region2 = 13 ""
;; region3 = 93 ""
;; region4 = 211 ""
;; region5 = 99 ""
@@ -212,7 +212,7 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 93 ""
-;; region3 = 21 ""
+;; region3 = 13 ""
;; region4 = 211 ""
;; region5 = 99 ""
;; gv0 = vmctx
diff --git a/tests/disas/typed-funcrefs-eager-init.wat b/tests/disas/typed-funcrefs-eager-init.wat
index ca91705e83..641815d3d3 100644
--- a/tests/disas/typed-funcrefs-eager-init.wat
+++ b/tests/disas/typed-funcrefs-eager-init.wat
@@ -133,8 +133,8 @@
;; region1 = 160 ""
;; region2 = 93 ""
;; region3 = 117 ""
-;; region4 = 116 ""
-;; region5 = 60 ""
+;; region4 = 120 ""
+;; region5 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -167,8 +167,8 @@
;; region1 = 160 ""
;; region2 = 93 ""
;; region3 = 117 ""
-;; region4 = 116 ""
-;; region5 = 60 ""
+;; region4 = 120 ""
+;; region5 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -200,8 +200,8 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 250 ""
-;; region3 = 116 ""
-;; region4 = 60 ""
+;; region3 = 120 ""
+;; region4 = 100 ""
;; region5 = 135 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
diff --git a/tests/disas/typed-funcrefs.wat b/tests/disas/typed-funcrefs.wat
index 1235c5de9f..ae183b3482 100644
--- a/tests/disas/typed-funcrefs.wat
+++ b/tests/disas/typed-funcrefs.wat
@@ -133,8 +133,8 @@
;; region1 = 160 ""
;; region2 = 93 ""
;; region3 = 117 ""
-;; region4 = 116 ""
-;; region5 = 60 ""
+;; region4 = 120 ""
+;; region5 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -191,8 +191,8 @@
;; region1 = 160 ""
;; region2 = 93 ""
;; region3 = 117 ""
-;; region4 = 116 ""
-;; region5 = 60 ""
+;; region4 = 120 ""
+;; region5 = 100 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8
;; gv2 = load.i64 notrap aligned region1 gv1+24
@@ -248,8 +248,8 @@
;; region0 = 123 ""
;; region1 = 160 ""
;; region2 = 250 ""
-;; region3 = 116 ""
-;; region4 = 60 ""
+;; region3 = 120 ""
+;; region4 = 100 ""
;; region5 = 135 ""
;; gv0 = vmctx
;; gv1 = load.i64 notrap aligned readonly can_move region0 gv0+8