Merge 5.2.0minus-16 (#172)

* Import ocaml sources for oxcaml/oxcaml@00e9f22e7c5

* Automatic (non-conflicty) merges

* Commit merge conflicts

* Resolve conflicts (with type errors outstanding)

* Fix some type errors

* Fix more errors

* Fix remaining type errors

* Bump magic numbers for 5.2.0minus-16

* Promote some tests

* Promote jkind formatting change

* Resolve crs

* Add ignored flags

* Comment out assertion that was causing tests to fail

* Bump dune version in CI

* Prevent short paths from inserting duplicates into the graph

Author: liam923

.github/workflows/flambda-backend.yml

@@ -74,7 +74,7 @@ jobs:
       run: |
         opam switch create 4.14.0 --yes
         opam switch link 4.14.0 --yes
-        opam install --yes dune.3.10.0 menhir.20231231
+        opam install --yes dune.3.19.1 menhir.20231231
 
     - name: Configure, build, and install flambda-backend
       if: steps.cache.outputs.cache-hit != 'true'

src/analysis/browse_misc.ml

@@ -54,7 +54,7 @@ let summary_prev = function
   | Env.Env_value (s, _, _, _)
   | Env.Env_type (s, _, _)
   | Env.Env_extension (s, _, _)
-  | Env.Env_module (s, _, _, _)
+  | Env.Env_module (s, _, _, _, _, _)
   | Env.Env_modtype (s, _, _)
   | Env.Env_class (s, _, _)
   | Env.Env_cltype (s, _, _)
@@ -82,7 +82,7 @@ let signature_of_env ?(ignore_extensions = true) env =
         Some (Sig_typext (i, e, Text_exception, Exported))
       | _ -> Some (Sig_typext (i, e, Text_first, Exported))
     end
-    | Env_module (_, i, pr, m) ->
+    | Env_module (_, i, pr, m, _, _) ->
       Some (Sig_module (i, pr, m, Trec_not, Exported))
     | Env_modtype (_, i, m) -> Some (Sig_modtype (i, m, Exported))
     | Env_class (_, i, c) -> Some (Sig_class (i, c, Trec_not, Exported))
@@ -97,7 +97,7 @@ let signature_of_env ?(ignore_extensions = true) env =
     | Env_module_unbound _ -> None
   in
   let summary_module_ident_opt = function
-    | Env.Env_module (_, i, _, _) -> Some i
+    | Env.Env_module (_, i, _, _, _, _) -> Some i
     | _ -> None
   in
   let sg = ref [] in

src/analysis/destruct.ml

@@ -647,11 +647,7 @@ module Conv = struct
         let lst = List.map ~f:loop lst in
         let mut : Asttypes.mutable_flag =
           match mut with
-          | Mutable mode ->
-            assert (
-              Mode.Alloc.Comonadic.Const.equal mode
-                Mode.Alloc.Comonadic.Const.legacy);
-            Mutable
+          | Mutable _mode -> Mutable
           | Immutable -> Immutable
         in
         mkpat (Ppat_array (mut, lst))

src/analysis/tail_analysis.ml

@@ -87,12 +87,15 @@ let expr_tail_positions = function
   | Texp_probe_is_enabled _
   | Texp_src_pos
   | Texp_overwrite _
+  | Texp_mutvar _
+  | Texp_setmutvar _
   | Texp_hole _ -> []
   | Texp_match (_, _, cs, _) -> List.map cs ~f:(fun c -> Case c)
   | Texp_try (_, cs) -> List.map cs ~f:(fun c -> Case c)
   | Texp_letmodule (_, _, _, _, e)
   | Texp_letexception (_, e)
   | Texp_let (_, _, e)
+  | Texp_letmutable (_, e)
   | Texp_sequence (_, _, e)
   | Texp_ifthenelse (_, e, None)
   | Texp_open (_, e) -> [ Expression e ]

src/frontend/query_commands.ml

@@ -256,7 +256,7 @@ let dispatch pipeline (type a) : a Query_protocol.t -> a = function
           | Stack_or_heap_enclosing.Alloc_mode alloc_mode, true ->
             let locality =
               alloc_mode
-              |> Mode.Alloc.proj (Comonadic Areality)
+              |> Mode.Alloc.proj_comonadic Areality
               |> Mode.Locality.Guts.check_const_conservative
             in
             let str =

src/kernel/mconfig.ml

@@ -521,7 +521,7 @@ let ocaml_ignored_flags =
     "-flambda2-expert-phantom-lets";
     "-flambda2-inlining-report-bin";
     "-flambda2-join-points";
-    "-flambda2-result-types";
+    "-no-flambda2-result-types";
     "-flambda2-result-types-all-functions";
     "-flambda2-result-types-functors-only";
     "-flambda2-speculative-inlining-only-if-arguments-useful";
@@ -554,6 +554,7 @@ let ocaml_ignored_flags =
     "-flambda2-advanced-meet";
     "-directory";
     (* Jane Street specific *)
+    "-disable-builtin-check";
     "-disable-poll-insertion";
     "-gdwarf-may-alter-codegen";
     "-gno-dwarf-may-alter-codegen";
@@ -614,7 +615,18 @@ let ocaml_ignored_flags =
     "-dflambda-heavy-invariants";
     "-cfg-eliminate-dead-trap-handlers";
     "-no-cfg-eliminate-dead-trap-handlers";
-    "-module-entry-functions-section"
+    "-module-entry-functions-section";
+    "-zero-alloc-checker-details-extra";
+    "-no-zero-alloc-checker-details-extra";
+    "-favx512f";
+    "-fno-avx512f";
+    "-favx2";
+    "-fno-avx2";
+    "-favx";
+    "-fno-avx";
+    "-dllvmir";
+    "-keep-llvmir";
+    "-llvm-path"
   ]
 
 let ocaml_ignored_parametrized_flags =

src/ocaml-index/tests/tests-dirs/local-shape-and-include.t

@@ -33,7 +33,7 @@
    uid: Main.3; locs: "g": File "main.ml", line 9, characters 6-7
    uid: Main.4; locs: "g": File "main.ml", line 3, characters 6-7
    uid: Main.5; locs: "B": File "main.ml", line 2, characters 7-8
-   uid: Stdlib__String.173; locs:
+   uid: Stdlib__String.171; locs:
      "String.equal": File "main.ml", line 1, characters 8-20
    }, 0 approx shapes: {}, and shapes for CUS .
   and related uids:{(Main.3 Main.4)}
@@ -51,7 +51,7 @@
    uid: Main.3; locs: "g": File "main.ml", line 9, characters 6-7
    uid: Main.4; locs: "g": File "main.ml", line 3, characters 6-7
    uid: Main.5; locs: "B": File "main.ml", line 2, characters 7-8
-   uid: Stdlib__String.173; locs:
+   uid: Stdlib__String.171; locs:
      "String.equal": File "main.ml", line 1, characters 8-20
    }, 0 approx shapes: {}, and shapes for CUS .
   and related uids:{(Main.3 Main.4)}

src/ocaml/merlin_specific/browse_raw.ml

@@ -372,10 +372,11 @@ let of_method_call obj meth loc env (f : _ f0) acc =
   app (Method_call (obj, meth, loc)) env f acc
 
 let rec of_expression_desc loc = function
-  | Texp_ident _ | Texp_constant _ | Texp_instvar _
+  | Texp_ident _ | Texp_constant _ | Texp_instvar _ | Texp_mutvar _
   | Texp_variant (_, None)
   | Texp_new _ | Texp_src_pos | Texp_typed_hole -> id_fold
   | Texp_let (_, vbs, e) -> of_expression e ** list_fold of_value_binding vbs
+  | Texp_letmutable (vb, e) -> of_expression e ** of_value_binding vb
   | Texp_function { params; body; _ } ->
     list_fold of_function_param params ** of_function_body body
   | Texp_apply (e, ls, _, _, _) ->
@@ -396,6 +397,7 @@ let rec of_expression_desc loc = function
   | Texp_assert (e, _)
   | Texp_lazy e
   | Texp_setinstvar (_, _, _, e) -> of_expression e
+  | Texp_setmutvar (_, _, e) -> of_expression e
   | Texp_record { fields; extended_expression } ->
     option_fold (fun (e, _, _) -> of_expression e) extended_expression
     **

src/ocaml/parsing/ast_helper.ml

@@ -220,7 +220,7 @@ module Exp = struct
 
   let ident ?loc ?attrs a = mk ?loc ?attrs (Pexp_ident a)
   let constant ?loc ?attrs a = mk ?loc ?attrs (Pexp_constant a)
-  let let_ ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_let (a, b, c))
+  let let_ ?loc ?attrs a b c d = mk ?loc ?attrs (Pexp_let (a, b, c, d))
   let function_ ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_function (a, b, c))
   let apply ?loc ?attrs a b = mk ?loc ?attrs (Pexp_apply (a, b))
   let match_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_match (a, b))
@@ -244,7 +244,7 @@ module Exp = struct
   let coerce ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_coerce (a, b, c))
   let send ?loc ?attrs a b = mk ?loc ?attrs (Pexp_send (a, b))
   let new_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_new a)
-  let setinstvar ?loc ?attrs a b = mk ?loc ?attrs (Pexp_setinstvar (a, b))
+  let setinstvar ?loc ?attrs a b = mk ?loc ?attrs (Pexp_setvar (a, b))
   let override ?loc ?attrs a = mk ?loc ?attrs (Pexp_override a)
   let letmodule ?loc ?attrs a b c= mk ?loc ?attrs (Pexp_letmodule (a, b, c))
   let letmodule_no_opt ?loc ?attrs s b c=

src/ocaml/parsing/ast_helper.mli

@@ -154,8 +154,8 @@ module Exp:
 
     val ident: ?loc:loc -> ?attrs:attrs -> lid -> expression
     val constant: ?loc:loc -> ?attrs:attrs -> constant -> expression
-    val let_: ?loc:loc -> ?attrs:attrs -> rec_flag -> value_binding list
-              -> expression -> expression
+    val let_: ?loc:loc -> ?attrs:attrs -> mutable_flag -> rec_flag ->
+              value_binding list -> expression -> expression
     val function_ : ?loc:loc -> ?attrs:attrs -> function_param list
                    -> function_constraint -> function_body
                    -> expression