Remove a dead trait method (#11407)

* Remove a dead trait method

Made obsolete from previous refactorings, so no need to keep this any
more.

* Fix unused import

* Fix missing import

Author: alexcrichton

crates/wasmtime/src/runtime/store.rs

@@ -93,7 +93,7 @@ use crate::runtime::vm::mpk::ProtectionKey;
 use crate::runtime::vm::{
     self, GcStore, Imports, InstanceAllocationRequest, InstanceAllocator, InstanceHandle,
     Interpreter, InterpreterRef, ModuleRuntimeInfo, OnDemandInstanceAllocator, SendSyncPtr,
-    SignalHandler, StoreBox, StorePtr, Unwind, VMContext, VMFuncRef, VMGcRef, VMStoreContext,
+    SignalHandler, StoreBox, StorePtr, Unwind, VMContext, VMFuncRef, VMStoreContext,
 };
 use crate::trampoline::VMHostGlobalContext;
 use crate::{Engine, Module, Trap, Val, ValRaw, module::ModuleRegistry};
@@ -1638,7 +1638,7 @@ impl StoreOpaque {
             let raw: u32 = unsafe { core::ptr::read(stack_slot) };
             log::trace!("Stack slot @ {stack_slot:p} = {raw:#x}");
 
-            let gc_ref = VMGcRef::from_raw_u32(raw);
+            let gc_ref = vm::VMGcRef::from_raw_u32(raw);
             if gc_ref.is_some() {
                 unsafe {
                     gc_roots_list
@@ -2298,24 +2298,6 @@ unsafe impl<T> vm::VMStore for StoreInner<T> {
         delta_result
     }
 
-    #[cfg(feature = "gc")]
-    unsafe fn maybe_async_grow_or_collect_gc_heap(
-        &mut self,
-        root: Option<VMGcRef>,
-        bytes_needed: Option<u64>,
-    ) -> Result<Option<VMGcRef>> {
-        unsafe { self.inner.maybe_async_gc(root, bytes_needed) }
-    }
-
-    #[cfg(not(feature = "gc"))]
-    unsafe fn maybe_async_grow_or_collect_gc_heap(
-        &mut self,
-        root: Option<VMGcRef>,
-        _bytes_needed: Option<u64>,
-    ) -> Result<Option<VMGcRef>> {
-        Ok(root)
-    }
-
     #[cfg(feature = "component-model")]
     fn component_calls(&mut self) -> &mut vm::component::CallContexts {
         &mut self.component_calls

crates/wasmtime/src/runtime/store/gc.rs

@@ -2,6 +2,7 @@
 
 use super::*;
 use crate::GcHeapOutOfMemory;
+use crate::runtime::vm::VMGcRef;
 
 impl StoreOpaque {
     /// Collect garbage, potentially growing the GC heap.

crates/wasmtime/src/runtime/vm.rs

@@ -242,26 +242,6 @@ pub unsafe trait VMStore: 'static {
     #[cfg(target_has_atomic = "64")]
     fn new_epoch(&mut self) -> Result<u64, Error>;
 
-    /// Callback invoked whenever an instance needs to grow-or-collect the GC
-    /// heap.
-    ///
-    /// Optionally given a GC reference that is rooted for the collection, and
-    /// then whose updated GC reference is returned.
-    ///
-    /// Optionally given a number of bytes that are needed for an upcoming
-    /// allocation.
-    ///
-    /// Cooperative, async-yielding (if configured) is completely transparent,
-    /// but must be called from a fiber stack in that case.
-    ///
-    /// If the async GC was cancelled, returns an error. This should be raised
-    /// as a trap to clean up Wasm execution.
-    unsafe fn maybe_async_grow_or_collect_gc_heap(
-        &mut self,
-        root: Option<VMGcRef>,
-        bytes_needed: Option<u64>,
-    ) -> Result<Option<VMGcRef>>;
-
     /// Metadata required for resources for the component model.
     #[cfg(feature = "component-model")]
     fn component_calls(&mut self) -> &mut component::CallContexts;