afd980b4f6
* Remove `WrappedCallable` indirection At this point `Func` has evolved quite a bit since inception and the `WrappedCallable` trait I don't believe is needed any longer. This should help clean up a few entry points by having fewer traits in play. * Remove the `Callable` trait This commit removes the `wasmtime::Callable` trait, changing the signature of `Func::new` to take an appropriately typed `Fn`. Additionally the function now always takes `&Caller` like `Func::wrap` optionally can, to empower `Func::new` to have the same capabilities of `Func::wrap`. * Add a test for an already-fixed issue Closes #849 * rustfmt * Update more locations for `Callable` * rustfmt * Remove a stray leading borrow * Review feedback * Remove unneeded `wasmtime_call_trampoline` shim
100 lines
2.6 KiB
Rust
100 lines
2.6 KiB
Rust
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 exports = instance.exports();
|
|
assert!(!exports.is_empty());
|
|
|
|
let run_func = exports[0]
|
|
.func()
|
|
.expect("expected a run func in the module");
|
|
|
|
*other.borrow_mut() = Some(
|
|
exports[1]
|
|
.func()
|
|
.expect("expected an other func in the module")
|
|
.clone(),
|
|
);
|
|
|
|
run_func.call(&[]).expect("expected function not to trap");
|
|
}
|
|
|
|
#[test]
|
|
fn test_returns_incorrect_type() {
|
|
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).expect("failed to create module");
|
|
|
|
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()).expect("failed to instantiate module");
|
|
|
|
let exports = instance.exports();
|
|
assert!(!exports.is_empty());
|
|
|
|
let run_func = exports[0]
|
|
.func()
|
|
.expect("expected a run func in the module");
|
|
|
|
let trap = run_func.call(&[]).expect_err("the execution should fail");
|
|
assert_eq!(
|
|
trap.message(),
|
|
"function attempted to return an incompatible value"
|
|
);
|
|
}
|