9364eb1d98
* Compute instance exports on demand. Instead having instances eagerly compute a Vec of Externs, and bumping the refcount for each Extern, compute Externs on demand. This also enables `Instance::get_export` to avoid doing a linear search. This also means that the closure returned by `get0` and friends now holds an `InstanceHandle` to dynamically hold the instance live rather than being scoped to a lifetime. * Compute module imports and exports on demand too. And compute Extern::ty on demand too. * Add a utility function for computing an ExternType. * Add a utility function for looking up a function's signature. * Add a utility function for computing the ValType of a Global. * Rename wasmtime_environ::Export to EntityIndex. This helps differentiate it from other Export types in the tree, and describes what it is. * Fix a typo in a comment. * Simplify module imports and exports. * Make `Instance::exports` return the export names. This significantly simplifies the public API, as it's relatively common to need the names, and this avoids the need to do a zip with `Module::exports`. This also changes `ImportType` and `ExportType` to have public members instead of private members and accessors, as I find that simplifies the usage particularly in cases where there are temporary instances. * Remove `Instance::module`. This doesn't quite remove `Instance`'s `module` member, it gets a step closer. * Use a InstanceHandle utility function. * Don't consume self in the `Func::get*` methods. Instead, just create a closure containing the instance handle and the export for them to call. * Use `ExactSizeIterator` to avoid needing separate `num_*` methods. * Rename `Extern::func()` etc. to `into_func()` etc. * Revise examples to avoid using `nth`. * Add convenience methods to instance for getting specific extern types. * Use the convenience functions in more tests and examples. * Avoid cloning strings for `ImportType` and `ExportType`. * Remove more obviated clone() calls. * Simplify `Func`'s closure state. * Make wasmtime::Export's fields private. This makes them more consistent with ExportType. * Fix compilation error. * Make a lifetime parameter explicit, and use better lifetime names. Instead of 'me, use 'instance and 'module to make it clear what the lifetime is. * More lifetime cleanups.
97 lines
2.4 KiB
Rust
97 lines
2.4 KiB
Rust
use anyhow::Result;
|
|
use std::cell::RefCell;
|
|
use std::rc::Rc;
|
|
use wasmtime::*;
|
|
|
|
#[test]
|
|
fn test_import_calling_export() {
|
|
const WAT: &str = r#"
|
|
(module
|
|
(type $t0 (func))
|
|
(import "" "imp" (func $.imp (type $t0)))
|
|
(func $run call $.imp)
|
|
(func $other)
|
|
(export "run" (func $run))
|
|
(export "other" (func $other))
|
|
)
|
|
"#;
|
|
|
|
let store = Store::default();
|
|
let module = Module::new(&store, WAT).expect("failed to create module");
|
|
|
|
let other = Rc::new(RefCell::new(None::<Func>));
|
|
let other2 = other.clone();
|
|
|
|
let callback_func = Func::new(
|
|
&store,
|
|
FuncType::new(Box::new([]), Box::new([])),
|
|
move |_, _, _| {
|
|
other2
|
|
.borrow()
|
|
.as_ref()
|
|
.expect("expected a function ref")
|
|
.call(&[])
|
|
.expect("expected function not to trap");
|
|
Ok(())
|
|
},
|
|
);
|
|
|
|
let imports = vec![callback_func.into()];
|
|
let instance =
|
|
Instance::new(&module, imports.as_slice()).expect("failed to instantiate module");
|
|
|
|
let run_func = instance
|
|
.get_func("run")
|
|
.expect("expected a run func in the module");
|
|
|
|
*other.borrow_mut() = Some(
|
|
instance
|
|
.get_func("other")
|
|
.expect("expected an other func in the module"),
|
|
);
|
|
|
|
run_func.call(&[]).expect("expected function not to trap");
|
|
}
|
|
|
|
#[test]
|
|
fn test_returns_incorrect_type() -> Result<()> {
|
|
const WAT: &str = r#"
|
|
(module
|
|
(import "env" "evil" (func $evil (result i32)))
|
|
(func (export "run") (result i32)
|
|
(call $evil)
|
|
)
|
|
)
|
|
"#;
|
|
|
|
let store = Store::default();
|
|
let module = Module::new(&store, WAT)?;
|
|
|
|
let callback_func = Func::new(
|
|
&store,
|
|
FuncType::new(Box::new([]), Box::new([ValType::I32])),
|
|
|_, _, results| {
|
|
// Evil! Returns I64 here instead of promised in the signature I32.
|
|
results[0] = Val::I64(228);
|
|
Ok(())
|
|
},
|
|
);
|
|
|
|
let imports = vec![callback_func.into()];
|
|
let instance = Instance::new(&module, imports.as_slice())?;
|
|
|
|
let run_func = instance
|
|
.get_func("run")
|
|
.expect("expected a run func in the module");
|
|
|
|
let trap = run_func
|
|
.call(&[])
|
|
.expect_err("the execution should fail")
|
|
.downcast::<Trap>()?;
|
|
assert_eq!(
|
|
trap.message(),
|
|
"function attempted to return an incompatible value"
|
|
);
|
|
Ok(())
|
|
}
|