feat(wasm_trace): support unknown info in wasm trace

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

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/func.rs b/src/func.rs
@@ -172,7 +172,13 @@ impl FuncInstance {
                     let mut stack = interpreter
                         .trace()
                         .iter()
-                        .map(|n| format!("{:#}[{}]", rustc_demangle::demangle(&n.1), n.0))
+                        .map(|n| {
+                            if let Some(info) = n {
+                                format!("{:#}[{}]", rustc_demangle::demangle(&info.1), info.0)
+                            } else {
+                                "unknown".to_string()
+                            }
+                        })
                         .collect::<Vec<_>>();
 
                     // Append the panicing trap

diff --git a/src/runner.rs b/src/runner.rs
@@ -223,7 +223,7 @@ impl Interpreter {
     }
 
     /// Get the stack functions
-    pub fn trace(&self) -> Vec<&(usize, String)> {
+    pub fn trace(&self) -> Vec<Option<&(usize, String)>> {
         self.call_stack.trace()
     }
 
@@ -1488,8 +1488,8 @@ impl CallStack {
     }
 
     /// Get the functions of current the stack
-    pub fn trace(&self) -> Vec<&(usize, String)> {
-        self.buf.iter().filter_map(|f| f.info()).collect::<Vec<_>>()
+    pub fn trace(&self) -> Vec<Option<&(usize, String)>> {
+        self.buf.iter().map(|f| f.info()).collect::<Vec<_>>()
     }
 }