Prepare minor release

CHANGES.md

@@ -1,3 +1,8 @@
+# 6.1.1 (2025-07-07) - Lille
+
+## Bug fixes
+* Compiler: Fix shape loading (#2074)
+
 # 6.1.0 (2025-07-01) - Lille
 
 ## Features/Changes

VERSION

@@ -1 +1 @@
-6.1.0
+6.1.1

compiler/lib/shape.ml

@@ -139,7 +139,7 @@ module Store = struct
   let load' fn =
     let l = file_lines_bin fn in
     List.iter l ~f:(fun s ->
-        match String.drop_prefix ~prefix:"//#shape: " s with
+        match String.drop_prefix ~prefix:"//# shape: " s with
         | None -> ()
         | Some name_n_shape -> (
             match String.lsplit2 name_n_shape ~on:':' with

compiler/tests-full/dune

@@ -48,6 +48,7 @@
  (action
   (run
    %{bin:js_of_ocaml}
+   --load-shape %{dep:stdlib.cma.js}
    --pretty
    --debuginfo
    %{dep:shapes.cma}

compiler/tests-full/shapes.cma.expected.js

@@ -31,18 +31,13 @@
 (function
   (globalThis){
    "use strict";
-   var runtime = globalThis.jsoo_runtime;
-   function caml_call1(f, a0){
-    return (f.l >= 0 ? f.l : f.l = f.length) === 1
-            ? f(a0)
-            : runtime.caml_call_gen(f, [a0]);
-   }
    var
+    runtime = globalThis.jsoo_runtime,
     global_data = runtime.caml_get_global_data(),
     cst = "",
     Stdlib = global_data.Stdlib;
    function f(param){
-     /*<<compiler/tests-full/m2.ml:1:11>>*/ return caml_call1(Stdlib[46], cst) /*<<compiler/tests-full/m2.ml:1:27>>*/ ;
+     /*<<compiler/tests-full/m2.ml:1:11>>*/ return Stdlib[46].call(null, cst) /*<<compiler/tests-full/m2.ml:1:27>>*/ ;
    }
    var Shapes_M2 =  /*<<?>>*/ [0, f];
    runtime.caml_register_global(2, Shapes_M2, "Shapes__M2");
@@ -57,11 +52,6 @@
   (globalThis){
    "use strict";
    var runtime = globalThis.jsoo_runtime;
-   function caml_call1(f, a0){
-    return (f.l >= 0 ? f.l : f.l = f.length) === 1
-            ? f(a0)
-            : runtime.caml_call_gen(f, [a0]);
-   }
    function caml_call2(f, a0, a1){
     return (f.l >= 0 ? f.l : f.l = f.length) === 2
             ? f(a0, a1)
@@ -74,7 +64,7 @@
     Shapes_M1 = global_data.Shapes__M1;
    function f(param){
      /*<<compiler/tests-full/m3.ml:1:14>>*/ return 1
-            < caml_call1(Stdlib_Random[5], 2)
+            < Stdlib_Random[5].call(null, 2)
             ? Shapes_M1[1]
             : function
              (a, param){

examples/separate_compilation/dune

@@ -29,6 +29,8 @@
  (action
   (run
    %{bin:js_of_ocaml}
+   --load-shape
+   %{dep:stdlib.cma.js}
    --pretty
    --source-map
    %{dep:lib1.cma}
@@ -40,6 +42,8 @@
  (action
   (run
    %{bin:js_of_ocaml}
+   --load-shape
+   %{dep:stdlib.cma.js}
    --pretty
    --source-map
    %{dep:module1.cmo}
@@ -51,6 +55,12 @@
  (action
   (run
    %{bin:js_of_ocaml}
+   --load-shape
+   %{dep:stdlib.cma.js}
+   --load-shape
+   %{dep:lib1.cma.js}
+   --load-shape
+   %{dep:module1.js}
    --pretty
    --source-map
    %{dep:module2.cmo}
@@ -73,6 +83,8 @@
  (action
   (run
    %{bin:js_of_ocaml}
+   --load-shape
+   %{dep:stdlib.cma.js}
    --pretty
    --source-map
    %{lib:stdlib:std_exit.cmo}