big patch: Start injecting InstanceAllocator everywhere.

lib/api/src/externals/function.rs

@@ -98,6 +98,7 @@ impl Function {
                 vmctx,
                 signature: ty.clone(),
                 call_trampoline: None,
+                instance_allocator: None,
             },
         }
     }
@@ -150,6 +151,7 @@ impl Function {
                 vmctx,
                 signature: ty.clone(),
                 call_trampoline: None,
+                instance_allocator: None,
             },
         }
     }
@@ -194,6 +196,7 @@ impl Function {
                 signature,
                 kind: VMFunctionKind::Static,
                 call_trampoline: None,
+                instance_allocator: None,
             },
         }
     }
@@ -250,6 +253,7 @@ impl Function {
                 vmctx,
                 signature,
                 call_trampoline: None,
+                instance_allocator: None,
             },
         }
     }

lib/api/src/externals/global.rs

@@ -218,6 +218,7 @@ impl<'a> Exportable<'a> for Global {
     fn to_export(&self) -> Export {
         ExportGlobal {
             from: self.global.clone(),
+            instance_allocator: None,
         }
         .into()
     }

lib/api/src/externals/memory.rs

@@ -248,6 +248,7 @@ impl<'a> Exportable<'a> for Memory {
     fn to_export(&self) -> Export {
         ExportMemory {
             from: self.memory.clone(),
+            instance_allocator: None,
         }
         .into()
     }

lib/api/src/externals/table.rs

@@ -156,6 +156,7 @@ impl<'a> Exportable<'a> for Table {
     fn to_export(&self) -> Export {
         ExportTable {
             from: self.table.clone(),
+            instance_allocator: None,
         }
         .into()
     }

lib/api/src/native.rs

@@ -70,6 +70,7 @@ where
             signature,
             kind: other.arg_kind,
             call_trampoline: None,
+            instance_allocator: None,
         }
     }
 }
@@ -90,6 +91,7 @@ where
                 signature,
                 kind: other.arg_kind,
                 call_trampoline: None,
+                instance_allocator: None,
             },
         }
     }

lib/api/src/types.rs

@@ -81,6 +81,7 @@ impl ValFuncRef for Val {
             kind: wasmer_vm::VMFunctionKind::Static,
             vmctx: item.vmctx,
             call_trampoline: None,
+            instance_allocator: None,
         };
         let f = Function::from_vm_export(store, export);
         Self::FuncRef(f)

lib/vm/src/export.rs

@@ -39,9 +39,9 @@ pub struct ExportFunction {
     /// Address of the function call trampoline owned by the same VMContext that owns the VMFunctionBody.
     /// May be None when the function is a host-function (FunctionType == Dynamic or vmctx == nullptr).
     pub call_trampoline: Option<VMTrampoline>,
-    ///// A reference to the instance, to ensure it's not deallocated
-    ///// before the function.
-    //pub instance_allocator: Option<Arc<InstanceAllocator>>,
+    /// A reference to the instance, to ensure it's not deallocated
+    /// before the function.
+    pub instance_allocator: Option<Arc<InstanceAllocator>>,
 }
 
 /// # Safety
@@ -63,9 +63,9 @@ impl From<ExportFunction> for Export {
 pub struct ExportTable {
     /// Pointer to the containing `Table`.
     pub from: Arc<dyn Table>,
-    ///// A reference to the instance, to ensure it's not deallocated
-    ///// before the table.
-    //pub instance_allocator: Option<Arc<InstanceAllocator>>,
+    /// A reference to the instance, to ensure it's not deallocated
+    /// before the table.
+    pub instance_allocator: Option<Arc<InstanceAllocator>>,
 }
 
 /// # Safety
@@ -107,9 +107,9 @@ impl From<ExportTable> for Export {
 pub struct ExportMemory {
     /// Pointer to the containing `Memory`.
     pub from: Arc<dyn Memory>,
-    ///// A reference to the instance, to ensure it's not deallocated
-    ///// before the memory.
-    //pub instance_allocator: Option<Arc<InstanceAllocator>>,
+    /// A reference to the instance, to ensure it's not deallocated
+    /// before the memory.
+    pub instance_allocator: Option<Arc<InstanceAllocator>>,
 }
 
 /// # Safety
@@ -151,9 +151,9 @@ impl From<ExportMemory> for Export {
 pub struct ExportGlobal {
     /// The global declaration, used for compatibility checking.
     pub from: Arc<Global>,
-    ///// A reference to the instance, to ensure it's not deallocated
-    ///// before the global.
-    //pub instance_allocator: Option<Arc<InstanceAllocator>>,
+    /// A reference to the instance, to ensure it's not deallocated
+    /// before the global.
+    pub instance_allocator: Option<Arc<InstanceAllocator>>,
 }
 
 /// # Safety

lib/vm/src/instance.rs

@@ -1073,7 +1073,7 @@ impl InstanceHandle {
                     signature,
                     vmctx,
                     call_trampoline,
-                    //instance_allocator: Some(instance),
+                    instance_allocator: Some(instance),
                 }
                 .into()
             }
@@ -1088,7 +1088,7 @@ impl InstanceHandle {
 
                 ExportTable {
                     from,
-                    //instance_allocator: Some(instance),
+                    instance_allocator: Some(instance),
                 }
                 .into()
             }
@@ -1103,7 +1103,7 @@ impl InstanceHandle {
 
                 ExportMemory {
                     from,
-                    //instance_allocator: Some(instance),
+                    instance_allocator: Some(instance),
                 }
                 .into()
             }
@@ -1120,7 +1120,7 @@ impl InstanceHandle {
 
                 ExportGlobal {
                     from,
-                    //instance_allocator: Some(instance),
+                    instance_allocator: Some(instance),
                 }
                 .into()
             }