post-merge fixes

Author: frank-emrich

crates/cranelift/src/stack_switching/instructions.rs

@@ -1183,11 +1183,11 @@ pub(crate) mod stack_switching_helpers {
                 env.offsets.ptr.vmstack_limits_last_wasm_entry_fp() as i32;
             copy_to_vm_runtime_limits(
                 stack_limit_offset,
-                pointer_size.vmruntime_limits_stack_limit(),
+                pointer_size.vmstore_context_stack_limit(),
             );
             copy_to_vm_runtime_limits(
                 last_wasm_entry_fp_offset,
-                pointer_size.vmruntime_limits_last_wasm_entry_fp(),
+                pointer_size.vmstore_context_last_wasm_entry_fp(),
             );
         }
 
@@ -1226,14 +1226,14 @@ pub(crate) mod stack_switching_helpers {
             let last_wasm_entry_fp_offset =
                 env.offsets.ptr.vmstack_limits_last_wasm_entry_fp() as i32;
             copy(
-                pointer_size.vmruntime_limits_last_wasm_entry_fp(),
+                pointer_size.vmstore_context_last_wasm_entry_fp(),
                 last_wasm_entry_fp_offset,
             );
 
             if load_stack_limit {
                 let stack_limit_offset = env.offsets.ptr.vmstack_limits_stack_limit() as i32;
                 copy(
-                    pointer_size.vmruntime_limits_stack_limit(),
+                    pointer_size.vmstore_context_stack_limit(),
                     stack_limit_offset,
                 );
             }

crates/wasmtime/src/runtime/func.rs

@@ -2,7 +2,7 @@ use crate::prelude::*;
 use crate::runtime::vm::stack_switching::VMCommonStackInformation;
 use crate::runtime::vm::{
     ExportFunction, InterpreterRef, SendSyncPtr, StoreBox, VMArrayCallHostFuncContext, VMContext,
-    VMFuncRef, VMFunctionImport, VMOpaqueContext, VMRuntimeLimits,
+    VMFuncRef, VMFunctionImport, VMOpaqueContext, VMStoreContext,
 };
 use crate::runtime::Uninhabited;
 use crate::store::{AutoAssertNoGc, StoreData, StoreOpaque, Stored};

crates/wasmtime/src/runtime/vm/traphandlers.rs

@@ -469,7 +469,11 @@ mod call_thread_state {
         pub const JMP_BUF_INTERPRETER_SENTINEL: *mut u8 = 1 as *mut u8;
 
         #[inline]
-        pub(super) fn new(store: &mut StoreOpaque, caller: NonNull<VMContext>, old_state: *const RuntimeEntryState) -> CallThreadState {
+        pub(super) fn new(
+            store: &mut StoreOpaque,
+            caller: NonNull<VMContext>,
+            old_state: *const RuntimeEntryState,
+        ) -> CallThreadState {
             let vm_store_context = unsafe {
                 Instance::from_vmctx(caller, |i| i.vm_store_context())
                     .read()