review comments

Author: Ekdohibs

middle_end/clambda.ml

@@ -64,25 +64,25 @@ and ulambda =
       * uphantom_defining_expr option * ulambda
   | Uletrec of (Backend_var.With_provenance.t * ulambda) list * ulambda
   | Uprim of Clambda_primitives.primitive * ulambda list * Debuginfo.t
-  | Uswitch of ulambda * ulambda_switch * Debuginfo.t * Lambda.layout
+  | Uswitch of ulambda * ulambda_switch * Debuginfo.t * layout
   | Ustringswitch of
       ulambda *
       (string * ulambda) list *
       ulambda option *
-      Lambda.layout
+      layout
   | Ustaticfail of int * ulambda list
   | Ucatch of
       int *
       (Backend_var.With_provenance.t * layout) list *
       ulambda *
       ulambda *
-      Lambda.layout
+      layout
   | Utrywith of
       ulambda *
       Backend_var.With_provenance.t *
       ulambda *
-      Lambda.layout
-  | Uifthenelse of ulambda * ulambda * ulambda * Lambda.layout
+      layout
+  | Uifthenelse of ulambda * ulambda * ulambda * layout
   | Usequence of ulambda * ulambda
   | Uwhile of ulambda * ulambda
   | Ufor of Backend_var.With_provenance.t * ulambda * ulambda

middle_end/flambda/flambda_to_clambda.ml

@@ -572,7 +572,7 @@ and to_clambda_set_of_closures t env
     in
     { label;
       arity = clambda_arity function_decl;
-      params = params @ [VP.create env_var, Lambda.layout_block];
+      params = params @ [VP.create env_var, Lambda.layout_function];
       return = Lambda.layout_top;
       body = to_clambda t env_body function_decl.body;
       dbg = function_decl.dbg;

middle_end/flambda/inline_and_simplify.ml

@@ -864,7 +864,7 @@ and simplify_partial_application env r ~lhs_of_application
         (List.map (fun p -> Parameter.var p, Parameter.kind p) freshened_params)
     in
     let free_variables =
-      Variable.Map.add lhs_of_application Lambda.layout_top free_variables
+      Variable.Map.add lhs_of_application Lambda.layout_function free_variables
     in
     Flambda_utils.make_closure_declaration ~id:closure_variable
       ~is_classic_mode:false

middle_end/flambda2/from_lambda/lambda_to_flambda_primitives.ml

@@ -110,7 +110,7 @@ let convert_block_shape (shape : L.block_shape) ~num_fields =
         "Flambda_arity.of_block_shape: num_fields is %d yet the shape has %d \
          fields"
         num_fields shape_length;
-    List.map (fun vk -> K.With_subkind.from_lambda (Pvalue vk)) shape
+    List.map K.With_subkind.from_lambda_value_kind shape
 
 let check_float_array_optimisation_enabled () =
   if not (Flambda_features.flat_float_array ())

middle_end/flambda2/kinds/flambda_kind.mli

@@ -196,6 +196,8 @@ module With_subkind : sig
 
   val of_naked_number_kind : Naked_number_kind.t -> t
 
+  val from_lambda_value_kind : Lambda.value_kind -> t
+
   val from_lambda : Lambda.layout -> t
 
   val compatible : t -> when_used_at:t -> bool

ocaml/lambda/lambda.ml

@@ -551,7 +551,8 @@ let layout_unit = Pvalue Pintval
 let layout_int = Pvalue Pintval
 let layout_array kind = Pvalue (Parrayval kind)
 let layout_block = Pvalue Pgenval
-let layout_variant = Pvalue Pgenval
+let layout_list =
+  Pvalue (Pvariant { consts = [0] ; non_consts = [0, [Pgenval; Pgenval]] })
 let layout_field = Pvalue Pgenval
 let layout_function = Pvalue Pgenval
 let layout_object = Pvalue Pgenval

ocaml/lambda/lambda.mli

@@ -468,7 +468,7 @@ val layout_unit : layout
 val layout_int : layout
 val layout_array : array_kind -> layout
 val layout_block : layout
-val layout_variant : layout
+val layout_list : layout
 val layout_function : layout
 val layout_object : layout
 val layout_class : layout

ocaml/lambda/matching.ml

@@ -2840,7 +2840,7 @@ let combine_constructor value_kind loc arg pat_env cstr partial ctx def
                       (Lprim (Pintcomp Ceq, [ Lvar tag; ext ], loc), act, rem, value_kind))
                   nonconsts default
               in
-              Llet (Alias, Lambda.layout_field, tag,
+              Llet (Alias, Lambda.layout_block, tag,
                     Lprim (Pfield (0, Reads_agree), [ arg ], loc),
                     tests)
         in
@@ -2938,7 +2938,7 @@ let call_switcher_variant_constr value_kind loc fail arg int_lambda_list =
   let v = Ident.create_local "variant" in
   Llet
     ( Alias,
-      Lambda.layout_block,
+      Lambda.layout_int,
       v,
       Lprim (nonconstant_variant_field 0, [ arg ], loc),
       call_switcher value_kind loc fail (Lvar v) min_int max_int int_lambda_list )

ocaml/lambda/translcomprehension.ml

@@ -492,8 +492,8 @@ let transl_list_comp type_comp body acc_var mats ~transl_exp ~scopes ~loc =
   let fn =
     lfunction
       ~kind:(Curried {nlocal=0})
-      ~params:[param, pval; acc_var, Lambda.layout_variant]
-      ~return:Lambda.layout_variant
+      ~params:[param, pval; acc_var, Lambda.layout_list]
+      ~return:Lambda.layout_list
       ~attr:default_function_attribute
       ~loc
       ~body
@@ -535,13 +535,13 @@ let transl_list_comprehension ~transl_exp ~loc ~scopes body blocks =
           (body, acc_var, []) block.clauses
         in
         let body = List.fold_right (fun (id, arr) body ->
-          Llet(Strict, Lambda.layout_variant, id, arr, body))
+          Llet(Strict, Lambda.layout_list, id, arr, body))
           materialize body
         in
         body, acc_var)
     (bdy, acc_var) blocks
   in
-  Llet(Alias, Lambda.layout_variant, res_var, int 0, (*Empty list.*)
+  Llet(Alias, Lambda.layout_list, res_var, int 0, (*Empty list.*)
     Lapply{
         ap_loc=loc;
         ap_func=comp_rev ();

ocaml/lambda/translobj.ml

@@ -95,6 +95,9 @@ let transl_label_init_general f =
          let const =
            Lprim (Popaque, [Lconst c], Debuginfo.Scoped_location.Loc_unknown)
          in
+         (* CR ncourant: this *should* not be too precise for the moment,
+            but we should take care, or fix the underlying cause that led
+            us to using [Popaque]. *)
          Llet(Alias, Lambda.structured_constant_layout c, id, const, expr))
       consts expr
   in