Merge pull request #1033 from WebAssembly/fuzz2

More misc fuzz fixes

1 files changed, 8 insertions, 7 deletions

diff --git a/src/tools/wasm-opt.cpp b/src/tools/wasm-opt.cpp
index 0603ae93c..184dbae1b 100644
--- a/src/tools/wasm-opt.cpp
+++ b/src/tools/wasm-opt.cpp
@@ -73,15 +73,16 @@ struct ExecutionResults {
 
   Literal run(Function* func, Module& wasm) {
     ShellExternalInterface interface;
-    ModuleInstance instance(wasm, &interface);
-    LiteralList arguments;
-    for (WasmType param : func->params) {
-      // zeros in arguments TODO: more?
-      arguments.push_back(Literal(param));
-    }
     try {
-      return instance.callFunctionInternal(func->name, arguments);
+      ModuleInstance instance(wasm, &interface);
+      LiteralList arguments;
+      for (WasmType param : func->params) {
+        // zeros in arguments TODO: more?
+        arguments.push_back(Literal(param));
+      }
+      return instance.callFunction(func->name, arguments);
     } catch (const TrapException&) {
+      // may throw in instance creation (init of offsets) or call itself
       return Literal();
     }
   }