Merge branch 'main' into fix-11375

Author: maiste

.git-blame-ignore-revs

@@ -6,3 +6,7 @@
 14d199fa57d05692385342685f431cd3a6a8205c
 # switch to janestreet profile
 cb8f84e01a2eb4a2a2cf8d5bcfe5b2fc23e93d96
+# ocamlformat 0.26.1
+f739a11a7d407db219446757093c4bc913989378
+# ocamlformat 0.27.0
+197b0c84d2e51647892fe6c9a6842265b4866255

.github/ISSUE_TEMPLATE/bug_report.md

@@ -30,7 +30,7 @@ assignees: ''
 ## Specifications
 
 - Version of `dune` (output of `dune --version`):
-- Version of `ocaml` (output of `ocamlc --version`)
+- Version of `ocaml` (output of `ocamlc --version`):
 - Operating system (distribution and version):
 
 <!-- remove the following if not used -->

.github/workflows/workflow.yml

@@ -56,13 +56,6 @@ jobs:
           - ocaml-compiler: 4.08.x
             os: ubuntu-latest
             skip_test: true
-          - ocaml-compiler: 4.04.x
-            os: ubuntu-latest
-            skip_test: true
-            configurator: true
-          - ocaml-compiler: 4.02.x
-            os: ubuntu-latest
-            skip_test: true
 
     runs-on: ${{ matrix.os }}
 
@@ -143,6 +136,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v18
       - run: nix develop .#doc -c make doc
+        env:
+          LC_ALL: C
 
   coq:
     name: Coq 8.16.1
@@ -164,43 +159,10 @@ jobs:
         with:
           node-version: latest
 
-      - name: Restore Cached Binaryen
-        id: cache-binaryen
-        uses: actions/cache/restore@v4
+      - name: Set-up Binaryen
+        uses: Aandreba/[email protected]
         with:
-          path: binaryen
-          key: ${{ runner.os }}-binaryen-version_119
-
-      - name: Checkout Binaryen
-        if: steps.cache-binaryen.outputs.cache-hit != 'true'
-        uses: actions/checkout@v4
-        with:
-          repository: WebAssembly/binaryen
-          path: binaryen
-          submodules: true
-          ref: version_119
-
-      - name: Install Ninja
-        if: steps.cache-binaryen.outputs.cache-hit != 'true'
-        run: sudo apt-get install ninja-build
-
-      - name: Build Binaryen
-        if: steps.cache-binaryen.outputs.cache-hit != 'true'
-        working-directory: ./binaryen
-        run: |
-          cmake -G Ninja .
-          ninja
-
-      - name: Cache Binaryen
-        if: steps.cache-binaryen.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          path: binaryen
-          key: ${{ runner.os }}-binaryen-version_119
-
-      - name: Set Binaryen's Path
-        run: |
-          echo "$GITHUB_WORKSPACE/binaryen/bin" >> $GITHUB_PATH
+          token: ${{ github.token }}
 
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -212,20 +174,16 @@ jobs:
         with:
           ocaml-compiler: 4.14.x
 
+      - name: Install faked binaryen-bin package
+        # It's faster to use a cached version
+        run: opam install --fake binaryen-bin
+
       - name: Update Dune
         working-directory: ./dune
         run: opam pin add -n dune . --with-version 3.17.0
 
-      - name: Checkout Wasm_of_ocaml
-        uses: actions/checkout@v4
-        with:
-          repository: ocsigen/js_of_ocaml
-          path: wasm_of_ocaml
-
       - name: Install Wasm_of_ocaml
-        working-directory: ./wasm_of_ocaml
         run: |
-           opam pin add -n . --with-version `< VERSION`
            opam install wasm_of_ocaml-compiler
 
       - name: Set Git User

.ocamlformat

@@ -1,3 +1,3 @@
-version=0.26.2
+version=0.27.0
 profile=janestreet
 ocaml-version=4.08.0

CHANGES.md

@@ -5,6 +5,19 @@ If you're a contributor, please include your CHANGES entry in a file
 `doc/changes/$PR_NAME.md`. At release time, it will be incoporated into the
 changelog properly.
 
+3.17.2 (2025-01-23)
+-------------------
+
+### Fixed
+
+- Fix a crash in the Melange rules that would prevent compiling public library
+implementations of virtual libraries. (@anmonteiro, #11248)
+- Pass `melange.emit`'s `compile_flags` to the JS emission phase. (@anmonteiro,
+  #11252)
+- Disallow private implementations of public virtual libs in melange mode.
+  (@anmonteiro, #11253)
+- Wasm_of_ocaml: fix the execution of tests in a sandbox.  (#11304, @vouillon)
+
 3.17.1 (2024-12-17)
 -------------------
 

bench/bench.ml

@@ -180,28 +180,28 @@ let tag_results { size; clean; zero } =
     - stack_size - not very useful
     - forced_collections - only available in OCaml >= 4.12 *)
 let display_clean_and_zero_with_sandboxing
-  ({ elapsed_time
-   ; user_cpu_time
-   ; system_cpu_time
-   ; minor_words
-   ; promoted_words
-   ; major_words
-   ; minor_collections
-   ; major_collections
-   ; heap_words
-   ; heap_chunks
-   ; live_words
-   ; live_blocks
-   ; free_words
-   ; free_blocks
-   ; largest_free
-   ; fragments = _
-   ; compactions
-   ; top_heap_words
-   ; stack_size = _
-   } :
-    _ Metrics.t)
-  (zero : _ Metrics.t)
+      ({ elapsed_time
+       ; user_cpu_time
+       ; system_cpu_time
+       ; minor_words
+       ; promoted_words
+       ; major_words
+       ; minor_collections
+       ; major_collections
+       ; heap_words
+       ; heap_chunks
+       ; live_words
+       ; live_blocks
+       ; free_words
+       ; free_blocks
+       ; largest_free
+       ; fragments = _
+       ; compactions
+       ; top_heap_words
+       ; stack_size = _
+       } :
+        _ Metrics.t)
+      (zero : _ Metrics.t)
   =
   let display what units clean zero =
     { Output.name = what

bench/gen_synthetic.ml

@@ -8,10 +8,12 @@ let write_modules basedir num_modules =
   done
 ;;
 
-let dune = {|
+let dune =
+  {|
 (library
  (name test))
 |}
+;;
 
 let write basedir =
   let () = Unix.mkdir basedir 0o777 in

bench/gen_synthetic_dune_watch.ml

@@ -21,10 +21,10 @@ let write_subset base_dir library_index subset =
             List.flatten
               (List.map
                  (fun k ->
-                   List.map
-                     (fun j ->
-                       sprintf "M_%d_%d_%d_%d.f()" (library_index - 1) j mod_rows k)
-                     (count subsets_per_library))
+                    List.map
+                      (fun j ->
+                         sprintf "M_%d_%d_%d_%d.f()" (library_index - 1) j mod_rows k)
+                      (count subsets_per_library))
                  (count mod_cols))
         else
           List.map
@@ -68,17 +68,21 @@ let write_lib ~base_dir ~lib ~dune =
 
 let write base_dir =
   let () = Unix.mkdir base_dir 0o777 in
-  let dune = {|
+  let dune =
+    {|
 (library
  (name leaf)
  (libraries internal))
-|} in
+|}
+  in
   write_lib ~base_dir ~lib:Leaf ~dune;
-  let dune = {|
+  let dune =
+    {|
 (library
  (name internal)
  (wrapped false))
-|} in
+|}
+  in
   write_lib ~base_dir ~lib:Internal ~dune
 ;;
 

bench/metrics.mli

@@ -6,41 +6,41 @@ open Stdune
     [unzip] functions which make serialisation easier. *)
 type ('float, 'int) t =
   { elapsed_time : 'float
-  (** Real time elapsed since the process started and the process
+    (** Real time elapsed since the process started and the process
       finished. *)
   ; user_cpu_time : 'float
-  (** The amount of CPU time spent in user mode during the process. Other
+    (** The amount of CPU time spent in user mode during the process. Other
       processes and blocked time are not included. *)
   ; system_cpu_time : 'float
-  (** The amount of CPU time spent in kernel mode during the process.
+    (** The amount of CPU time spent in kernel mode during the process.
       Similar to user time, other processes and time spent blocked by
       other processes are not counted. *)
   ; minor_words : 'float
-  (** Number of words allocated in the minor heap since the program was
+    (** Number of words allocated in the minor heap since the program was
       started. *)
   ; promoted_words : 'float
-  (** Number of words that have been promoted from the minor to the major
+    (** Number of words that have been promoted from the minor to the major
       heap since the program was started. *)
   ; major_words : 'float
-  (** Number of words allocated in the major heap since the program was
+    (** Number of words allocated in the major heap since the program was
       started. *)
   ; minor_collections : 'int
-  (** Number of minor collections since the program was started. *)
+    (** Number of minor collections since the program was started. *)
   ; major_collections : 'int
-  (** Number of major collection cycles completed since the program was
+    (** Number of major collection cycles completed since the program was
       started. *)
   ; heap_words : 'int (** Total size of the major heap, in words. *)
   ; heap_chunks : 'int
-  (** Number of contiguous pieces of memory that make up the major heap. *)
+    (** Number of contiguous pieces of memory that make up the major heap. *)
   ; live_words : 'int
-  (** Number of words of live data in the major heap, including the header
+    (** Number of words of live data in the major heap, including the header
       words. *)
   ; live_blocks : 'int (** Number of live blocks in the major heap. *)
   ; free_words : 'int (** Number of words in the free list. *)
   ; free_blocks : 'int (** Number of blocks in the free list. *)
   ; largest_free : 'int (** Size (in words) of the largest block in the free list. *)
   ; fragments : 'int
-  (** Number of wasted words due to fragmentation. These are 1-words free
+    (** Number of wasted words due to fragmentation. These are 1-words free
       blocks placed between two live blocks. They are not available for
       allocation. *)
   ; compactions : 'int (** Number of heap compactions since the program was started. *)

bench/micro/path_bench.ml

@@ -8,56 +8,57 @@ let root = "."
 let short_path = "a/b/c"
 let long_path = List.init 20 ~f:(fun _ -> "foo-bar-baz") |> String.concat ~sep:"/"
 
-let%bench_fun ("is_root" [@params
-                           path
-                           = [ "root", "."
-                             ; "short path", short_path
-                             ; "long path", long_path
-                             ]])
+let%bench_fun
+    ("is_root"
+     [@params path = [ "root", "."; "short path", short_path; "long path", long_path ]])
   =
   fun () -> ignore (Fpath.is_root path)
 ;;
 
-let%bench_fun ("reach" [@params
-                         t
-                         = [ "from root long path", (long_path, root)
-                           ; "from root short path", (short_path, root)
-                           ; "reach root from short path", (root, short_path)
-                           ; "reach root from long path", (root, long_path)
-                           ; ( "reach long path from similar long path"
-                             , ( Filename.concat long_path "a"
-                               , Filename.concat long_path "b" ) )
-                           ; ( "reach short path from similar short path"
-                             , ( Filename.concat short_path "a"
-                               , Filename.concat short_path "b" ) )
-                           ]])
+let%bench_fun
+    ("reach"
+     [@params
+       t
+       = [ "from root long path", (long_path, root)
+         ; "from root short path", (short_path, root)
+         ; "reach root from short path", (root, short_path)
+         ; "reach root from long path", (root, long_path)
+         ; ( "reach long path from similar long path"
+           , (Filename.concat long_path "a", Filename.concat long_path "b") )
+         ; ( "reach short path from similar short path"
+           , (Filename.concat short_path "a", Filename.concat short_path "b") )
+         ]])
   =
   let t, from = t in
   let t = Path.of_string t in
   let from = Path.of_string from in
   fun () -> ignore (Path.reach t ~from)
 ;;
 
-let%bench_fun ("Path.Local.relative" [@params
-                                       t
-                                       = [ "left root", (".", long_path)
-                                         ; "right root", (long_path, ".")
-                                         ; "short paths", (short_path, short_path)
-                                         ; "long paths", (long_path, long_path)
-                                         ]])
+let%bench_fun
+    ("Path.Local.relative"
+     [@params
+       t
+       = [ "left root", (".", long_path)
+         ; "right root", (long_path, ".")
+         ; "short paths", (short_path, short_path)
+         ; "long paths", (long_path, long_path)
+         ]])
   =
   let x, y = t in
   let x = Path.Local.of_string x in
   fun () -> ignore (Path.Local.relative x y)
 ;;
 
-let%bench_fun ("Path.Local.append" [@params
-                                     t
-                                     = [ "left root", (".", long_path)
-                                       ; "right root", (long_path, ".")
-                                       ; "short paths", (short_path, short_path)
-                                       ; "long paths", (long_path, long_path)
-                                       ]])
+let%bench_fun
+    ("Path.Local.append"
+     [@params
+       t
+       = [ "left root", (".", long_path)
+         ; "right root", (long_path, ".")
+         ; "short paths", (short_path, short_path)
+         ; "long paths", (long_path, long_path)
+         ]])
   =
   let x, y = t in
   let x = Path.Local.of_string x in