diff --git a/lib/api/src/externals/function.rs b/lib/api/src/externals/function.rs index 4618f380f..5171a02f3 100644 --- a/lib/api/src/externals/function.rs +++ b/lib/api/src/externals/function.rs @@ -110,7 +110,7 @@ impl Function { vmctx, signature: ty.clone(), call_trampoline: None, - instance_allocator: None, + instance_ref: None, }, }, } @@ -173,7 +173,7 @@ impl Function { vmctx, signature: ty.clone(), call_trampoline: None, - instance_allocator: None, + instance_ref: None, }, }, } @@ -227,7 +227,7 @@ impl Function { signature, kind: VMFunctionKind::Static, call_trampoline: None, - instance_allocator: None, + instance_ref: None, }, }, } @@ -297,7 +297,7 @@ impl Function { vmctx, signature, call_trampoline: None, - instance_allocator: None, + instance_ref: None, }, }, } @@ -350,7 +350,7 @@ impl Function { vmctx, signature, call_trampoline: None, - instance_allocator: None, + instance_ref: None, }, }, } diff --git a/lib/api/src/externals/global.rs b/lib/api/src/externals/global.rs index 72584f552..49f2a4c12 100644 --- a/lib/api/src/externals/global.rs +++ b/lib/api/src/externals/global.rs @@ -220,7 +220,7 @@ impl<'a> Exportable<'a> for Global { ExportGlobal { vm_global: VMExportGlobal { from: self.global.clone(), - instance_allocator: None, + instance_ref: None, }, } .into() diff --git a/lib/api/src/externals/memory.rs b/lib/api/src/externals/memory.rs index 6ce66f442..c83e324c3 100644 --- a/lib/api/src/externals/memory.rs +++ b/lib/api/src/externals/memory.rs @@ -250,7 +250,7 @@ impl<'a> Exportable<'a> for Memory { ExportMemory { vm_memory: VMExportMemory { from: self.memory.clone(), - instance_allocator: None, + instance_ref: None, }, } .into() diff --git a/lib/api/src/externals/table.rs b/lib/api/src/externals/table.rs index 35b17e88a..838cb1b21 100644 --- a/lib/api/src/externals/table.rs +++ b/lib/api/src/externals/table.rs @@ -158,7 +158,7 @@ impl<'a> Exportable<'a> for Table { ExportTable { vm_table: VMExportTable { from: self.table.clone(), - instance_allocator: None, + instance_ref: None, }, } .into() diff --git a/lib/api/src/native.rs b/lib/api/src/native.rs index 1e9b48f01..7330b31e6 100644 --- a/lib/api/src/native.rs +++ b/lib/api/src/native.rs @@ -75,7 +75,7 @@ where signature, kind: other.arg_kind, call_trampoline: None, - instance_allocator: None, + instance_ref: None, } } }*/ diff --git a/lib/api/src/types.rs b/lib/api/src/types.rs index 328184660..a0f8d89b4 100644 --- a/lib/api/src/types.rs +++ b/lib/api/src/types.rs @@ -85,7 +85,7 @@ impl ValFuncRef for Val { kind: wasmer_vm::VMFunctionKind::Static, vmctx: item.vmctx, call_trampoline: None, - instance_allocator: None, + instance_ref: None, }, }; let f = Function::from_vm_export(store, export); diff --git a/lib/vm/src/export.rs b/lib/vm/src/export.rs index 2dbd3bbda..3497b4db7 100644 --- a/lib/vm/src/export.rs +++ b/lib/vm/src/export.rs @@ -50,7 +50,7 @@ pub struct VMExportFunction { /// A “reference” to the instance through the /// `InstanceRef`. `None` if it is a host function. - pub instance_allocator: Option, + pub instance_ref: Option, } /// # Safety @@ -74,8 +74,8 @@ pub struct VMExportTable { pub from: Arc, /// A “reference” to the instance through the - /// `InstanceRef`. `None` if it is a host function. - pub instance_allocator: Option, + /// `InstanceRef`. `None` if it is a host table. + pub instance_ref: Option, } /// # Safety @@ -120,8 +120,8 @@ pub struct VMExportMemory { pub from: Arc, /// A “reference” to the instance through the - /// `InstanceRef`. `None` if it is a host function. - pub instance_allocator: Option, + /// `InstanceRef`. `None` if it is a host memory. + pub instance_ref: Option, } /// # Safety @@ -166,8 +166,8 @@ pub struct VMExportGlobal { pub from: Arc, /// A “reference” to the instance through the - /// `InstanceRef`. `None` if it is a host function. - pub instance_allocator: Option, + /// `InstanceRef`. `None` if it is a host global. + pub instance_ref: Option, } /// # Safety diff --git a/lib/vm/src/instance/mod.rs b/lib/vm/src/instance/mod.rs index aee4eaee4..410a30574 100644 --- a/lib/vm/src/instance/mod.rs +++ b/lib/vm/src/instance/mod.rs @@ -1119,7 +1119,7 @@ impl InstanceHandle { signature, vmctx, call_trampoline, - instance_allocator: Some(instance), + instance_ref: Some(instance), } .into() } @@ -1132,7 +1132,7 @@ impl InstanceHandle { }; VMExportTable { from, - instance_allocator: Some(instance), + instance_ref: Some(instance), } .into() } @@ -1145,7 +1145,7 @@ impl InstanceHandle { }; VMExportMemory { from, - instance_allocator: Some(instance), + instance_ref: Some(instance), } .into() } @@ -1160,7 +1160,7 @@ impl InstanceHandle { }; VMExportGlobal { from, - instance_allocator: Some(instance), + instance_ref: Some(instance), } .into() }