Merge remote-tracking branch 'origin/master' into feature/singlepass-nan-cncl

lib/runtime-core/Cargo.toml

@@ -39,7 +39,7 @@ version = "0.11"
 [dependencies.serde-bench]
 version = "0.0.7"
 [dependencies.blake3]
-version = "0.1.0"
+version = "0.2.0"
 [dependencies.digest]
 version = "0.8"
 
@@ -47,7 +47,7 @@ version = "0.8"
 winapi = { version = "0.3", features = ["memoryapi"] }
 
 [build-dependencies]
-blake3 = "0.1.0"
+blake3 = "0.2.0"
 rustc_version = "0.2"
 cc = "1.0"
 

lib/runtime-core/src/typed_func.rs

@@ -334,7 +334,14 @@ impl<'a> DynamicFunc<'a> {
                     }
                 })
                 .collect();
-            (ctx.func)(vmctx, &args)
+            match panic::catch_unwind(panic::AssertUnwindSafe(|| (ctx.func)(vmctx, &args))) {
+                Ok(x) => x,
+                Err(e) => {
+                    // At this point, there is an error that needs to be trapped.
+                    drop(args); // Release the Vec which will leak otherwise.
+                    (&*vmctx.module).runnable_module.do_early_trap(e)
+                }
+            }
         }
         unsafe extern "C" fn enter_host_polymorphic_i(
             ctx: *const CallContext,