fix(trap): remove the duplicated panicking function in call stack

patractlabs · Jun 2, 2021 · c0b7a80 · c0b7a80
1 parent 22fd27e
commit c0b7a80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/src/func.rs b/src/func.rs
@@ -176,7 +176,7 @@ impl FuncInstance {
                             if let Some(info) = n {
                                 format!("{:#}[{}]", rustc_demangle::demangle(&info.1), info.0)
                             } else {
-                                "unknown".to_string()
+                                "<unknown>".to_string()
                             }
                         })
                         .collect::<Vec<_>>();

diff --git a/src/runner.rs b/src/runner.rs
@@ -320,26 +320,19 @@ impl Interpreter {
                                                 nested_func.signature().return_type(),
                                             );
                                         }
-                                        return Err(
-                                            trap.wasm_trace_with(function_ref.clone().info())
-                                        );
+                                        return Err(trap);
                                     }
                                 };
 
                             // Check if `return_val` matches the signature.
                             let value_ty = return_val.as_ref().map(|val| val.value_type());
                             let expected_ty = nested_func.signature().return_type();
                             if value_ty != expected_ty {
-                                return Err(Trap::wasm_trace_with_kind(
-                                    TrapKind::StackOverflow,
-                                    function_ref.clone().info(),
-                                ));
+                                return Err(TrapKind::StackOverflow.into());
                             }
 
                             if let Some(return_val) = return_val {
-                                self.value_stack.push(return_val.into()).map_err(|trap| {
-                                    Trap::wasm_trace_with_kind(trap, function_ref.clone().info())
-                                })?;
+                                self.value_stack.push(return_val.into())?;
                             }
                         }
                     }