flambda-backend: Unrevert PRs that previously depended on Dune 3.11+ (#2586)

* Revert "Revert "Move unboxed definitions from `Stdlib` to `Stable`" (#2580)"

This reverts commit 74f5941.

* Revert "Revert "Rename extension otherlibs" (#2579)"

This reverts commit f6bf7be.

* Port `dune` changes

* Revert "Revert "Move immutable array modules to `Stable_stdlib`" (#2578)"

This reverts commit 96e324a.

* Fix mli dependencies

---------

Co-authored-by: Diana Kalinichenko <[email protected]>

Author: dkalinichenko-js

Makefile.common-jst

@@ -113,7 +113,6 @@ dune_config_targets = \
   $(ocamldir)/duneconf/dirs-to-ignore.inc \
   $(ocamldir)/duneconf/jst-extra.inc \
   dune-project \
-  $(ocamldir)/stdlib/ocaml_compiler_internal_params \
   $(ocamldir)/dune.runtime_selection \
   $(ocamldir)/otherlibs/dune
 
@@ -200,12 +199,6 @@ _install: compiler
 install: _install
 	mkdir -p '$(prefix)'
 	rsync --chmod=u+rw,go+r -rl _install/ '$(prefix)'
-	rm -f '$(prefix)/lib/ocaml/ocaml_compiler_internal_params'
-        # rm `ocaml_compiler_internal_params`, which is used to compile the
-        # stdlib `Float_u` module with `-extension layouts_alpha`, because we
-        # don't want user programs that happened to be named
-        # `ocaml/stdlib/float_u.ml` to get the flag automatically.
-
 
 # Same as above, but relies on a successfull earlier _install
 install_for_opam:
@@ -258,15 +251,15 @@ install_for_test: _install
 	 ln -s . lex; ln -s . yacc; \
 	 ln -s _install/lib/ocaml/compiler-libs compilerlibs; \
 	 mkdir -p otherlibs/{unix,dynlink/native,str,bigarray,runtime_events}; \
-	 mkdir -p otherlibs/{upstream_compatible,stable,beta,alpha}; \
 	 ln -s ../stdlib/threads otherlibs/systhreads$(RUNTIME_SUFFIX); \
          $(cpl) stdlib/unix/{lib,}unix* otherlibs/unix; \
          $(cpl) stdlib/dynlink/dynlink* otherlibs/dynlink; \
          $(cpl) stdlib/str/{lib,}str* otherlibs/str; \
-         $(cpl) stdlib/upstream_compatible/* otherlibs/upstream_compatible; \
-         $(cpl) stdlib/stable/* otherlibs/stable; \
-         $(cpl) stdlib/beta/* otherlibs/beta; \
-         $(cpl) stdlib/alpha/* otherlibs/alpha; \
+	 for universe in upstream_compatible stable beta alpha ; do \
+		mkdir -p otherlibs/{stdlib_,}$${universe}; \
+		$(cpl) stdlib/stdlib_$${universe}/* otherlibs/stdlib_$${universe}; \
+		$(cpl) stdlib/$${universe}/* otherlibs/$${universe}; \
+	 done; \
      if [[ x"$(RUNTIME_DIR)" = x"runtime" ]]; then \
 	     $(cpl) stdlib/runtime_events/{lib,}runtime_events* otherlibs/runtime_events; \
      fi; \

ocamltest/ocaml_modifiers.ml

@@ -93,18 +93,6 @@ let dynlink =
 let str = make_library_modifier
   "str" [compiler_subdir ["otherlibs"; "str"]]
 
-let upstream_compatible = make_library_modifier
-  "upstream_compatible" [compiler_subdir ["otherlibs"; "upstream_compatible"]]
-
-let stable = make_library_modifier
-  "stable" [compiler_subdir ["otherlibs"; "stable"]]
-
-let beta = make_library_modifier
-  "beta" [compiler_subdir ["otherlibs"; "beta"]]
-
-let alpha = make_library_modifier
-  "alpha" [compiler_subdir ["otherlibs"; "alpha"]]
-
 let systhreads =
   unix @
   (make_library_modifier
@@ -140,17 +128,28 @@ let runtime_suffix = if Config.runtime5 then "" else "4"
 
 let debugger = [add_compiler_subdir ("debugger" ^ runtime_suffix)]
 
+let extension_universe_lib name =
+  make_library_modifier name [compiler_subdir ["otherlibs"; name]]
+
 let _ =
   register_modifiers "principal" principal;
   register_modifiers "config" config;
   register_modifiers "testing" testing;
   register_modifiers "unix" unix;
   register_modifiers "dynlink" dynlink;
   register_modifiers "str" str;
-  register_modifiers "upstream_compatible" upstream_compatible;
-  register_modifiers "stable" stable;
-  register_modifiers "beta" beta;
-  register_modifiers "alpha" alpha;
+  List.iter
+    (fun old_name ->
+      let new_name = "stdlib_" ^ old_name in
+      register_modifiers old_name (extension_universe_lib old_name);
+      register_modifiers new_name (extension_universe_lib new_name);
+    )
+    [
+      "upstream_compatible";
+      "stable";
+      "beta";
+      "alpha";
+    ];
   List.iter
     (fun archive -> register_modifiers archive (compilerlibs_archive archive))
     [

otherlibs/alpha/dune

@@ -12,6 +12,9 @@
 ;*                                                                        *
 ;**************************************************************************
 
+;; [alpha] was renamed to [stdlib_alpha]. This library clones [stdlib_alpha]
+;; until we move all existing uses of [alpha] to [stdlib_alpha].
+
 (library
  (name alpha)
  (wrapped false)
@@ -34,10 +37,21 @@
  (library_flags
   (:standard -linkall)))
 
+;; We clone files from [stdlib_alpha] instead of re-exporting the library
+;; to avoid adding a new transitive dependency to builds.
+
+(rule
+ (deps
+  (glob_files ../stdlib_alpha/*.{ml,mli}))
+ (targets alpha.ml alpha.mli)
+ (action
+  (bash
+   "cp ../stdlib_alpha/*.{ml,mli} .; mv stdlib_alpha.ml alpha.ml; mv stdlib_alpha.mli alpha.mli")))
+
 (rule
  (deps
   (:first-dep ../to_install.sh)
-  (source_tree .))
+  (glob_files *.mli))
  (action
   (with-stdout-to
    to_install.sexp

otherlibs/beta/dune

@@ -12,6 +12,9 @@
 ;*                                                                        *
 ;**************************************************************************
 
+;; [beta] was renamed to [stdlib_beta]. This library clones [stdlib_beta]
+;; until we move all existing uses of [beta] to [stdlib_beta].
+
 (library
  (name beta)
  (wrapped false)
@@ -36,10 +39,21 @@
  (library_flags
   (:standard -linkall)))
 
+;; We clone files from [stdlib_beta] instead of re-exporting the library
+;; to avoid adding a new transitive dependency to builds.
+
+(rule
+ (deps
+  (glob_files ../stdlib_beta/*.{ml,mli}))
+ (targets float32.ml float32.mli float32_u.ml float32_u.mli beta.ml beta.mli)
+ (action
+  (bash
+   "cp ../stdlib_beta/*.{ml,mli} .; mv stdlib_beta.ml beta.ml; mv stdlib_beta.mli beta.mli")))
+
 (rule
  (deps
   (:first-dep ../to_install.sh)
-  (source_tree .))
+  (glob_files *.mli))
  (action
   (with-stdout-to
    to_install.sexp

otherlibs/stable/dune

@@ -12,6 +12,9 @@
 ;*                                                                        *
 ;**************************************************************************
 
+;; [stable] was renamed to [stdlib_stable]. This library clones [stdlib_stable]
+;; until we move all existing uses of [stable] to [stdlib_stable].
+
 (library
  (name stable)
  (wrapped false)
@@ -34,10 +37,35 @@
  (library_flags
   (:standard -linkall)))
 
+;; We clone files from [stdlib_stable] instead of re-exporting the library
+;; to avoid adding a new transitive dependency to builds.
+
+(rule
+ (deps
+  (glob_files ../stdlib_stable/*.{ml,mli}))
+ (targets
+  float_u.ml
+  float_u.mli
+  iarray.ml
+  iarray.mli
+  iarrayLabels.ml
+  iarrayLabels.mli
+  int32_u.ml
+  int32_u.mli
+  int64_u.ml
+  int64_u.mli
+  nativeint_u.ml
+  nativeint_u.mli
+  stable.ml
+  stable.mli)
+ (action
+  (bash
+   "cp ../stdlib_stable/*.{ml,mli} .; mv stdlib_stable.ml stable.ml; mv stdlib_stable.mli stable.mli")))
+
 (rule
  (deps
   (:first-dep ../to_install.sh)
-  (source_tree .))
+  (glob_files *.mli))
  (action
   (with-stdout-to
    to_install.sexp

otherlibs/stable/stable.ml

@@ -0,0 +1,50 @@
+;**************************************************************************
+;*                                                                        *
+;*                                 OCaml                                  *
+;*                                                                        *
+;*                Diana Kalinichenko, Jane Street, New York               *
+;*                                                                        *
+;*   Copyright 2024 Jane Street Group LLC                                 *
+;*                                                                        *
+;*   All rights reserved.  This file is distributed under the terms of    *
+;*   the GNU Lesser General Public License version 2.1, with the          *
+;*   special exception on linking described in the file LICENSE.          *
+;*                                                                        *
+;**************************************************************************
+
+(library
+ (name stdlib_alpha)
+ (wrapped false)
+ (modes byte native)
+ (flags
+  (-strict-sequence
+   -principal
+   -absname
+   -w
+   +a-4-9-40-41-42-44-45-48-66
+   -warn-error
+   A
+   -bin-annot
+   -safe-string
+   -strict-formats
+   -extension-universe
+   alpha))
+ (ocamlopt_flags
+  (:include %{project_root}/ocamlopt_flags.sexp))
+ (library_flags
+  (:standard -linkall)))
+
+(rule
+ (deps
+  (:first-dep ../to_install.sh)
+  (source_tree .))
+ (action
+  (with-stdout-to
+   to_install.sexp
+   (run "%{first-dep}" "stdlib_alpha"))))
+
+(install
+ (files
+  (include to_install.sexp))
+ (section lib)
+ (package ocaml))

otherlibs/stable/stable.mli

@@ -0,0 +1,54 @@
+;**************************************************************************
+;*                                                                        *
+;*                                 OCaml                                  *
+;*                                                                        *
+;*                Diana Kalinichenko, Jane Street, New York               *
+;*                                                                        *
+;*   Copyright 2024 Jane Street Group LLC                                 *
+;*                                                                        *
+;*   All rights reserved.  This file is distributed under the terms of    *
+;*   the GNU Lesser General Public License version 2.1, with the          *
+;*   special exception on linking described in the file LICENSE.          *
+;*                                                                        *
+;**************************************************************************
+
+(library
+ (name stdlib_beta)
+ (wrapped false)
+ (modes byte native)
+ (enabled_if
+  (= %{architecture} "amd64"))
+ (flags
+  (-strict-sequence
+   -principal
+   -absname
+   -w
+   +a-4-9-40-41-42-44-45-48-66
+   -warn-error
+   A
+   -bin-annot
+   -safe-string
+   -strict-formats
+   -extension-universe
+   beta))
+ (ocamlopt_flags
+  (:include %{project_root}/ocamlopt_flags.sexp))
+ (library_flags
+  (:standard -linkall)))
+
+(rule
+ (deps
+  (:first-dep ../to_install.sh)
+  (source_tree .))
+ (action
+  (with-stdout-to
+   to_install.sexp
+   (run "%{first-dep}" "stdlib_beta"))))
+
+(install
+ (enabled_if
+  (= %{architecture} "amd64"))
+ (files
+  (include to_install.sexp))
+ (section lib)
+ (package ocaml))

otherlibs/alpha/.ocamlformat-enable renamed to otherlibs/stdlib_alpha/.ocamlformat-enable

@@ -0,0 +1,50 @@
+;**************************************************************************
+;*                                                                        *
+;*                                 OCaml                                  *
+;*                                                                        *
+;*                Diana Kalinichenko, Jane Street, New York               *
+;*                                                                        *
+;*   Copyright 2024 Jane Street Group LLC                                 *
+;*                                                                        *
+;*   All rights reserved.  This file is distributed under the terms of    *
+;*   the GNU Lesser General Public License version 2.1, with the          *
+;*   special exception on linking described in the file LICENSE.          *
+;*                                                                        *
+;**************************************************************************
+
+(library
+ (name stdlib_stable)
+ (wrapped false)
+ (modes byte native)
+ (flags
+  (-strict-sequence
+   -principal
+   -absname
+   -w
+   +a-4-9-40-41-42-44-45-48-66
+   -warn-error
+   A
+   -bin-annot
+   -safe-string
+   -strict-formats
+   -extension-universe
+   stable))
+ (ocamlopt_flags
+  (:include %{project_root}/ocamlopt_flags.sexp))
+ (library_flags
+  (:standard -linkall)))
+
+(rule
+ (deps
+  (:first-dep ../to_install.sh)
+  (source_tree .))
+ (action
+  (with-stdout-to
+   to_install.sexp
+   (run "%{first-dep}" "stdlib_stable"))))
+
+(install
+ (files
+  (include to_install.sexp))
+ (section lib)
+ (package ocaml))

otherlibs/stdlib_alpha/dune

@@ -84,15 +84,15 @@ let[@inline always] of_nativeint x = of_int64 (Int64.of_nativeint x)
 
 let[@inline always] to_nativeint x = Int64.to_nativeint (to_int64 x)
 
-let[@inline always] of_int32_u x = of_int64 (Int64.of_int32 (Stdlib__Int32_u.to_int32 x))
+let[@inline always] of_int32_u x = of_int64 (Int64.of_int32 (Int32_u.to_int32 x))
 
-let[@inline always] to_int32_u x = Stdlib__Int32_u.of_int32 (Int64.to_int32 (to_int64 x))
+let[@inline always] to_int32_u x = Int32_u.of_int32 (Int64.to_int32 (to_int64 x))
 
 let[@inline always] of_nativeint_u x =
-  of_int64 (Int64.of_nativeint (Stdlib__Nativeint_u.to_nativeint x))
+  of_int64 (Int64.of_nativeint (Nativeint_u.to_nativeint x))
 
 let[@inline always] to_nativeint_u x =
-  Stdlib__Nativeint_u.of_nativeint (Int64.to_nativeint (to_int64 x))
+  Nativeint_u.of_nativeint (Int64.to_nativeint (to_int64 x))
 
 let[@inline always] bits_of_float x = of_int64 (Int64.bits_of_float x)