From cc3ab1ed8d68815a9b36b71864dccf2359d685aa Mon Sep 17 00:00:00 2001
From: rossberg-chromium <rossberg@chromium.org>
Date: Thu, 13 Oct 2016 14:10:57 +0200
Subject: [PATCH] Test traps from start function; check JS Error classes

---
 ml-proto/README.md       |  1 +
 ml-proto/host/arrange.ml |  2 ++
 ml-proto/host/js.ml      | 26 ++++++++++++++++++++++----
 ml-proto/host/parser.mly |  2 ++
 ml-proto/host/run.ml     | 18 ++++++++++++++++++
 ml-proto/host/script.ml  |  1 +
 ml-proto/test/start.wast |  5 +++++
 7 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/ml-proto/README.md b/ml-proto/README.md
index f2b3920e27..7640a4731a 100644
--- a/ml-proto/README.md
+++ b/ml-proto/README.md
@@ -275,6 +275,7 @@ assertion:
   ( assert_malformed <module> <failure> )    ;; assert module cannot be decoded with given failure string
   ( assert_invalid <module> <failure> )      ;; assert module is invalid with given failure string
   ( assert_unlinkable <module> <failure> )   ;; assert module fails to link
+  ( assert_trap <module> <failure> )         ;; assert module traps on instantiation
 
 meta:
   ( script <name>? <script> )                ;; name a subscript
diff --git a/ml-proto/host/arrange.ml b/ml-proto/host/arrange.ml
index 73d34fcc47..3d73870616 100644
--- a/ml-proto/host/arrange.ml
+++ b/ml-proto/host/arrange.ml
@@ -413,6 +413,8 @@ let assertion mode ass =
     Node ("assert_invalid", [definition mode None def; Atom (string re)])
   | AssertUnlinkable (def, re) ->
     Node ("assert_unlinkable", [definition mode None def; Atom (string re)])
+  | AssertUninstantiable (def, re) ->
+    Node ("assert_trap", [definition mode None def; Atom (string re)])
   | AssertReturn (act, lits) ->
     Node ("assert_return", action act :: List.map literal lits)
   | AssertReturnNaN act ->
diff --git a/ml-proto/host/js.ml b/ml-proto/host/js.ml
index 9052e4aff2..a385f890a8 100644
--- a/ml-proto/host/js.ml
+++ b/ml-proto/host/js.ml
@@ -38,23 +38,39 @@ let prefix =
   "}\n" ^
   "\n" ^
   "function assert_malformed(bytes) {\n" ^
-  "  try { module(bytes) } catch (e) { return }\n" ^
+  "  try { module(bytes) } catch (e) {\n" ^
+  "    if (e instanceof WebAssembly.CompileError) return;\n" ^
+  "  }\n" ^
   "  throw new Error(\"Wasm decoding failure expected\");\n" ^
   "}\n" ^
   "\n" ^
   "function assert_invalid(bytes) {\n" ^
-  "  try { module(bytes) } catch (e) { return }\n" ^
+  "  try { module(bytes) } catch (e) {\n" ^
+  "    if (e instanceof WebAssembly.CompileError) return;\n" ^
+  "  }\n" ^
   "  throw new Error(\"Wasm validation failure expected\");\n" ^
   "}\n" ^
   "\n" ^
   "function assert_unlinkable(bytes) {\n" ^
   "  let mod = module(bytes);\n" ^
-  "  try { new WebAssembly.Instance(mod, registry) } catch (e) { return }\n" ^
+  "  try { new WebAssembly.Instance(mod, registry) } catch (e) {\n" ^
+  "    if (e instanceof TypeError) return;\n" ^
+  "  }\n" ^
   "  throw new Error(\"Wasm linking failure expected\");\n" ^
   "}\n" ^
   "\n" ^
+  "function assert_uninstantiable(bytes) {\n" ^
+  "  let mod = module(bytes);\n" ^
+  "  try { new WebAssembly.Instance(mod, registry) } catch (e) {\n" ^
+  "    if (e instanceof WebAssembly.RuntimeError) return;\n" ^
+  "  }\n" ^
+  "  throw new Error(\"Wasm trap expected\");\n" ^
+  "}\n" ^
+  "\n" ^
   "function assert_trap(action) {\n" ^
-  "  try { action() } catch (e) { return }\n" ^
+  "  try { action() } catch (e) {\n" ^
+  "    if (e instanceof WebAssembly.RuntimeError) return;\n" ^
+  "  }\n" ^
   "  throw new Error(\"Wasm trap expected\");\n" ^
   "}\n" ^
   "\n" ^
@@ -259,6 +275,8 @@ let of_assertion mods ass =
     "assert_invalid(" ^ of_definition def ^ ");"
   | AssertUnlinkable (def, _) ->
     "assert_unlinkable(" ^ of_definition def ^ ");"
+  | AssertUninstantiable (def, _) ->
+    "assert_uninstantiable(" ^ of_definition def ^ ");"
   | AssertReturn (act, lits) ->
     of_return_assertion mods act
       (fun act_js ->
diff --git a/ml-proto/host/parser.mly b/ml-proto/host/parser.mly
index a31367c349..24e9a7a29f 100644
--- a/ml-proto/host/parser.mly
+++ b/ml-proto/host/parser.mly
@@ -693,6 +693,8 @@ assertion :
     { AssertInvalid (snd $3, $4) @@ at () }
   | LPAR ASSERT_UNLINKABLE module_ TEXT RPAR
     { AssertUnlinkable (snd $3, $4) @@ at () }
+  | LPAR ASSERT_TRAP module_ TEXT RPAR
+    { AssertUninstantiable (snd $3, $4) @@ at () }
   | LPAR ASSERT_RETURN action const_list RPAR { AssertReturn ($3, $4) @@ at () }
   | LPAR ASSERT_RETURN_NAN action RPAR { AssertReturnNaN $3 @@ at () }
   | LPAR ASSERT_TRAP action TEXT RPAR { AssertTrap ($3, $4) @@ at () }
diff --git a/ml-proto/host/run.ml b/ml-proto/host/run.ml
index df9e919e1d..d9b6ca8efc 100644
--- a/ml-proto/host/run.ml
+++ b/ml-proto/host/run.ml
@@ -305,6 +305,24 @@ let run_assertion ass =
       Assert.error ass.at "expected linking error"
     )
 
+  | AssertUninstantiable (def, re) ->
+    trace "Asserting trap...";
+    let m = run_definition def in
+    if not !Flags.unchecked then Check.check_module m;
+    (match
+      let imports = Import.link m in
+      ignore (Eval.init m imports)
+    with
+    | exception Eval.Trap (_, msg) ->
+      if not (Str.string_match (Str.regexp re) msg 0) then begin
+        print_endline ("Result: \"" ^ msg ^ "\"");
+        print_endline ("Expect: \"" ^ re ^ "\"");
+        Assert.error ass.at "wrong instantiation trap"
+      end
+    | _ ->
+      Assert.error ass.at "expected instaniation trap"
+    )
+
   | AssertReturn (act, es) ->
     trace ("Asserting return...");
     let got_vs = run_action act in
diff --git a/ml-proto/host/script.ml b/ml-proto/host/script.ml
index 8dbae17957..ccdf4bdb4b 100644
--- a/ml-proto/host/script.ml
+++ b/ml-proto/host/script.ml
@@ -15,6 +15,7 @@ and assertion' =
   | AssertMalformed of definition * string
   | AssertInvalid of definition * string
   | AssertUnlinkable of definition * string
+  | AssertUninstantiable of definition * string
   | AssertReturn of action * Ast.literal list
   | AssertReturnNaN of action
   | AssertTrap of action * string
diff --git a/ml-proto/test/start.wast b/ml-proto/test/start.wast
index a20c449be9..513f7b9bab 100644
--- a/ml-proto/test/start.wast
+++ b/ml-proto/test/start.wast
@@ -86,3 +86,8 @@
   (func $main (call $print_i32 (i32.const 2)))
   (start $main)
 )
+
+(assert_trap
+  (module (func $main (unreachable)) (start $main))
+  "unreachable"
+)