wasmtime: Initial, partial support for externref
This is enough to get an `externref -> externref` identity function passing. However, `externref`s that are dropped by compiled Wasm code are (safely) leaked. Follow up work will leverage cranelift's stack maps to resolve this issue.
This commit is contained in:
@@ -28,47 +28,27 @@ fn bad_tables() {
|
||||
|
||||
// get out of bounds
|
||||
let ty = TableType::new(ValType::FuncRef, Limits::new(0, Some(1)));
|
||||
let t = Table::new(
|
||||
&Store::default(),
|
||||
ty.clone(),
|
||||
Val::ExternRef(ExternRef::Null),
|
||||
)
|
||||
.unwrap();
|
||||
let t = Table::new(&Store::default(), ty.clone(), Val::ExternRef(None)).unwrap();
|
||||
assert!(t.get(0).is_none());
|
||||
assert!(t.get(u32::max_value()).is_none());
|
||||
|
||||
// set out of bounds or wrong type
|
||||
let ty = TableType::new(ValType::FuncRef, Limits::new(1, Some(1)));
|
||||
let t = Table::new(
|
||||
&Store::default(),
|
||||
ty.clone(),
|
||||
Val::ExternRef(ExternRef::Null),
|
||||
)
|
||||
.unwrap();
|
||||
let t = Table::new(&Store::default(), ty.clone(), Val::ExternRef(None)).unwrap();
|
||||
assert!(t.set(0, Val::I32(0)).is_err());
|
||||
assert!(t.set(0, Val::ExternRef(ExternRef::Null)).is_ok());
|
||||
assert!(t.set(1, Val::ExternRef(ExternRef::Null)).is_err());
|
||||
assert!(t.set(0, Val::ExternRef(None)).is_ok());
|
||||
assert!(t.set(1, Val::ExternRef(None)).is_err());
|
||||
|
||||
// grow beyond max
|
||||
let ty = TableType::new(ValType::FuncRef, Limits::new(1, Some(1)));
|
||||
let t = Table::new(
|
||||
&Store::default(),
|
||||
ty.clone(),
|
||||
Val::ExternRef(ExternRef::Null),
|
||||
)
|
||||
.unwrap();
|
||||
assert!(t.grow(0, Val::ExternRef(ExternRef::Null)).is_ok());
|
||||
assert!(t.grow(1, Val::ExternRef(ExternRef::Null)).is_err());
|
||||
let t = Table::new(&Store::default(), ty.clone(), Val::ExternRef(None)).unwrap();
|
||||
assert!(t.grow(0, Val::ExternRef(None)).is_ok());
|
||||
assert!(t.grow(1, Val::ExternRef(None)).is_err());
|
||||
assert_eq!(t.size(), 1);
|
||||
|
||||
// grow wrong type
|
||||
let ty = TableType::new(ValType::FuncRef, Limits::new(1, Some(2)));
|
||||
let t = Table::new(
|
||||
&Store::default(),
|
||||
ty.clone(),
|
||||
Val::ExternRef(ExternRef::Null),
|
||||
)
|
||||
.unwrap();
|
||||
let t = Table::new(&Store::default(), ty.clone(), Val::ExternRef(None)).unwrap();
|
||||
assert!(t.grow(1, Val::I32(0)).is_err());
|
||||
assert_eq!(t.size(), 1);
|
||||
}
|
||||
@@ -88,7 +68,7 @@ fn cross_store() -> anyhow::Result<()> {
|
||||
let ty = MemoryType::new(Limits::new(1, None));
|
||||
let memory = Memory::new(&store2, ty);
|
||||
let ty = TableType::new(ValType::FuncRef, Limits::new(1, None));
|
||||
let table = Table::new(&store2, ty, Val::ExternRef(ExternRef::Null))?;
|
||||
let table = Table::new(&store2, ty, Val::ExternRef(None))?;
|
||||
|
||||
let need_func = Module::new(&store1, r#"(module (import "" "" (func)))"#)?;
|
||||
assert!(Instance::new(&need_func, &[func.into()]).is_err());
|
||||
|
||||
Reference in New Issue
Block a user