fixed merge

ocaml-flambda · Dec 23, 2024 · 5e5c4f3 · 5e5c4f3
1 parent b3e3b45
commit 5e5c4f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/bytecomp/bytegen.ml b/bytecomp/bytegen.ml
@@ -1009,6 +1009,8 @@ let rec comp_expr stack_info env exp sz cont =
             Lconst (Const_base (Const_float32 "0.0"))
         | Punboxedfloatarray Unboxed_float64 ->
             Lconst (Const_base (Const_float "0.0"))
+        | Punboxedintarray (Unboxed_int8| Unboxed_int16) ->
+          Misc.unboxed_small_int_arrays_are_not_implemented ()
         | Punboxedintarray Unboxed_int32 ->
             Lconst (Const_base (Const_int32 0l))
         | Punboxedintarray Unboxed_int64 ->
@@ -1026,6 +1028,8 @@ let rec comp_expr stack_info env exp sz cont =
                 Lconst (Const_base (Const_float32 "0.0"))
               | Punboxedfloat_ignorable Unboxed_float64 ->
                 Lconst (Const_base (Const_float "0.0"))
+              | Punboxedint_ignorable (Unboxed_int8| Unboxed_int16) ->
+                Misc.unboxed_small_int_arrays_are_not_implemented ()
               | Punboxedint_ignorable Unboxed_int32 ->
                 Lconst (Const_base (Const_int32 0l))
               | Punboxedint_ignorable Unboxed_int64 ->

diff --git a/middle_end/flambda2/from_lambda/lambda_to_lambda_transforms.ml b/middle_end/flambda2/from_lambda/lambda_to_lambda_transforms.ml
@@ -428,6 +428,8 @@ let makearray_dynamic env (lambda_array_kind : L.array_kind)
          (Thirty_two
             { zero_init = Lconst (Const_base (Const_unboxed_int32 0l)) })
          ~init
+  | Punboxedintarray (Unboxed_int8 | Unboxed_int16) ->
+    Misc.unboxed_small_int_arrays_are_not_implemented ()
   | Punboxedintarray Unboxed_int64 ->
     makearray_dynamic_singleton_uninitialized "unboxed_int64" ~length mode loc
     |> initialize_array env loc ~length (Punboxedintarray_set Unboxed_int64)