T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure Trap is returned for start function traps (#768)

Browse Source 
* Ensure `Trap` is returned for start function traps

Handle another case of errors coming out of instantiation, resolve a
FIXME, and remove an unneeded dependency from the wast testsuite crate.

* Run rustfmt
This commit is contained in:
Alex Crichton
2020-01-07 11:45:13 -06:00
committed by GitHub
parent f68bfdeedb
commit 9ead93684e
5 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/wast/src/wast.rs
View File

@@ -93,15 +93,10 @@ impl WastContext {
}
let instance = match Instance::new(&self.store, &module, &imports) {
Ok(i) => i,
// FIXME(#683) shouldn't have to reach into runtime crate
Err(e) => {
use wasmtime_runtime::InstantiationError;
let err = e
.chain()
.filter_map(|e| e.downcast_ref::<InstantiationError>())
.next();
if let Some(InstantiationError::StartTrap(msg)) = err {
return Ok(Outcome::Trap(Trap::new(msg.clone())));
let err = e.chain().filter_map(|e| e.downcast_ref::<Trap>()).next();
if let Some(trap) = err {
return Ok(Outcome::Trap(trap.clone()));
}
return Err(e);
}