Wasm_of_ocaml: support JavaScript strings in prelude code

Author: vouillon

compiler/bin-wasm_of_ocaml/compile.ml

@@ -162,33 +162,33 @@ let generate_prelude ~out_file =
   in
   let context = Generate.start () in
   let debug = Parse_bytecode.Debug.create ~include_cmis:false false in
-  let _ =
+  let _, generated_js =
     Generate.f
       ~context
-      ~unit_name:(Some "prelude")
+      ~unit_name:(Some "wasmoo_prelude")
       ~live_vars:variable_uses
       ~in_cps
       ~deadcode_sentinal
       ~debug
       program
   in
   Generate.output ch ~context;
-  uinfo.provides
+  uinfo.provides, generated_js
 
 let build_prelude z =
   Fs.with_intermediate_file (Filename.temp_file "prelude" ".wasm")
   @@ fun prelude_file ->
   Fs.with_intermediate_file (Filename.temp_file "prelude_file" ".wasm")
   @@ fun tmp_prelude_file ->
-  let predefined_exceptions = generate_prelude ~out_file:prelude_file in
+  let info = generate_prelude ~out_file:prelude_file in
   Binaryen.optimize
     ~profile:(Driver.profile 1)
     ~input_file:prelude_file
     ~output_file:tmp_prelude_file
     ~opt_input_sourcemap:None
     ~opt_output_sourcemap:None;
   Zip.add_file z ~name:"prelude.wasm" ~file:tmp_prelude_file;
-  predefined_exceptions
+  info
 
 let build_js_runtime ~primitives ?runtime_arguments () =
   let always_required_js, primitives =
@@ -364,12 +364,18 @@ let run
      let z = Zip.open_out tmp_output_file in
      Zip.add_file z ~name:"runtime.wasm" ~file:tmp_wasm_file;
      Zip.add_entry z ~name:"runtime.js" ~contents:js_runtime;
-     let predefined_exceptions = build_prelude z in
+     let predefined_exceptions, (strings, fragments) = build_prelude z in
      Link.add_info
        z
        ~predefined_exceptions
        ~build_info:(Build_info.create `Runtime)
-       ~unit_data:[]
+       ~unit_data:
+         [ { Link.unit_name = "wasmoo_prelude"
+           ; unit_info = Unit_info.empty
+           ; strings
+           ; fragments
+           }
+         ]
        ();
      Zip.close_out z)
    else

compiler/lib-wasm/link.ml

@@ -388,7 +388,7 @@ let generate_start_function ~to_link ~out_file =
   Filename.gen_file out_file
   @@ fun ch ->
   let context = Generate.start () in
-  Generate.add_init_function ~context ~to_link:("prelude" :: to_link);
+  Generate.add_init_function ~context ~to_link:("wasmoo_prelude" :: to_link);
   Generate.wasm_output ch ~context;
   if times () then Format.eprintf "    generate start: %a@." Timer.print t1
 
@@ -669,11 +669,11 @@ let load_information files =
   match files with
   | [] -> assert false
   | runtime :: other_files ->
-      let build_info, predefined_exceptions, _unit_data =
+      let build_info, predefined_exceptions, unit_data =
         Zip.with_open_in runtime read_info
       in
       ( predefined_exceptions
-      , (runtime, (build_info, []))
+      , (runtime, (build_info, unit_data))
         :: List.map other_files ~f:(fun file ->
                let build_info, _predefined_exceptions, unit_data =
                  Zip.with_open_in file read_info
@@ -775,7 +775,8 @@ let link ~output_file ~linkall ~enable_source_maps ~files =
               || cmo_file
               || linkall
               || unit_info.force_link
-              || not (StringSet.is_empty (StringSet.inter requires unit_info.provides))
+              || (not (StringSet.is_empty (StringSet.inter requires unit_info.provides)))
+              || String.equal unit_name "wasmoo_prelude"
             then
               ( StringSet.diff
                   (StringSet.union unit_info.requires requires)