Merge 5.2.0minus 16 retag (#174)

* Import ocaml sources for oxcaml/oxcaml@31a75865c15

* Automatic merges

* Remove removed flags

Author: liam923

src/kernel/mconfig.ml

@@ -582,8 +582,6 @@ let ocaml_ignored_flags =
     "-fno-bmi2";
     "-fbmi";
     "-fno-bmi";
-    "-flzcnt";
-    "-fno-lzcnt";
     "-fprefetchwt1";
     "-fno-prefetchwt1";
     "-fprefetchw";

src/ocaml/typing/predef.ml

@@ -620,16 +620,6 @@ let add_simd_stable_extension_types add_type env =
       ~unboxed_jkind:Jkind.Const.Builtin.kind_of_unboxed_128bit_vectors
   |> add_type ident_float64x2 ~jkind:Jkind.Const.Builtin.immutable_data
       ~unboxed_jkind:Jkind.Const.Builtin.kind_of_unboxed_128bit_vectors
-
-(* CR-soon mslater:
-  Remaining work:
-    - Correct ASAN checks for 32/64 byte memory chunks
-    - Correct TSAN save/restore SIMD registers
-    - Align Vec256 stack slots on the OCaml stack
-*)
-let add_simd_beta_extension_types add_type env =
-  let _, add_type = mk_add_type add_type in
-  env
   |> add_type ident_int8x32 ~jkind:Jkind.Const.Builtin.immutable_data
       ~unboxed_jkind:Jkind.Const.Builtin.kind_of_unboxed_256bit_vectors
   |> add_type ident_int16x16 ~jkind:Jkind.Const.Builtin.immutable_data
@@ -643,6 +633,8 @@ let add_simd_beta_extension_types add_type env =
   |> add_type ident_float64x4 ~jkind:Jkind.Const.Builtin.immutable_data
       ~unboxed_jkind:Jkind.Const.Builtin.kind_of_unboxed_256bit_vectors
 
+let add_simd_beta_extension_types _add_type env = env
+
 let add_simd_alpha_extension_types add_type env =
   let _, add_type = mk_add_type add_type in
   env

src/ocaml/typing/typemod.ml

@@ -2008,7 +2008,11 @@ and transl_signature ?(keep_warnings = false) env sig_acc {psg_items; psg_modali
       not @@ Builtin_attributes.has_attribute "no_recursive_modalities"
         sincl.pincl_attributes
     in
-    let sg = apply_modalities_signature ~recursive env modalities sg in
+    let sg =
+      match Mode.Modality.Value.Const.is_id modalities with
+      | true -> sg
+      | false -> apply_modalities_signature ~recursive env modalities sg
+    in
     (* Assume the structure is legacy, for backward compatibility *)
     let sg, newenv = Env.enter_signature ~scope sg ~mode:Value.legacy env in
     Signature_group.iter

src/ocaml/typing/typeopt.ml

@@ -947,7 +947,7 @@ let[@inline always] rec layout_of_const_sort_generic ~value_kind ~error
                      Language_extension.(is_at_least SIMD Stable) ->
     Lambda.Punboxed_vector Unboxed_vec128
   | Base Vec256 when Language_extension.(is_at_least Layouts Stable) &&
-                     Language_extension.(is_at_least SIMD Beta) ->
+                     Language_extension.(is_at_least SIMD Stable) ->
     Lambda.Punboxed_vector Unboxed_vec256
   | Base Vec512 when Language_extension.(is_at_least Layouts Stable) &&
                      Language_extension.(is_at_least SIMD Alpha) ->

upstream/ocaml_flambda/base-rev.txt

@@ -1 +1 @@
-00e9f22e7c52c951992ba327e68cdba4ea9c0b30
+31a75865c155563d3d9f84cd4ec5bcaaffa2c81d

upstream/ocaml_flambda/typing/predef.ml

@@ -615,16 +615,6 @@ let add_simd_stable_extension_types add_type env =
       ~unboxed_jkind:Jkind.Const.Builtin.kind_of_unboxed_128bit_vectors
   |> add_type ident_float64x2 ~jkind:Jkind.Const.Builtin.immutable_data
       ~unboxed_jkind:Jkind.Const.Builtin.kind_of_unboxed_128bit_vectors
-
-(* CR-soon mslater:
-  Remaining work:
-    - Correct ASAN checks for 32/64 byte memory chunks
-    - Correct TSAN save/restore SIMD registers
-    - Align Vec256 stack slots on the OCaml stack
-*)
-let add_simd_beta_extension_types add_type env =
-  let _, add_type = mk_add_type add_type in
-  env
   |> add_type ident_int8x32 ~jkind:Jkind.Const.Builtin.immutable_data
       ~unboxed_jkind:Jkind.Const.Builtin.kind_of_unboxed_256bit_vectors
   |> add_type ident_int16x16 ~jkind:Jkind.Const.Builtin.immutable_data
@@ -638,6 +628,8 @@ let add_simd_beta_extension_types add_type env =
   |> add_type ident_float64x4 ~jkind:Jkind.Const.Builtin.immutable_data
       ~unboxed_jkind:Jkind.Const.Builtin.kind_of_unboxed_256bit_vectors
 
+let add_simd_beta_extension_types _add_type env = env
+
 let add_simd_alpha_extension_types add_type env =
   let _, add_type = mk_add_type add_type in
   env

upstream/ocaml_flambda/typing/typemod.ml

@@ -1992,7 +1992,11 @@ and transl_signature env {psg_items; psg_modalities; psg_loc} =
       not @@ Builtin_attributes.has_attribute "no_recursive_modalities"
         sincl.pincl_attributes
     in
-    let sg = apply_modalities_signature ~recursive env modalities sg in
+    let sg =
+      match Mode.Modality.Value.Const.is_id modalities with
+      | true -> sg
+      | false -> apply_modalities_signature ~recursive env modalities sg
+    in
     (* Assume the structure is legacy, for backward compatibility *)
     let sg, newenv = Env.enter_signature ~scope sg ~mode:Value.legacy env in
     Signature_group.iter

upstream/ocaml_flambda/typing/typeopt.ml

@@ -995,7 +995,7 @@ let[@inline always] rec layout_of_const_sort_generic ~value_kind ~error
                      Language_extension.(is_at_least SIMD Stable) ->
     Lambda.Punboxed_vector Unboxed_vec128
   | Base Vec256 when Language_extension.(is_at_least Layouts Stable) &&
-                     Language_extension.(is_at_least SIMD Beta) ->
+                     Language_extension.(is_at_least SIMD Stable) ->
     Lambda.Punboxed_vector Unboxed_vec256
   | Base Vec512 when Language_extension.(is_at_least Layouts Stable) &&
                      Language_extension.(is_at_least SIMD Alpha) ->

upstream/ocaml_flambda/utils/config.mli

@@ -328,9 +328,6 @@ val has_pclmul : bool
 val has_popcnt : bool
 (* Whether the compiler was configured on a machine with POPCNT *)
 
-val has_lzcnt : bool
-(* Whether the compiler was configured on a machine with LZCNT *)
-
 val has_sse3 : bool
 (* Whether the compiler was configured on a machine with SSE3 *)
 
@@ -354,3 +351,6 @@ val has_avx : bool
 
 val has_avx2 : bool
 (* Whether the compiler was configured on a machine with AVX2 *)
+
+val oxcaml_dwarf : bool
+(* Whether OxCaml DWARF is used by default *)