Merge pull request #11124 from vouillon/wasm-fix

Js_of_ocaml rules: fix whole program compilation
ocaml · Nov 16, 2024 · d8f7631 · d8f7631
2 parents 3642425 + 21dbfe0
commit d8f7631
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 11 deletions.
diff --git a/src/dune_rules/exe_rules.ml b/src/dune_rules/exe_rules.ml
@@ -161,7 +161,8 @@ let executables_rules
   let* linkages =
     let+ jsoo_enabled_modes =
       Jsoo_rules.jsoo_enabled_modes ~expander ~dir ~in_context:js_of_ocaml
-    and+ jsoo_is_whole_program = Jsoo_rules.jsoo_is_whole_program sctx ~dir
+    and+ jsoo_is_whole_program =
+      Jsoo_rules.jsoo_is_whole_program sctx ~dir ~in_context:js_of_ocaml
     and+ dynamically_linked_foreign_archives =
       Context.dynamically_linked_foreign_archives ctx
     in

diff --git a/src/dune_rules/inline_tests.ml b/src/dune_rules/inline_tests.ml
@@ -191,7 +191,9 @@ include Sub_system.Register_end_point (struct
             | Jsoo JS -> Exe.Linkage.js
             | Jsoo Wasm -> Exe.Linkage.wasm)
         in
-        let+ jsoo_is_whole_program = Jsoo_rules.jsoo_is_whole_program sctx ~dir in
+        let+ jsoo_is_whole_program =
+          Jsoo_rules.jsoo_is_whole_program sctx ~dir ~in_context:js_of_ocaml
+        in
         if List.exists modes ~f:(fun mode ->
              match (mode : Mode_conf.t) with
              | Jsoo mode -> Js_of_ocaml.Mode.Pair.select ~mode jsoo_is_whole_program

diff --git a/src/dune_rules/jsoo/jsoo_rules.ml b/src/dune_rules/jsoo/jsoo_rules.ml
@@ -618,14 +618,25 @@ let jsoo_enabled_modes ~expander ~dir ~in_context =
   { Js_of_ocaml.Mode.Pair.js; wasm }
 ;;
 
-let jsoo_is_whole_program t ~dir =
+let jsoo_compilation_mode
+  t
+  ~dir
+  ~(in_context : Js_of_ocaml.In_context.t Js_of_ocaml.Mode.Pair.t)
+  ~mode
+  =
+  match (Js_of_ocaml.Mode.Pair.select ~mode in_context).compilation_mode with
+  | None -> js_of_ocaml_compilation_mode t ~dir ~mode
+  | Some x -> Memo.return x
+;;
+
+let jsoo_is_whole_program t ~dir ~in_context =
   let is_whole_program (mode : Js_of_ocaml.Compilation_mode.t) =
     match mode with
     | Whole_program -> true
     | Separate_compilation -> false
   in
-  let+ js = js_of_ocaml_compilation_mode t ~dir ~mode:JS
-  and+ wasm = js_of_ocaml_compilation_mode t ~dir ~mode:Wasm in
+  let+ js = jsoo_compilation_mode t ~dir ~in_context ~mode:JS
+  and+ wasm = jsoo_compilation_mode t ~dir ~in_context ~mode:Wasm in
   { Js_of_ocaml.Mode.Pair.js = is_whole_program js; wasm = is_whole_program wasm }
 ;;
 

diff --git a/src/dune_rules/jsoo/jsoo_rules.mli b/src/dune_rules/jsoo/jsoo_rules.mli
@@ -67,10 +67,5 @@ val jsoo_enabled_modes
 val jsoo_is_whole_program
   :  Super_context.t
   -> dir:Path.Build.t
+  -> in_context:Js_of_ocaml.In_context.t Js_of_ocaml.Mode.Pair.t
   -> Js_of_ocaml.Mode.Set.t Memo.t
-
-val js_of_ocaml_compilation_mode
-  :  Super_context.t
-  -> dir:Path.Build.t
-  -> mode:Js_of_ocaml.Mode.t
-  -> Js_of_ocaml.Compilation_mode.t Memo.t
diff --git a/test/blackbox-tests/test-cases/jsoo/whole_program.t/a.ml b/test/blackbox-tests/test-cases/jsoo/whole_program.t/a.ml
@@ -0,0 +1 @@
+let () = print_endline "a: ok"
diff --git a/test/blackbox-tests/test-cases/jsoo/whole_program.t/b.expected b/test/blackbox-tests/test-cases/jsoo/whole_program.t/b.expected
@@ -0,0 +1 @@
+b: ok
diff --git a/test/blackbox-tests/test-cases/jsoo/whole_program.t/b.ml b/test/blackbox-tests/test-cases/jsoo/whole_program.t/b.ml
@@ -0,0 +1 @@
+let () = print_endline "b: ok"
diff --git a/test/blackbox-tests/test-cases/jsoo/whole_program.t/dune b/test/blackbox-tests/test-cases/jsoo/whole_program.t/dune
@@ -0,0 +1,4 @@
+(tests
+ (names a b)
+ (js_of_ocaml (compilation_mode whole_program))
+ (modes js))
diff --git a/test/blackbox-tests/test-cases/jsoo/whole_program.t/dune-project b/test/blackbox-tests/test-cases/jsoo/whole_program.t/dune-project
@@ -0,0 +1 @@
+(lang dune 3.17)
diff --git a/test/blackbox-tests/test-cases/jsoo/whole_program.t/run.t b/test/blackbox-tests/test-cases/jsoo/whole_program.t/run.t
@@ -0,0 +1,4 @@
+tests stanza with jsoo
+
+  $ dune build @runtest
+  a: ok
diff --git a/test/blackbox-tests/test-cases/wasmoo/whole_program.t/a.ml b/test/blackbox-tests/test-cases/wasmoo/whole_program.t/a.ml
@@ -0,0 +1 @@
+let () = print_endline "a: ok"
diff --git a/test/blackbox-tests/test-cases/wasmoo/whole_program.t/b.expected b/test/blackbox-tests/test-cases/wasmoo/whole_program.t/b.expected
@@ -0,0 +1 @@
+b: ok
diff --git a/test/blackbox-tests/test-cases/wasmoo/whole_program.t/b.ml b/test/blackbox-tests/test-cases/wasmoo/whole_program.t/b.ml
@@ -0,0 +1 @@
+let () = print_endline "b: ok"
diff --git a/test/blackbox-tests/test-cases/wasmoo/whole_program.t/dune b/test/blackbox-tests/test-cases/wasmoo/whole_program.t/dune
@@ -0,0 +1,4 @@
+(tests
+ (names a b)
+ (wasm_of_ocaml (compilation_mode whole_program))
+ (modes wasm))
diff --git a/test/blackbox-tests/test-cases/wasmoo/whole_program.t/dune-project b/test/blackbox-tests/test-cases/wasmoo/whole_program.t/dune-project
@@ -0,0 +1 @@
+(lang dune 3.17)
diff --git a/test/blackbox-tests/test-cases/wasmoo/whole_program.t/run.t b/test/blackbox-tests/test-cases/wasmoo/whole_program.t/run.t
@@ -0,0 +1,4 @@
+tests stanza with wasmoo
+
+  $ dune build @runtest
+  a: ok