fixes after rebase

Author: TheNumbat

backend/regalloc/regalloc_invariants.ml

@@ -17,6 +17,7 @@ let precondition : Cfg_with_layout.t -> unit =
       | Const_int _ -> ()
       | Const_float _ -> ()
       | Const_symbol _ -> ()
+      | Const_vec128 _ -> ()
       | Stackoffset _ -> ()
       | Load _ -> ()
       | Store _ -> ()

middle_end/flambda2/from_lambda/lambda_to_flambda.ml

@@ -1197,7 +1197,7 @@ let rec cps acc env ccenv (lam : L.lambda) (k : cps_continuation)
       let id = Ident.create_local name in
       let result_layout = L.primitive_result_layout prim in
       (match result_layout with
-      | Pvalue _ | Punboxed_float | Punboxed_int _ -> ()
+      | Pvalue _ | Punboxed_float | Punboxed_int _ | Punboxed_vector _ -> ()
       | Ptop | Pbottom ->
         Misc.fatal_errorf "Invalid result layout %a for primitive %a"
           Printlambda.layout result_layout Printlambda.primitive prim);

ocaml/lambda/lambda.ml

@@ -650,6 +650,8 @@ let layout_functor = Pvalue Pgenval
 let layout_boxed_float = Pvalue Pfloatval
 let layout_string = Pvalue Pgenval
 let layout_boxedint bi = Pvalue (Pboxedintval bi)
+
+let layout_boxed_vector vi = Pvalue (Pboxedvectorval vi)
 let layout_lazy = Pvalue Pgenval
 let layout_lazy_contents = Pvalue Pgenval
 let layout_any_value = Pvalue Pgenval
@@ -1453,6 +1455,7 @@ let primitive_result_layout (p : primitive) =
   | Punbox_float -> Punboxed_float
   | Pccall { prim_native_repr_res = _, Untagged_int; _} -> layout_int
   | Pccall { prim_native_repr_res = _, Unboxed_float; _} -> layout_boxed_float
+  | Pccall { prim_native_repr_res = _, Unboxed_vector v; _} -> layout_boxed_vector v
   | Pccall { prim_native_repr_res = _, Same_as_ocaml_repr s; _} ->
       begin match s with
       | Value -> layout_any_value

ocaml/typing/primitive.ml

@@ -301,16 +301,19 @@ let equal_native_repr nr1 nr2 =
   match nr1, nr2 with
   | Same_as_ocaml_repr s1, Same_as_ocaml_repr s2 -> Sort.equal_const s1 s2
   | Same_as_ocaml_repr _,
-    (Unboxed_float | Unboxed_integer _ | Untagged_int) -> false
+    (Unboxed_float | Unboxed_integer _ | Untagged_int | Unboxed_vector _) -> false
   | Unboxed_float, Unboxed_float -> true
   | Unboxed_float,
-    (Same_as_ocaml_repr _ | Unboxed_integer _ | Untagged_int) -> false
+    (Same_as_ocaml_repr _ | Unboxed_integer _ | Untagged_int | Unboxed_vector _) -> false
   | Unboxed_integer bi1, Unboxed_integer bi2 -> equal_boxed_integer bi1 bi2
   | Unboxed_integer _,
-    (Same_as_ocaml_repr _ | Unboxed_float | Untagged_int) -> false
+    (Same_as_ocaml_repr _ | Unboxed_float | Untagged_int | Unboxed_vector _) -> false
   | Untagged_int, Untagged_int -> true
   | Untagged_int,
-    (Same_as_ocaml_repr _ | Unboxed_float | Unboxed_integer _) -> false
+    (Same_as_ocaml_repr _ | Unboxed_float | Unboxed_integer _ | Unboxed_vector _) -> false
+  | Unboxed_vector v1, Unboxed_vector v2 -> equal_boxed_vector v1 v2 
+  | Unboxed_vector _,
+    (Same_as_ocaml_repr _ | Unboxed_float | Unboxed_integer _ | Untagged_int ) -> false
 
 let equal_effects ef1 ef2 =
   match ef1, ef2 with
@@ -334,7 +337,7 @@ let native_name_is_external p =
 
 let sort_of_native_repr = function
   | Same_as_ocaml_repr s -> s
-  | (Unboxed_float | Unboxed_integer _ | Untagged_int) -> Sort.Value
+  | (Unboxed_float | Unboxed_integer _ | Untagged_int | Unboxed_vector _) -> Sort.Value
 
 let report_error ppf err =
   match err with