* Migrate from failure to thiserror and anyhow The failure crate invents its own traits that don't use std::error::Error (because failure predates certain features added to Error); this prevents using ? on an error from failure in a function using Error. The thiserror and anyhow crates integrate with the standard Error trait instead. This change does not attempt to semantically change or refactor the approach to error-handling in any portion of the code, to ensure that the change remains straightforward to review. Modules using specific differentiated error types move from failure_derive and derive(Fail) to thiserror and derive(Error). Modules boxing all errors opaquely move from failure::Error to anyhow. Modules using String as an error type continue to do so. Code using unwrap or expect continues to do so. Drop Display implementations when thiserror can easily derive an identical instance. Drop manual traversal of iter_causes; anyhow's Debug instance prints the chain of causes by default. Use anyhow's type alias anyhow::Result<T> in place of std::result::Result<T, anyhow::Error> whenever possible. * wasm2obj: Simplify error handling using existing messages handle_module in wasm2obj manually maps cranelift_codegen::isa::LookupError values to strings, but LookupError values already have strings that say almost exactly the same thing. Rely on the strings from cranelift. * wasmtime: Rely on question-mark-in-main The main() wrapper around rmain() completely matches the behavior of question-mark-in-main (print error to stderr and return 1), so switch to question-mark-in-main. * Update to walrus 0.13 and wasm-webidl-bindings 0.6 Both crates switched from failure to anyhow; updating lets us avoid a translation from failure to anyhow within wasmtime-interface-types.
149 lines
4.5 KiB
Rust
149 lines
4.5 KiB
Rust
use crate::context::Context;
|
|
use crate::externals::Extern;
|
|
use crate::module::Module;
|
|
use crate::r#ref::HostRef;
|
|
use crate::runtime::Store;
|
|
use crate::{HashMap, HashSet};
|
|
use alloc::borrow::ToOwned;
|
|
use alloc::boxed::Box;
|
|
use alloc::rc::Rc;
|
|
use alloc::string::{String, ToString};
|
|
use alloc::vec::Vec;
|
|
use anyhow::Result;
|
|
use core::cell::RefCell;
|
|
|
|
use wasmtime_jit::{instantiate, Resolver};
|
|
use wasmtime_runtime::{Export, InstanceHandle};
|
|
|
|
struct SimpleResolver {
|
|
imports: Vec<(String, String, Extern)>,
|
|
}
|
|
|
|
impl Resolver for SimpleResolver {
|
|
fn resolve(&mut self, name: &str, field: &str) -> Option<Export> {
|
|
// TODO speedup lookup
|
|
self.imports
|
|
.iter_mut()
|
|
.find(|(n, f, _)| name == n && field == f)
|
|
.map(|(_, _, e)| e.get_wasmtime_export())
|
|
}
|
|
}
|
|
|
|
pub fn instantiate_in_context(
|
|
data: &[u8],
|
|
imports: Vec<(String, String, Extern)>,
|
|
mut context: Context,
|
|
exports: Rc<RefCell<HashMap<String, Option<wasmtime_runtime::Export>>>>,
|
|
) -> Result<(InstanceHandle, HashSet<Context>)> {
|
|
let mut contexts = HashSet::new();
|
|
let debug_info = context.debug_info();
|
|
let mut resolver = SimpleResolver { imports };
|
|
let instance = instantiate(
|
|
&mut context.compiler(),
|
|
data,
|
|
&mut resolver,
|
|
exports,
|
|
debug_info,
|
|
)?;
|
|
contexts.insert(context);
|
|
Ok((instance, contexts))
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct Instance {
|
|
instance_handle: InstanceHandle,
|
|
|
|
// We need to keep CodeMemory alive.
|
|
contexts: HashSet<Context>,
|
|
|
|
exports: Box<[Extern]>,
|
|
}
|
|
|
|
impl Instance {
|
|
pub fn new(
|
|
store: HostRef<Store>,
|
|
module: HostRef<Module>,
|
|
externs: &[Extern],
|
|
) -> Result<Instance> {
|
|
let context = store.borrow_mut().context().clone();
|
|
let exports = store.borrow_mut().global_exports().clone();
|
|
let imports = module
|
|
.borrow()
|
|
.imports()
|
|
.iter()
|
|
.zip(externs.iter())
|
|
.map(|(i, e)| (i.module().to_string(), i.name().to_string(), e.clone()))
|
|
.collect::<Vec<_>>();
|
|
let (mut instance_handle, contexts) =
|
|
instantiate_in_context(module.borrow().binary(), imports, context, exports)?;
|
|
|
|
let exports = {
|
|
let module = module.borrow();
|
|
let mut exports = Vec::with_capacity(module.exports().len());
|
|
for export in module.exports() {
|
|
let name = export.name().to_string();
|
|
let export = instance_handle.lookup(&name).expect("export");
|
|
exports.push(Extern::from_wasmtime_export(
|
|
store.clone(),
|
|
instance_handle.clone(),
|
|
export,
|
|
));
|
|
}
|
|
exports.into_boxed_slice()
|
|
};
|
|
Ok(Instance {
|
|
instance_handle,
|
|
contexts,
|
|
exports,
|
|
})
|
|
}
|
|
|
|
pub fn exports(&self) -> &[Extern] {
|
|
&self.exports
|
|
}
|
|
|
|
pub fn from_handle(
|
|
store: HostRef<Store>,
|
|
instance_handle: InstanceHandle,
|
|
) -> Result<(Instance, HashMap<String, usize>)> {
|
|
let contexts = HashSet::new();
|
|
|
|
let mut exports = Vec::new();
|
|
let mut export_names_map = HashMap::new();
|
|
let mut mutable = instance_handle.clone();
|
|
for (name, _) in instance_handle.clone().exports() {
|
|
let export = mutable.lookup(name).expect("export");
|
|
if let wasmtime_runtime::Export::Function { signature, .. } = &export {
|
|
// HACK ensure all handles, instantiated outside Store, present in
|
|
// the store's SignatureRegistry, e.g. WASI instances that are
|
|
// imported into this store using the from_handle() method.
|
|
let _ = store.borrow_mut().register_cranelift_signature(signature);
|
|
}
|
|
export_names_map.insert(name.to_owned(), exports.len());
|
|
exports.push(Extern::from_wasmtime_export(
|
|
store.clone(),
|
|
instance_handle.clone(),
|
|
export.clone(),
|
|
));
|
|
}
|
|
|
|
Ok((
|
|
Instance {
|
|
instance_handle,
|
|
contexts,
|
|
exports: exports.into_boxed_slice(),
|
|
},
|
|
export_names_map,
|
|
))
|
|
}
|
|
|
|
pub fn handle(&self) -> &InstanceHandle {
|
|
&self.instance_handle
|
|
}
|
|
|
|
pub fn get_wasmtime_memory(&self) -> Option<wasmtime_runtime::Export> {
|
|
let mut instance_handle = self.instance_handle.clone();
|
|
instance_handle.lookup("memory")
|
|
}
|
|
}
|