Resolve merge conflicts

Author: liam923

src/ocaml/typing/cms_format.ml

@@ -121,41 +121,22 @@ let save_cms target modname binary_annots initial_env shape
          in
          let cms = {
            cms_modname = modname;
-           cms_comments = [];
               (* XXX merlin: upstream does
-            cms_sourcefile = sourcefile;
-            cms_builddir = Location.rewrite_absolute_path (Sys.getcwd ());
-            cms_source_digest = source_digest;
-            cms_initial_env;
-            cms_uid_to_loc;
-            cms_uid_to_attributes;
-            cms_impl_shape = shape;
-<<<<<<< janestreet/merlin-jst:merge-compiler-renaming-changes
-||||||| ocaml-flambda/flambda-backend:60158e06115c6fc6e30325bb720e65acf351dbce
-            cms_ident_occurrences
-          }
-        in
-        output_cms oc cms)
-=======
-            cms_ident_occurrences;
-            cms_declaration_dependencies;
-          }
-        in
-        output_cms oc cms)
->>>>>>> ocaml-flambda/flambda-backend:87a4cecacc0e2f9afee93898f81f55b012c69214
-                   `cms_comments = Lexer.comments ()`
+                 `cms_comments = Lexer.comments ()`
                  here.  But we don't seem to have the same lexer, so we can't
                  do that straightforwardly.  On the other hand, this function
                  should never be called by merlin, so it doesn't matter, right?
               *)
+           cms_comments = [];
            cms_sourcefile = sourcefile;
            cms_builddir = Location.rewrite_absolute_path (Sys.getcwd ());
            cms_source_digest = source_digest;
            cms_initial_env;
            cms_uid_to_loc;
            cms_uid_to_attributes;
            cms_impl_shape = shape;
-           cms_ident_occurrences
+           cms_ident_occurrences;
+           cms_declaration_dependencies;
          } in
          output_cms oc cms)
   end

src/ocaml/typing/cmt_format.ml

@@ -477,21 +477,7 @@ let add_saved_type b = saved_types := b :: !saved_types
 let get_saved_types () = !saved_types
 let set_saved_types l = saved_types := l
 
-<<<<<<< janestreet/merlin-jst:merge-compiler-renaming-changes
-(*let record_value_dependency vd1 vd2 =
-  if vd1.Types.val_loc <> vd2.Types.val_loc then
-    value_deps := (vd1, vd2) :: !value_deps*)
-
-let record_value_dependency _vd1 _vd2 = ()
-||||||| ocaml-flambda/flambda-backend:60158e06115c6fc6e30325bb720e65acf351dbce
-let record_value_dependency vd1 vd2 =
-  if vd1.Types.val_loc <> vd2.Types.val_loc then
-    value_deps := (vd1, vd2) :: !value_deps
-=======
-let record_declaration_dependency (rk, uid1, uid2) =
-  if not (Uid.equal uid1 uid2) then
-    uids_deps := (rk, uid1, uid2) :: !uids_deps
->>>>>>> ocaml-flambda/flambda-backend:87a4cecacc0e2f9afee93898f81f55b012c69214
+let record_declaration_dependency (_rk, _uid1, _uid2) = ()
 
 let save_cmt target cu binary_annots initial_env cmi shape =
   if !Clflags.binary_annotations && not !Clflags.print_types then begin
@@ -526,16 +512,8 @@ let save_cmt target cu binary_annots initial_env cmi shape =
          let cmt = {
            cmt_modname = cu;
            cmt_annots;
-<<<<<<< janestreet/merlin-jst:merge-compiler-renaming-changes
-           cmt_value_dependencies = !value_deps;
-           cmt_comments = [];
-||||||| ocaml-flambda/flambda-backend:60158e06115c6fc6e30325bb720e65acf351dbce
-           cmt_value_dependencies = !value_deps;
-           cmt_comments = Lexer.comments ();
-=======
            cmt_declaration_dependencies = !uids_deps;
-           cmt_comments = Lexer.comments ();
->>>>>>> ocaml-flambda/flambda-backend:87a4cecacc0e2f9afee93898f81f55b012c69214
+           cmt_comments = [];
            cmt_args = Sys.argv;
            cmt_sourcefile = sourcefile;
            cmt_builddir = Location.rewrite_absolute_path (Sys.getcwd ());

src/ocaml/typing/cmt_format.mli

@@ -134,6 +134,9 @@ val need_to_clear_env : bool
 
 *)
 
+val get_declaration_dependencies :
+  unit -> (dependency_kind * Uid.t * Uid.t) list
+
 val iter_on_declarations :
   f:(Types.Uid.t -> item_declaration -> unit)
   -> Tast_iterator.iterator
@@ -142,19 +145,6 @@ val iter_on_occurrences :
   f:(namespace:Shape.Sig_component_kind.t ->
     Env.t ->
     Path.t ->
-<<<<<<< janestreet/merlin-jst:merge-compiler-renaming-changes
     Longident.t Location.loc ->
     unit)
   -> Tast_iterator.iterator
-||||||| ocaml-flambda/flambda-backend:60158e06115c6fc6e30325bb720e65acf351dbce
-  val read_signature : 'a -> string -> Types.signature * 'b list * 'c list
-
-*)
-=======
-  val read_signature : 'a -> string -> Types.signature * 'b list * 'c list
-
-*)
-
-val get_declaration_dependencies :
-  unit -> (dependency_kind * Uid.t * Uid.t) list
->>>>>>> ocaml-flambda/flambda-backend:87a4cecacc0e2f9afee93898f81f55b012c69214

src/ocaml/typing/lambda.ml

@@ -16,6 +16,8 @@ type boxed_integer = Primitive.boxed_integer =
 
 type boxed_vector = Primitive.boxed_vector =
   | Boxed_vec128
+  | Boxed_vec256
+  | Boxed_vec512
 
 type unboxed_float = Primitive.unboxed_float =
   | Unboxed_float64
@@ -28,6 +30,8 @@ type unboxed_integer = Primitive.unboxed_integer =
 
 type unboxed_vector = Primitive.unboxed_vector =
   | Unboxed_vec128
+  | Unboxed_vec256
+  | Unboxed_vec512
 
 type array_kind =
     Pgenarray | Paddrarray | Pintarray | Pfloatarray

src/ocaml/typing/printtyp.ml

@@ -770,16 +770,8 @@ let wrap_printing_env_error env f =
   let wrap (loc : _ Location.loc) =
     { loc with txt =
         (fun fmt -> Env.without_cmis (fun () -> loc.txt fmt) ())
-<<<<<<< janestreet/merlin-jst:merge-compiler-renaming-changes
-  (* CR nroberts: See https://github.com/ocaml-flambda/flambda-backend/pull/2529
-      for an explanation of why this has drifted from upstream. *)
-||||||| ocaml-flambda/flambda-backend:60158e06115c6fc6e30325bb720e65acf351dbce
-  (* CR nroberts: See https://github.com/ocaml-flambda/flambda-backend/pull/2529
-     for an explanation of why this has drifted from upstream. *)
-=======
   (* CR nroberts: See https://github.com/oxcaml/oxcaml/pull/2529
      for an explanation of why this has drifted from upstream. *)
->>>>>>> ocaml-flambda/flambda-backend:87a4cecacc0e2f9afee93898f81f55b012c69214
     }
   in
   let err : Location.error = wrap_printing_env ~error:true env f in

src/ocaml/typing/typemod.ml

@@ -3895,15 +3895,7 @@ let type_implementation target modulename initial_env ast =
     Cmt_format.save_cmt (Unit_info.cmt target) modulename
       annots initial_env cmi shape;
     Cms_format.save_cms (Unit_info.cms target) modulename
-<<<<<<< janestreet/merlin-jst:merge-compiler-renaming-changes
-      annots initial_env shape;
-||||||| ocaml-flambda/flambda-backend:60158e06115c6fc6e30325bb720e65acf351dbce
-      annots initial_env shape;
-    gen_annot target annots;
-=======
       annots initial_env shape decl_deps;
-    gen_annot target annots;
->>>>>>> ocaml-flambda/flambda-backend:87a4cecacc0e2f9afee93898f81f55b012c69214
   in
   Cmt_format.clear ();
   Cms_format.clear ();
@@ -3988,18 +3980,8 @@ let type_implementation target modulename initial_env ast =
                      { new_arg_type = arg_type; old_source_file = source_intf;
                        old_arg_type = arg_type_from_cmi });
           let coercion, shape =
-<<<<<<< janestreet/merlin-jst:merge-compiler-renaming-changes
-            Includemod.compunit initial_env ~mark:Mark_positive
-              sourcefile sg compiled_intf_file_name dclsig shape
-||||||| ocaml-flambda/flambda-backend:60158e06115c6fc6e30325bb720e65acf351dbce
-            Profile.record_call "check_sig" (fun () ->
-              Includemod.compunit initial_env ~mark:Mark_positive
-                sourcefile sg compiled_intf_file_name dclsig shape)
-=======
-            Profile.record_call "check_sig" (fun () ->
               Includemod.compunit initial_env ~mark:true
-                sourcefile sg compiled_intf_file_name dclsig shape)
->>>>>>> ocaml-flambda/flambda-backend:87a4cecacc0e2f9afee93898f81f55b012c69214
+                sourcefile sg compiled_intf_file_name dclsig shape
           in
           (* Check the _mli_ against the argument type, since the mli determines
              the visible type of the module and that's what needs to conform to
@@ -4032,18 +4014,8 @@ let type_implementation target modulename initial_env ast =
             (Location.in_file (Unit_info.source_file target))
             Warnings.Missing_mli;
           let coercion, shape =
-<<<<<<< janestreet/merlin-jst:merge-compiler-renaming-changes
-            Includemod.compunit initial_env ~mark:Mark_positive
-              sourcefile sg "(inferred signature)" simple_sg shape
-||||||| ocaml-flambda/flambda-backend:60158e06115c6fc6e30325bb720e65acf351dbce
-            Profile.record_call "check_sig" (fun () ->
-              Includemod.compunit initial_env ~mark:Mark_positive
-                sourcefile sg "(inferred signature)" simple_sg shape)
-=======
-            Profile.record_call "check_sig" (fun () ->
               Includemod.compunit initial_env ~mark:true
-                sourcefile sg "(inferred signature)" simple_sg shape)
->>>>>>> ocaml-flambda/flambda-backend:87a4cecacc0e2f9afee93898f81f55b012c69214
+                sourcefile sg "(inferred signature)" simple_sg shape
           in
           check_nongen_signature finalenv simple_sg;
           let simple_sg =

src/ocaml/typing/typeopt.ml

@@ -20,27 +20,7 @@ open Types
 open Typedtree
 open Lambda
 
-<<<<<<< janestreet/merlin-jst:merge-compiler-renaming-changes
 (* Expand a type, looking through ordinary synonyms, private synonyms, links,
-||||||| ocaml-flambda/flambda-backend:60158e06115c6fc6e30325bb720e65acf351dbce
-type error =
-    Non_value_layout of type_expr * Jkind.Violation.t option
-  | Non_value_sort of Jkind.Sort.t * type_expr
-  | Sort_without_extension of
-      Jkind.Sort.t * Language_extension.maturity * type_expr option
-  | Non_value_sort_unknown_ty of Jkind.Sort.t
-  | Small_number_sort_without_extension of Jkind.Sort.t * type_expr option
-  | Simd_sort_without_extension of Jkind.Sort.t * type_expr option
-  | Not_a_sort of type_expr * Jkind.Violation.t
-=======
-type error =
-    Non_value_layout of type_expr * Jkind.Violation.t option
-  | Sort_without_extension of
-      Jkind.Sort.t * Language_extension.maturity * type_expr option
-  | Small_number_sort_without_extension of Jkind.Sort.t * type_expr option
-  | Simd_sort_without_extension of Jkind.Sort.t * type_expr option
-  | Not_a_sort of type_expr * Jkind.Violation.t
->>>>>>> ocaml-flambda/flambda-backend:87a4cecacc0e2f9afee93898f81f55b012c69214
    and [@@unboxed] types. The returned type will be therefore be none of these
    cases (except in case of missing cmis).
 
@@ -231,26 +211,7 @@ let array_kind_of_elt ~elt_sort env loc ty =
     | Some s -> s
     | None ->
       Jkind.Sort.default_for_transl_and_get
-<<<<<<< janestreet/merlin-jst:merge-compiler-renaming-changes
         (type_legacy_sort ~why:Array_element env loc ty)
-||||||| ocaml-flambda/flambda-backend:60158e06115c6fc6e30325bb720e65acf351dbce
-     kinds. *)
-  match s with
-  | Base Value -> Paddr_scannable
-  | Base (Float64 | Float32 | Bits32 | Bits64 | Word | Vec128) as c ->
-    raise (Error (loc, Mixed_product_array (c, elt_ty_for_error)))
-  | Base Void as c ->
-    raise (Error (loc, Unsupported_sort c))
-=======
-     kinds. *)
-  match s with
-  | Base Value -> Paddr_scannable
-  | Base (Float64 | Float32 | Bits32 | Bits64 | Word |
-          Vec128 | Vec256 | Vec512) as c ->
-    raise (Error (loc, Mixed_product_array (c, elt_ty_for_error)))
-  | Base Void as c ->
-    raise (Error (loc, Unsupported_sort c))
->>>>>>> ocaml-flambda/flambda-backend:87a4cecacc0e2f9afee93898f81f55b012c69214
   in
   let classify_product ty _sorts =
     if is_always_gc_ignorable env ty then
@@ -266,24 +227,7 @@ let array_kind_of_elt ~elt_sort env loc ty =
   | Unboxed_float f -> Punboxedfloatarray f
   | Unboxed_int i -> Punboxedintarray i
   | Unboxed_vector v -> Punboxedvectorarray v
-<<<<<<< janestreet/merlin-jst:merge-compiler-renaming-changes
   | Product c -> c
-||||||| ocaml-flambda/flambda-backend:60158e06115c6fc6e30325bb720e65acf351dbce
-  | Base Bits32 -> Punboxedint_ignorable Unboxed_int32
-  | Base Bits64 -> Punboxedint_ignorable Unboxed_int64
-  | Base Word -> Punboxedint_ignorable Unboxed_nativeint
-  | Base Vec128 -> raise (Error (loc, Unsupported_vector_in_product_array))
-  | Base Void as c -> raise (Error (loc, Unsupported_sort c))
-  | Product sorts -> Pproduct_ignorable (ignorable_product_array_kind loc sorts)
-=======
-  | Base Bits32 -> Punboxedint_ignorable Unboxed_int32
-  | Base Bits64 -> Punboxedint_ignorable Unboxed_int64
-  | Base Word -> Punboxedint_ignorable Unboxed_nativeint
-  | Base (Vec128 | Vec256 | Vec512) ->
-    raise (Error (loc, Unsupported_vector_in_product_array))
-  | Base Void as c -> raise (Error (loc, Unsupported_sort c))
-  | Product sorts -> Pproduct_ignorable (ignorable_product_array_kind loc sorts)
->>>>>>> ocaml-flambda/flambda-backend:87a4cecacc0e2f9afee93898f81f55b012c69214
 
 let array_type_kind ~elt_sort env loc ty =
   match scrape_poly env ty with
@@ -1106,29 +1050,3 @@ let rec layout_union l1 l2 =
     _ ->
       Ptop
 *)
-<<<<<<< janestreet/merlin-jst:merge-compiler-renaming-changes
-||||||| ocaml-flambda/flambda-backend:60158e06115c6fc6e30325bb720e65acf351dbce
-        (Jkind.Violation.report_with_offender
-           ~offender:(fun ppf -> Printtyp.type_expr ppf ty)) err
-      end
-  | Non_value_sort (sort, ty) ->
-      fprintf ppf
-        "Non-value layout %a detected in [Typeopt.layout] as sort for type@ %a.@ \
-         Please report this error to the Jane Street compilers team."
-        Jkind.Sort.format sort Printtyp.type_expr ty
-  | Non_value_sort_unknown_ty sort ->
-      fprintf ppf
-        "Non-value layout %a detected in [layout_of_sort]@ Please report this \
-         error to the Jane Street compilers team."
-        Jkind.Sort.format sort
-  | Sort_without_extension (sort, maturity, ty) ->
-      fprintf ppf "Non-value layout %a detected" Jkind.Sort.format sort;
-      begin match ty with
-=======
-        (Jkind.Violation.report_with_offender
-           ~offender:(fun ppf -> Printtyp.type_expr ppf ty)) err
-      end
-  | Sort_without_extension (sort, maturity, ty) ->
-      fprintf ppf "Non-value layout %a detected" Jkind.Sort.format sort;
-      begin match ty with
->>>>>>> ocaml-flambda/flambda-backend:87a4cecacc0e2f9afee93898f81f55b012c69214

src/ocaml/typing/types.ml

@@ -13,6 +13,12 @@
 (*                                                                        *)
 (**************************************************************************)
 
+(* Merlin-only: rewrite some module paths to minimize the diff *)
+module Misc = struct
+  include Misc
+  module Stdlib = Misc_stdlib
+end
+
 (* Representation of types and declarations *)
 
 open Allowance
@@ -988,19 +994,9 @@ let rec equal_mixed_block_element e1 e2 =
   | Vec128, Vec128 | Vec256, Vec256 | Vec512, Vec512
     -> true
   | Product es1, Product es2
-<<<<<<< janestreet/merlin-jst:merge-compiler-renaming-changes
-    -> Misc_stdlib.Array.equal equal_mixed_block_element es1 es2
-  | ( Value | Float64 | Float32 | Float_boxed | Word | Bits32 | Bits64 | Vec128
-    | Product _ ), _
-||||||| ocaml-flambda/flambda-backend:60158e06115c6fc6e30325bb720e65acf351dbce
-    -> Misc.Stdlib.Array.equal equal_mixed_block_element es1 es2
-  | ( Value | Float64 | Float32 | Float_boxed | Word | Bits32 | Bits64 | Vec128
-    | Product _ ), _
-=======
     -> Misc.Stdlib.Array.equal equal_mixed_block_element es1 es2
   | ( Value | Float64 | Float32 | Float_boxed | Word | Bits32 | Bits64
     | Vec128 | Vec256 | Vec512 | Product _ ), _
->>>>>>> ocaml-flambda/flambda-backend:87a4cecacc0e2f9afee93898f81f55b012c69214
     -> false
 
 let rec compare_mixed_block_element e1 e2 =
@@ -1011,7 +1007,7 @@ let rec compare_mixed_block_element e1 e2 =
   | Vec128, Vec128 | Vec256, Vec256 | Vec512, Vec512
     -> 0
   | Product es1, Product es2
-    -> Misc_stdlib.Array.compare compare_mixed_block_element es1 es2
+    -> Misc.Stdlib.Array.compare compare_mixed_block_element es1 es2
   | Value, _ -> -1
   | _, Value -> 1
   | Float_boxed, _ -> -1
@@ -1496,7 +1492,7 @@ let equal_unsafe_mode_crossing
       ~type_equal
       { unsafe_mod_bounds = mc1; unsafe_with_bounds = wb2 }
       umc2 =
-  Misc_stdlib.Le_result.equal ~le:Mode.Crossing.le mc1 umc2.unsafe_mod_bounds
+  Misc.Stdlib.Le_result.equal ~le:Mode.Crossing.le mc1 umc2.unsafe_mod_bounds
   && (match wb2, umc2.unsafe_with_bounds with
     | No_with_bounds, No_with_bounds -> true
     | No_with_bounds, With_bounds _ | With_bounds _, No_with_bounds -> false