mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-06 12:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make FuncRef nullable at the API level

Browse Source
This commit is contained in:
Mark McCaskey
2021-02-01 09:41:18 -08:00
parent e013581fda
commit 63f277bce4
6 changed files with 54 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/api/src/types.rs
View File

@@ -19,9 +19,10 @@ pub type Val = Value<Function>;
impl StoreObject for Val {
fn comes_from_same_store(&self, store: &Store) -> bool {
match self {
Self::FuncRef(f) => Store::same(store, f.store()),
Self::FuncRef(None) => true,
Self::FuncRef(Some(f)) => Store::same(store, f.store()),
Self::ExternRef(ExternRef::Ref(_)) | Self::ExternRef(ExternRef::Other(_)) => false,
Self::ExternRef(ExternRef::Null) => true,
Self::ExternRef(ExternRef::Null) => todo!("update this code"),
Self::I32(_) | Self::I64(_) | Self::F32(_) | Self::F64(_) | Self::V128(_) => true,
}
}
@@ -29,7 +30,7 @@ impl StoreObject for Val {
impl From<Function> for Val {
fn from(val: Function) -> Self {
Self::FuncRef(val)
Self::FuncRef(Some(val))
}
}
@@ -60,21 +61,29 @@ impl ValFuncRef for Val {
return Err(RuntimeError::new("cross-`Store` values are not supported"));
}
Ok(match self {
Self::ExternRef(ExternRef::Null) => wasmer_vm::VMCallerCheckedAnyfunc {
Self::ExternRef(ExternRef::Null) => todo!("Extern ref not yet implemented"), /*wasmer_vm::VMCallerCheckedAnyfunc {
func_ptr: ptr::null(),
type_index: wasmer_vm::VMSharedSignatureIndex::default(),
vmctx: wasmer_vm::VMFunctionEnvironment {
host_env: ptr::null_mut(),
},
},*/
Self::FuncRef(None) => wasmer_vm::VMCallerCheckedAnyfunc {
func_ptr: ptr::null(),
type_index: wasmer_vm::VMSharedSignatureIndex::default(),
vmctx: wasmer_vm::VMFunctionEnvironment {
host_env: ptr::null_mut(),
},
},
Self::FuncRef(f) => f.checked_anyfunc(),
_ => return Err(RuntimeError::new("val is not funcref")),
Self::FuncRef(Some(f)) => f.checked_anyfunc(),
_ => return Err(RuntimeError::new("val is not reference")),
})
}
fn from_checked_anyfunc(item: wasmer_vm::VMCallerCheckedAnyfunc, store: &Store) -> Self {
// TODO: use `is_null()`?
if item.type_index == wasmer_vm::VMSharedSignatureIndex::default() {
return Self::ExternRef(ExternRef::Null);
return Self::FuncRef(None);
}
let signature = store
.engine()
@@ -96,7 +105,7 @@ impl ValFuncRef for Val {
},
};
let f = Function::from_vm_export(store, export);
Self::FuncRef(f)
Self::FuncRef(Some(f))
}
fn into_table_reference(
@@ -107,16 +116,28 @@ impl ValFuncRef for Val {
return Err(RuntimeError::new("cross-`Store` values are not supported"));
}
Ok(match self {
Self::ExternRef(ExternRef::Null) => wasmer_vm::TableReference::FuncRef(wasmer_vm::VMCallerCheckedAnyfunc {
Self::ExternRef(ExternRef::Null) =>
/*wasmer_vm::TableReference::FuncRef(wasmer_vm::VMCallerCheckedAnyfunc {
func_ptr: ptr::null(),
type_index: wasmer_vm::VMSharedSignatureIndex::default(),
vmctx: wasmer_vm::VMFunctionEnvironment {
host_env: ptr::null_mut(),
},
}),
}),*/
// existing code uses `ExtenRef` for null pointers
//todo!("extern ref not yet supported"),
Self::FuncRef(f) => wasmer_vm::TableReference::FuncRef(f.checked_anyfunc()),
{
todo!("extern ref not yet supported")
}
Self::FuncRef(None) => {
wasmer_vm::TableReference::FuncRef(wasmer_vm::VMCallerCheckedAnyfunc {
func_ptr: ptr::null(),
type_index: wasmer_vm::VMSharedSignatureIndex::default(),
vmctx: wasmer_vm::VMFunctionEnvironment {
host_env: ptr::null_mut(),
},
})
}
Self::FuncRef(Some(f)) => wasmer_vm::TableReference::FuncRef(f.checked_anyfunc()),
_ => return Err(RuntimeError::new("val is not reference")),
})
}

10
lib/api/tests/externals.rs
View File

@@ -67,7 +67,7 @@ fn table_new() -> Result<()> {
maximum: None,
};
let f = Function::new_native(&store, || {});
let table = Table::new(&store, table_type, Value::FuncRef(f))?;
let table = Table::new(&store, table_type, Value::FuncRef(Some(f)))?;
assert_eq!(*table.ty(), table_type);
// Anyrefs not yet supported
@@ -92,7 +92,7 @@ fn table_get() -> Result<()> {
maximum: Some(1),
};
let f = Function::new_native(&store, |num: i32| num + 1);
let table = Table::new(&store, table_type, Value::FuncRef(f.clone()))?;
let table = Table::new(&store, table_type, Value::FuncRef(Some(f.clone())))?;
assert_eq!(*table.ty(), table_type);
let _elem = table.get(0).unwrap();
// assert_eq!(elem.funcref().unwrap(), f);
@@ -115,13 +115,13 @@ fn table_grow() -> Result<()> {
maximum: Some(10),
};
let f = Function::new_native(&store, |num: i32| num + 1);
let table = Table::new(&store, table_type, Value::FuncRef(f.clone()))?;
let table = Table::new(&store, table_type, Value::FuncRef(Some(f.clone())))?;
// Growing to a bigger maximum should return None
let old_len = table.grow(12, Value::FuncRef(f.clone()));
let old_len = table.grow(12, Value::FuncRef(Some(f.clone())));
assert!(old_len.is_err());
// Growing to a bigger maximum should return None
let old_len = table.grow(5, Value::FuncRef(f.clone()))?;
let old_len = table.grow(5, Value::FuncRef(Some(f.clone())))?;
assert_eq!(old_len, 0);
Ok(())