c-api: Avoid losing error context with instance traps

This commit was a mistake from bytecodealliance#5149
alexcrichton · Nov 8, 2022 · c61b1ce · c61b1ce
1 parent d4f3851
commit c61b1ce
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/crates/c-api/src/instance.rs b/crates/c-api/src/instance.rs
@@ -98,13 +98,14 @@ pub(crate) fn handle_instantiate(
  *instance_ptr = i;
  None
  }
- Err(e) => match e.downcast::<Trap>() {
- Ok(trap) => {
- *trap_ptr = Box::into_raw(Box::new(wasm_trap_t::new(trap.into())));
+ Err(e) => {
+ if e.is::<Trap>() {
+ *trap_ptr = Box::into_raw(Box::new(wasm_trap_t::new(e)));
  None
+ } else {
+ Some(Box::new(e.into()))
  }
- Err(e) => Some(Box::new(e.into())),
- },
+ }
  }
 }