WASI runtime

compiler/bin-wasm_of_ocaml/compile.ml

@@ -165,7 +165,10 @@ let link_and_optimize
   @@ fun opt_temp_sourcemap' ->
   let primitives =
     Binaryen.dead_code_elimination
-      ~dependencies:Runtime_files.dependencies
+      ~dependencies:
+        (if Config.Flag.wasi ()
+         then Runtime_files.wasi_dependencies
+         else Runtime_files.dependencies)
       ~opt_input_sourcemap:opt_temp_sourcemap
       ~opt_output_sourcemap:opt_temp_sourcemap'
       ~input_file:temp_file
@@ -273,7 +276,13 @@ let build_js_runtime ~primitives ?runtime_arguments () =
   in
   let prelude = Link.output_js always_required_js in
   let init_fun =
-    match Parse_js.parse (Parse_js.Lexer.of_string Runtime_files.js_runtime) with
+    match
+      Parse_js.parse
+        (Parse_js.Lexer.of_string
+           (if Config.Flag.wasi ()
+            then Runtime_files.js_wasi_launcher
+            else Runtime_files.js_launcher))
+    with
     | [ (Expression_statement f, _) ] -> f
     | _ -> assert false
   in

compiler/bin-wasm_of_ocaml/gen/gen.ml

@@ -25,7 +25,7 @@ let print_flags f flags =
 let () =
   let () = set_binary_mode_out stdout true in
   Format.printf
-    "let js_runtime = \"%s\"@."
+    "let js_launcher = \"%s\"@."
     (String.escaped (read_file (open_in_bin Sys.argv.(1))));
   Format.printf
     "let dependencies = \"%s\"@."

compiler/lib-wasm/binaryen.ml

@@ -36,6 +36,7 @@ let common_options () =
     ; "--enable-bulk-memory"
     ; "--enable-nontrapping-float-to-int"
     ; "--enable-strings"
+    ; "--enable-multimemory" (* To keep wasm-merge happy *)
     ]
   in
   if Config.Flag.pretty () then "-g" :: l else l
@@ -111,9 +112,9 @@ let dead_code_elimination
   filter_unused_primitives primitives usage_file
 
 let optimization_options =
-  [| [ "-O2"; "--skip-pass=inlining-optimizing"; "--traps-never-happen" ]
-   ; [ "-O2"; "--skip-pass=inlining-optimizing"; "--traps-never-happen" ]
-   ; [ "-O3"; "--skip-pass=inlining-optimizing"; "--traps-never-happen" ]
+  [| [ "-O2"; "--skip-pass=inlining-optimizing" ]
+   ; [ "-O2"; "--skip-pass=inlining-optimizing" ]
+   ; [ "-O3"; "--skip-pass=inlining-optimizing" ]
   |]
 
 let optimize
@@ -132,6 +133,7 @@ let optimize
   command
     ("wasm-opt"
      :: (common_options ()
+        @ (if Config.Flag.trap_on_exception () then [] else [ "--traps-never-happen" ])
         @ Option.value ~default:optimization_options.(level - 1) options
         @ [ Filename.quote input_file; "-o"; Filename.quote output_file ])
     @ opt_flag "--input-source-map" opt_input_sourcemap

compiler/lib-wasm/gc_target.ml

@@ -1294,7 +1294,12 @@ module Math = struct
     { W.params = List.init ~len:n ~f:(fun _ : W.value_type -> F64); result = [ F64 ] }
 
   let unary name x =
-    let* f = register_import ~import_module:"Math" ~name (Fun (float_func_type 1)) in
+    let* f =
+      register_import
+        ~import_module:(if Config.Flag.wasi () then "env" else "Math")
+        ~name
+        (Fun (float_func_type 1))
+    in
     let* x = x in
     return (W.Call (f, [ x ]))
 
@@ -1337,7 +1342,12 @@ module Math = struct
   let log10 f = unary "log10" f
 
   let binary name x y =
-    let* f = register_import ~import_module:"Math" ~name (Fun (float_func_type 2)) in
+    let* f =
+      register_import
+        ~import_module:(if Config.Flag.wasi () then "env" else "Math")
+        ~name
+        (Fun (float_func_type 2))
+    in
     let* x = x in
     let* y = y in
     return (W.Call (f, [ x; y ]))

compiler/lib-wasm/wat_output.ml

@@ -444,19 +444,23 @@ let expression_or_instructions ctx st in_function =
             @ [ List (Atom "else" :: expression iff) ])
         ]
     | Try (ty, body, catches) ->
-        [ List
-            (Atom "try"
-            :: (block_type st ty
-               @ List (Atom "do" :: instructions body)
-                 :: List.map
-                      ~f:(fun (tag, i, ty) ->
-                        List
-                          (Atom "catch"
-                          :: index st.tag_names tag
-                          :: (instruction (Wasm_ast.Event Code_generation.hidden_location)
-                             @ instruction (Wasm_ast.Br (i + 1, Some (Pop ty))))))
-                      catches))
-        ]
+        if Config.Flag.trap_on_exception ()
+        then [ List (Atom "block" :: (block_type st ty @ instructions body)) ]
+        else
+          [ List
+              (Atom "try"
+              :: (block_type st ty
+                 @ List (Atom "do" :: instructions body)
+                   :: List.map
+                        ~f:(fun (tag, i, ty) ->
+                          List
+                            (Atom "catch"
+                            :: index st.tag_names tag
+                            :: (instruction
+                                  (Wasm_ast.Event Code_generation.hidden_location)
+                               @ instruction (Wasm_ast.Br (i + 1, Some (Pop ty))))))
+                        catches))
+          ]
   and instruction i =
     match i with
     | Drop e -> [ List (Atom "drop" :: expression e) ]
@@ -499,8 +503,14 @@ let expression_or_instructions ctx st in_function =
             | None -> []
             | Some e -> expression e))
         ]
-    | Throw (tag, e) -> [ List (Atom "throw" :: index st.tag_names tag :: expression e) ]
-    | Rethrow i -> [ List [ Atom "rethrow"; Atom (string_of_int i) ] ]
+    | Throw (tag, e) ->
+        if Config.Flag.trap_on_exception ()
+        then [ List [ Atom "unreachable" ] ]
+        else [ List (Atom "throw" :: index st.tag_names tag :: expression e) ]
+    | Rethrow i ->
+        if Config.Flag.trap_on_exception ()
+        then [ List [ Atom "unreachable" ] ]
+        else [ List [ Atom "rethrow"; Atom (string_of_int i) ] ]
     | CallInstr (f, l) ->
         [ List
             (Atom "call"

compiler/lib-wasm/wat_preprocess.ml

@@ -410,26 +410,42 @@ and rewrite st elt =
   | { desc =
         List
           ({ desc = Atom "try"; _ }
-          :: ( { desc = List ({ desc = Atom "result"; _ } :: _); _ }
-               :: { desc = List ({ desc = Atom "do"; loc = _, pos_after_do } :: body)
-                  ; loc = _, pos_after_body
-                  }
-               :: _
-             | { desc = List ({ desc = Atom "do"; loc = _, pos_after_do } :: body)
-               ; loc = _, pos_after_body
-               }
-               :: _ ))
+          :: { desc = List ({ desc = Atom "result"; _ } :: _)
+             ; loc = pos_before_result, pos_after_result
+             }
+          :: { desc = List ({ desc = Atom "do"; loc = _, pos_after_do } :: body)
+             ; loc = _, pos_after_body
+             }
+          :: _)
+    ; loc = pos, pos'
+    }
+    when variable_is_set st "trap-on-exception" ->
+      write st pos;
+      Buffer.add_string st.buf "(block";
+      skip st pos_before_result;
+      write st pos_after_result;
+      skip st pos_after_do;
+      rewrite_list st body;
+      write st pos_after_body;
+      skip st pos'
+  | { desc =
+        List
+          ({ desc = Atom "try"; _ }
+          :: { desc = List ({ desc = Atom "do"; loc = _, pos_after_do } :: body)
+             ; loc = _, pos_after_body
+             }
+          :: _)
     ; loc = pos, pos'
     }
-    when false (*ZZZ StringMap.find "trap-on-exception" st.variables*) ->
+    when variable_is_set st "trap-on-exception" ->
       write st pos;
       Buffer.add_string st.buf "(block";
       skip st pos_after_do;
       rewrite_list st body;
       write st pos_after_body;
       skip st pos'
   | { desc = List ({ desc = Atom "throw"; _ } :: _); loc = pos, pos' }
-    when false (*ZZZ StringMap.find "trap-on-exception" st.variables*) ->
+    when variable_is_set st "trap-on-exception" ->
       write st pos;
       Buffer.add_string st.buf "(unreachable)";
       skip st pos'

compiler/lib/config.ml

@@ -101,6 +101,10 @@ module Flag = struct
   let auto_link = o ~name:"auto-link" ~default:true
 
   let es6 = o ~name:"es6" ~default:false
+
+  let wasi = o ~name:"wasi" ~default:false
+
+  let trap_on_exception = o ~name:"trap-on-exception" ~default:false
 end
 
 module Param = struct

compiler/lib/config.mli

@@ -76,6 +76,10 @@ module Flag : sig
 
   val es6 : unit -> bool
 
+  val wasi : unit -> bool
+
+  val trap_on_exception : unit -> bool
+
   val enable : string -> unit
 
   val disable : string -> unit

compiler/lib/inline.ml

@@ -328,7 +328,7 @@ let inline ~first_class_primitives live_vars closures name pc (outer, p) =
 
 let times = Debug.find "times"
 
-let f p live_vars =
+let f p (live_vars : Deadcode.variable_uses) =
   let first_class_primitives =
     match Config.target (), Config.effects () with
     | `JavaScript, `Disabled -> true

compiler/tests-jsoo/dune

@@ -5,6 +5,8 @@
  (enabled_if
   (>= %{ocaml_version} 4.14))
  (inline_tests
+  (deps
+   (sandbox preserve_file_kind))
   (modes js wasm best))
  (preprocess
   (pps ppx_expect)))
@@ -16,6 +18,8 @@
  (enabled_if
   (>= %{ocaml_version} 5.1.1))
  (inline_tests
+  (deps
+   (sandbox preserve_file_kind))
   (modes js wasm best))
  (preprocess
   (pps ppx_expect)))
@@ -27,6 +31,8 @@
  (enabled_if
   (>= %{ocaml_version} 5.1.1))
  (inline_tests
+  (deps
+   (sandbox preserve_file_kind))
   (modes js wasm best))
  (preprocess
   (pps ppx_expect)))
@@ -48,6 +54,8 @@
   (language c)
   (names bigarray_stubs))
  (inline_tests
+  (deps
+   (sandbox preserve_file_kind))
   (modes js wasm best))
  (preprocess
   (pps ppx_expect)))

compiler/tests-jsoo/lib-effects/dune

@@ -1,6 +1,10 @@
 (env
  (with-effects-double-translation)
  (with-effects)
+ (wasi
+  (wasm_of_ocaml
+   (flags
+    (:standard --enable effects))))
  (_
   (js_of_ocaml
    (flags
@@ -11,6 +15,8 @@
  (enabled_if
   (>= %{ocaml_version} 5))
  (inline_tests
+  (deps
+   (sandbox preserve_file_kind))
   (modes js wasm best))
  (modules
   (:standard

compiler/tests-ocaml/basic-io-2/dune

@@ -1,5 +1,8 @@
 (tests
  (names io)
  (modes js wasm)
+ (enabled_if
+  (<> %{profile} wasi))
+ ;; Sys.command not implemented
  (action
   (run node %{test} %{dep:test-file-short-lines})))

compiler/tests-ocaml/effect-syntax/dune

@@ -1,6 +1,12 @@
 (env
  (with-effects-double-translation)
  (with-effects)
+ (wasi
+  (flags
+   (:standard -w -38))
+  (wasm_of_ocaml
+   (flags
+    (:standard --enable=effects))))
  (_
   (js_of_ocaml
    (flags

compiler/tests-ocaml/effects/dune

@@ -1,6 +1,12 @@
 (env
  (with-effects-double-translation)
  (with-effects)
+ (wasi
+  (flags
+   (:standard -w -38))
+  (wasm_of_ocaml
+   (flags
+    (:standard --enable=effects))))
  (_
   (js_of_ocaml
    (flags

compiler/tests-ocaml/lib-marshal/intext.ml

@@ -4,7 +4,7 @@
 
 (* Test for output_value / input_value *)
 
-let max_data_depth = 500000
+let max_data_depth = 50000
 
 type t = A | B of int | C of float | D of string | E of char
        | F of t | G of t * t | H of int * t | I of t * float | J

compiler/tests-ocaml/lib-marshal/intext_par.ml

@@ -17,7 +17,7 @@ let test_size =
 
 let num_domains = 1 lsl test_size
 
-let max_data_depth = 500000
+let max_data_depth = 50000
 
 type t = A | B of int | C of float | D of string | E of char
        | F of t | G of t * t | H of int * t | I of t * float | J

dune

@@ -30,6 +30,14 @@
   (binaries
    (tools/node_wrapper.exe as node)
    (tools/node_wrapper.exe as node.exe)))
+ (wasi
+  (wasm_of_ocaml
+   (flags
+    (:standard --pretty --enable wasi))
+   (compilation_mode whole_program))
+  (binaries
+   (tools/node_wrapper.exe as node)
+   (tools/node_wrapper.exe as node.exe)))
  (bench_no_debug
   (flags
    (:standard \ -g))

lib/deriving_json/tests/dune

@@ -2,6 +2,8 @@
  (name deriving_expect_tests)
  (libraries unix js_of_ocaml js_of_ocaml.deriving)
  (inline_tests
+  (enabled_if
+   (<> %{profile} wasi))
   (modes js wasm))
  (preprocess
   (pps ppx_expect ppx_deriving_json)))