Merge 5.2.0minus-17 (#178)

* Import ocaml sources for oxcaml/oxcaml@342a11315b4

* Automatic merges

* Add new files

* Commit merge conflicts

* Trivial merge conflict resolution

* Fix some type errors

* Finish fixing type errors in merged files

* Teach merlin about Pexp_idx

* Promote tests

* Import ocaml sources for oxcaml/oxcaml@d4c133509a1

* Automatic merges

* Merge trivial conflicts

* Teach merlin about atomic_loc

* Import ocaml sources for oxcaml/oxcaml@99a981ed891

* Automatic merges

* Commit merge conflicts

* Trivial merge conflict resolution

* Fix typing errors

* Bump magic numbers

* Add ignored flags

* Import ocaml sources for oxcaml/oxcaml@e50954f1a39

* Automatic merges

Author: liam923

src/analysis/tail_analysis.ml

@@ -89,6 +89,8 @@ let expr_tail_positions = function
   | Texp_overwrite _
   | Texp_mutvar _
   | Texp_setmutvar _
+  | Texp_idx _
+  | Texp_atomic_loc _
   | Texp_hole _ -> []
   | Texp_match (_, _, cs, _) -> List.map cs ~f:(fun c -> Case c)
   | Texp_try (_, cs) -> List.map cs ~f:(fun c -> Case c)

src/kernel/mconfig.ml

@@ -624,7 +624,9 @@ let ocaml_ignored_flags =
     "-fno-avx";
     "-dllvmir";
     "-keep-llvmir";
-    "-llvm-path"
+    "-llvm-path";
+    "-ddwarf-types";
+    "-ocamlcfg"
   ]
 
 let ocaml_ignored_parametrized_flags =
@@ -700,7 +702,10 @@ let ocaml_ignored_parametrized_flags =
     "-dgranularity";
     "-flambda2-expert-cont-lifting-budget";
     "-vectorize-max-block-size";
-    "-save-ir-before"
+    "-save-ir-before";
+    "-shape-format";
+    "-gdwarf-compression";
+    "-gdwarf-fission"
   ]
 
 let ocaml_warnings_spec ~error =

src/ocaml/merlin_specific/browse_raw.ml

@@ -371,6 +371,16 @@ let of_method_call obj meth loc env (f : _ f0) acc =
   let loc = { loc with Location.loc_start; loc_end } in
   app (Method_call (obj, meth, loc)) env f acc
 
+let of_block_access = function
+  | Baccess_field (_, _) -> id_fold
+  | Baccess_array
+      { mut = _; index_kind = _; index; base_ty = _; elt_ty = _; elt_sort = _ }
+    -> of_expression index
+  | Baccess_block (_, exp) -> of_expression exp
+
+let of_unboxed_access = function
+  | Uaccess_unboxed_field (_, _) -> id_fold
+
 let rec of_expression_desc loc = function
   | Texp_ident _ | Texp_constant _ | Texp_instvar _ | Texp_mutvar _
   | Texp_variant (_, None)
@@ -472,6 +482,9 @@ let rec of_expression_desc loc = function
   | Texp_probe p -> of_expression p.handler
   | Texp_probe_is_enabled _ -> id_fold
   | Texp_exclave e -> of_expression e
+  | Texp_idx (block_access, unboxed_access) ->
+    of_block_access block_access ** list_fold of_unboxed_access unboxed_access
+  | Texp_atomic_loc (exp, _, _, _, _) -> of_expression exp
   | Texp_hole _ -> id_fold
 
 (* We should consider taking into account param.fp_loc at some point, as it

src/ocaml/parsing/ast_helper.ml

@@ -236,6 +236,7 @@ module Exp = struct
   let unboxed_field ?loc ?attrs a b = mk ?loc ?attrs (Pexp_unboxed_field (a, b))
   let setfield ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_setfield (a, b, c))
   let array ?loc ?attrs a b = mk ?loc ?attrs (Pexp_array (a, b))
+  let idx ?loc ?attrs a b = mk ?loc ?attrs (Pexp_idx (a, b))
   let ifthenelse ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_ifthenelse (a, b, c))
   let sequence ?loc ?attrs a b = mk ?loc ?attrs (Pexp_sequence (a, b))
   let while_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_while (a, b))

src/ocaml/parsing/ast_helper.mli

@@ -181,6 +181,8 @@ module Exp:
                   -> expression
     val array: ?loc:loc -> ?attrs:attrs -> mutable_flag -> expression list ->
       expression
+    val idx : ?loc:loc -> ?attrs:attrs -> block_access -> unboxed_access list
+      -> expression
     val ifthenelse: ?loc:loc -> ?attrs:attrs -> expression -> expression
                     -> expression option -> expression
     val sequence: ?loc:loc -> ?attrs:attrs -> expression -> expression

src/ocaml/parsing/ast_iterator.ml

@@ -456,6 +456,14 @@ module E = struct
 
   let iter_labeled_tuple sub el = List.iter (iter_snd (sub.expr sub)) el
 
+  let iter_block_access sub = function
+    | Baccess_field lid -> iter_loc sub lid
+    | Baccess_array (_, _, index) -> sub.expr sub index
+    | Baccess_block (_, idx) -> sub.expr sub idx
+
+  let iter_unboxed_access sub = function
+    | Uaccess_unboxed_field lid -> iter_loc sub lid
+
   let iter sub {pexp_loc = loc; pexp_desc = desc; pexp_attributes = attrs} =
     sub.location sub loc;
     sub.attributes sub attrs;
@@ -491,6 +499,9 @@ module E = struct
         sub.expr sub e1; iter_loc sub lid;
         sub.expr sub e2
     | Pexp_array (_mut, el) -> List.iter (sub.expr sub) el
+    | Pexp_idx (ba, uas) ->
+        iter_block_access sub ba;
+        List.iter (iter_unboxed_access sub) uas
     | Pexp_ifthenelse (e1, e2, e3) ->
         sub.expr sub e1; sub.expr sub e2;
         iter_opt (sub.expr sub) e3

src/ocaml/parsing/ast_mapper.ml

@@ -495,6 +495,14 @@ module E = struct
       ret_mode_annotations = sub.modes sub ret_mode_annotations
     }
 
+  let map_block_access sub = function
+    | Baccess_field lid -> Baccess_field (map_loc sub lid)
+    | Baccess_array (mut, ik, e) -> Baccess_array (mut, ik, sub.expr sub e)
+    | Baccess_block (mut, e) -> Baccess_block (mut, sub.expr sub e)
+
+  let map_unboxed_access sub = function
+    | Uaccess_unboxed_field lid -> Uaccess_unboxed_field (map_loc sub lid)
+
   let map_iterator sub = function
     | Pcomp_range { start; stop; direction } ->
       Pcomp_range { start = sub.expr sub start;
@@ -567,6 +575,9 @@ module E = struct
         setfield ~loc ~attrs (sub.expr sub e1) (map_loc sub lid)
           (sub.expr sub e2)
     | Pexp_array (mut, el) -> array ~loc ~attrs mut (List.map (sub.expr sub) el)
+    | Pexp_idx (ba, uas) ->
+      idx ~loc ~attrs (map_block_access sub ba)
+        (List.map (map_unboxed_access sub) uas)
     | Pexp_ifthenelse (e1, e2, e3) ->
         ifthenelse ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
           (map_opt (sub.expr sub) e3)

src/ocaml/parsing/asttypes.mli

@@ -68,3 +68,9 @@ type variance =
 type injectivity =
   | Injective
   | NoInjectivity
+
+type index_kind =
+  | Index_int
+  | Index_unboxed_int64
+  | Index_unboxed_int32
+  | Index_unboxed_nativeint

src/ocaml/parsing/builtin_attributes.ml

@@ -74,6 +74,7 @@ let warn_unused () =
    misplaced attribute warnings. *)
 let builtin_attrs =
   [ "inline"
+  ; "atomic"
   ; "inlined"
   ; "specialise"
   ; "specialised"
@@ -1138,6 +1139,8 @@ let get_tracing_probe_payload (payload : Parsetree.payload) =
   in
   Ok { name; name_loc; enabled_at_init; arg }
 
+let has_atomic attrs = has_attribute "atomic" attrs
+
 (* Merlin specific *)
 
 let merlin_let_punned = "merlin.let-punned"

src/ocaml/parsing/builtin_attributes.mli

@@ -346,6 +346,8 @@ type tracing_probe =
 val get_tracing_probe_payload :
   Parsetree.payload -> (tracing_probe, unit) result
 
+val has_atomic: Parsetree.attributes -> bool
+
 (* Merlin specific *)
 
 (** The name of the attribute used to identify punned let expressions. When a let