small fixes

Author: jvanburen

lambda/lambda.ml

@@ -232,8 +232,8 @@ and array_kind =
 
 and ignorable_product_element_kind =
   | Pint_ignorable
-  | Punboxedfloat_ignorable of unboxed_float
-  | Punboxedint_ignorable of unboxed_integer
+  | Punboxedfloat_ignorable of Primitive.unboxed_float
+  | Punboxedint_ignorable of Primitive.unboxed_integer
   | Pproduct_ignorable of ignorable_product_element_kind list
 
 and scannable_product_element_kind =
@@ -661,7 +661,6 @@ module Scalar = struct
       let to_string t =
         let i = Integral.to_string in
         let f = Floating.to_string in
-        let sprintf = Printf.sprintf in
         match t with
         | Add { size } -> i size ^ "_add"
         | Fadd { size } -> f size ^ "_add"
@@ -1115,7 +1114,7 @@ let rec equal_ignorable_product_element_kind k1 k2 =
   | Punboxedfloat_ignorable f1, Punboxedfloat_ignorable f2 ->
     Primitive.equal_unboxed_float f1 f2
   | Punboxedint_ignorable i1, Punboxedint_ignorable i2 ->
-    equal_unboxed_integer i1 i2
+    Primitive.equal_unboxed_integer i1 i2
   | Pproduct_ignorable p1, Pproduct_ignorable p2 ->
     List.equal equal_ignorable_product_element_kind p1 p2
   | ( Pint_ignorable | Punboxedfloat_ignorable _
@@ -2645,7 +2644,7 @@ let rec layout_of_ignorable_kinds kinds =
 and layout_of_ignorable_kind = function
   | Pint_ignorable -> layout_int
   | Punboxedfloat_ignorable f -> layout_unboxed_float f
-  | Punboxedint_ignorable i -> layout_unboxed_int i
+  | Punboxedint_ignorable i -> layout_unboxed_int (unboxed_integer_of_primitive i)
   | Pproduct_ignorable kinds -> layout_of_ignorable_kinds kinds
 
 let array_ref_kind_result_layout = function

lambda/lambda.mli

@@ -175,8 +175,8 @@ and array_kind =
 
 and ignorable_product_element_kind =
   | Pint_ignorable
-  | Punboxedfloat_ignorable of unboxed_float
-  | Punboxedint_ignorable of unboxed_integer
+  | Punboxedfloat_ignorable of Primitive.unboxed_float
+  | Punboxedint_ignorable of Primitive.unboxed_integer
   | Pproduct_ignorable of ignorable_product_element_kind list
 
 and scannable_product_element_kind =

lambda/printlambda.ml

@@ -115,7 +115,7 @@ let rec ignorable_product_element_kinds kinds =
 and ignorable_product_element_kind = function
   | Pint_ignorable -> "int"
   | Punboxedfloat_ignorable f -> unboxed_float f
-  | Punboxedint_ignorable i -> unboxed_integer i
+  | Punboxedint_ignorable i -> primitive_unboxed_integer i
   | Pproduct_ignorable kinds -> ignorable_product_element_kinds kinds
 
 let array_kind = function

middle_end/flambda2/from_lambda/lambda_to_flambda_primitives.ml

@@ -70,6 +70,16 @@ let convert_unboxed_integer_comparison_prim (kind : L.unboxed_integer)
     Int_comp (Naked_nativeint, Yielding_bool (Le Signed))
   | Unboxed_nativeint, Cge ->
     Int_comp (Naked_nativeint, Yielding_bool (Ge Signed))
+  | Unboxed_immediate, Ceq -> Int_comp (Naked_immediate, Yielding_bool Eq)
+  | Unboxed_immediate, Cne -> Int_comp (Naked_immediate, Yielding_bool Neq)
+  | Unboxed_immediate, Clt ->
+    Int_comp (Naked_immediate, Yielding_bool (Lt Signed))
+  | Unboxed_immediate, Cgt ->
+    Int_comp (Naked_immediate, Yielding_bool (Gt Signed))
+  | Unboxed_immediate, Cle ->
+    Int_comp (Naked_immediate, Yielding_bool (Le Signed))
+  | Unboxed_immediate, Cge ->
+    Int_comp (Naked_immediate, Yielding_bool (Ge Signed))
 
 let convert_float_comparison (comp : L.float_comparison) : unit P.comparison =
   match comp with
@@ -104,19 +114,24 @@ let standard_int_of_unboxed_integer : L.unboxed_integer -> K.Standard_int.t =
   | Unboxed_int16 -> Naked_int16
   | Unboxed_int32 -> Naked_int32
   | Unboxed_nativeint -> Naked_nativeint
+  | Unboxed_immediate -> Naked_immediate
   | Unboxed_int64 -> Naked_int64
 
 let standard_int_or_float_of_unboxed_integer (ubint : L.unboxed_integer) :
     K.Standard_int_or_float.t =
   match ubint with
+  | Unboxed_immediate -> Naked_immediate
   | Unboxed_nativeint -> Naked_nativeint
   | Unboxed_int8 -> Naked_int8
   | Unboxed_int16 -> Naked_int16
   | Unboxed_int32 -> Naked_int32
   | Unboxed_int64 -> Naked_int64
 
-let standard_int_or_float_of_boxed_integer bint =
-  standard_int_or_float_of_unboxed_integer (Primitive.unboxed_integer bint)
+let standard_int_or_float_of_boxed_integer :
+    L.boxed_integer -> K.Standard_int_or_float.t = function
+  | Boxed_int32 -> Naked_int32
+  | Boxed_int64 -> Naked_int64
+  | Boxed_nativeint -> Naked_nativeint
 
 let standard_int_or_float_of_peek_or_poke (layout : L.peek_or_poke) :
     K.Standard_int_or_float.t =

middle_end/flambda2/kinds/flambda_kind.ml

@@ -949,6 +949,7 @@ module With_subkind = struct
     | Punboxed_int Unboxed_int32 -> naked_int32
     | Punboxed_int Unboxed_int64 -> naked_int64
     | Punboxed_int Unboxed_nativeint -> naked_nativeint
+    | Punboxed_int Unboxed_immediate -> naked_immediate
     | Punboxed_vector Unboxed_vec128 -> naked_vec128
     | Punboxed_product _ | Ptop | Pbottom ->
       Misc.fatal_errorf