Completely remove record_repr from lambda.

Author: cristianoc

compiler/core/js_dump.ml

@@ -759,24 +759,19 @@ and expression_desc cxt ~(level : int) f x : cxt =
            Ext_list.map_combine fields el (fun x ->
                Js_op.Lit (Ext_ident.convert x)) ))
   (*name convention of Record is slight different from modules*)
-  | Caml_block (el, mutable_flag, _, Blk_record {fields; record_repr}) -> (
+  | Caml_block (el, mutable_flag, _, Blk_record {fields}) ->
     if
       Array.length fields <> 0
-      && Ext_array.for_alli fields (fun i v -> string_of_int i = v)
+      && Ext_array.for_alli fields (fun i (v, _) -> string_of_int i = v)
     then expression_desc cxt ~level f (Array (el, mutable_flag))
     else
-      match record_repr with
-      | Record_regular ->
-        expression_desc cxt ~level f
-          (Object (None, Ext_list.combine_array fields el (fun i -> Js_op.Lit i)))
-      | Record_optional ->
-        let fields =
-          Ext_list.array_list_filter_map fields el (fun f x ->
-              match x.expression_desc with
-              | Undefined _ -> None
-              | _ -> Some (Js_op.Lit f, x))
-        in
-        expression_desc cxt ~level f (Object (None, fields)))
+      let fields =
+        Ext_list.array_list_filter_map fields el (fun (f, opt) x ->
+            match x.expression_desc with
+            | Undefined _ when opt -> None
+            | _ -> Some (Js_op.Lit f, x))
+      in
+      expression_desc cxt ~level f (Object (None, fields))
   | Caml_block (el, _, _, Blk_poly_var _) -> (
     match el with
     | [tag; value] ->

compiler/core/js_pass_flatten_and_mark_dead.ml

@@ -207,9 +207,8 @@ let subst_map (substitution : J.expression Hash_ident.t) =
                         match Ext_list.nth_opt fields i with
                         | None -> Printf.sprintf "%d" i
                         | Some x -> x)
-                      | Blk_record {fields} ->
-                        Ext_array.get_or fields i (fun _ ->
-                            Printf.sprintf "%d" i)
+                      | Blk_record {fields} -> (
+                        try fst fields.(i) with _ -> Printf.sprintf "%d" i)
                       | _ -> Printf.sprintf "%d" i)
                   in
                   (i + 1, E.var match_id :: e, (match_id, v') :: acc))

compiler/core/lam_compile.ml

@@ -425,7 +425,7 @@ let compile output_prefix =
                  S.exp
                    (Js_of_lam_block.set_field
                       (match tag_info with
-                      | Blk_record {fields = xs} -> Fld_record_set xs.(i)
+                      | Blk_record {fields = xs} -> Fld_record_set (fst xs.(i))
                       | Blk_record_inlined xs ->
                         Fld_record_inline_set (fst xs.fields.(i))
                       | Blk_constructor p -> (

compiler/core/lam_convert.ml

@@ -34,9 +34,8 @@ let lam_extension_id loc (head : Lam.t) =
 let lazy_block_info : Lam_tag_info.t =
   Blk_record
     {
-      fields = [|Literals.lazy_done; Literals.lazy_val|];
+      fields = [|(Literals.lazy_done, false); (Literals.lazy_val, false)|];
       mutable_flag = Mutable;
-      record_repr = Record_regular;
     }
 
 (** A conservative approach to avoid packing exceptions

compiler/core/lam_util.ml

@@ -198,7 +198,7 @@ let field_flatten_get
       | Fld_record {name} ->
         let found = ref None in
         for i = 0 to Array.length fields - 1 do
-          if fields.(i) = name then found := Ext_list.nth_opt ls i done;
+          if fst(fields.(i)) = name then found := Ext_list.nth_opt ls i done;
         (match !found with
         | Some c -> Lam.const c
         | None  -> lam())

compiler/ml/lambda.ml

@@ -15,8 +15,6 @@
 
 type loc_kind = Loc_FILE | Loc_LINE | Loc_MODULE | Loc_LOC | Loc_POS
 
-type record_repr = Record_regular | Record_optional
-
 type tag_info =
   | Blk_constructor of {
       name: string;
@@ -35,9 +33,8 @@ type tag_info =
   | Blk_tuple
   | Blk_poly_var of string
   | Blk_record of {
-      fields: string array;
+      fields: (string * bool (* optional *)) array;
       mutable_flag: Asttypes.mutable_flag;
-      record_repr: record_repr;
     }
   | Blk_module of string list
   | Blk_module_export of Ident.t list
@@ -87,12 +84,13 @@ let find_name (attr : Parsetree.attribute) =
     Some s
   | _ -> None
 
-let blk_record (fields : (label * _) array) mut record_repr =
+let blk_record (fields : (label * _) array) mut =
   let all_labels_info =
     Ext_array.map fields (fun (lbl, _) ->
-        Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name)
+        ( Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name,
+          lbl.lbl_optional ))
   in
-  Blk_record {fields = all_labels_info; mutable_flag = mut; record_repr}
+  Blk_record {fields = all_labels_info; mutable_flag = mut}
 
 let blk_record_ext fields mutable_flag =
   let all_labels_info =
@@ -114,12 +112,7 @@ let blk_record_inlined fields name num_nonconst ~tag ~attrs mutable_flag =
   Blk_record_inlined {fields; name; num_nonconst; tag; mutable_flag; attrs}
 
 let ref_tag_info : tag_info =
-  Blk_record
-    {
-      fields = [|"contents"|];
-      mutable_flag = Mutable;
-      record_repr = Record_regular;
-    }
+  Blk_record {fields = [|("contents", false)|]; mutable_flag = Mutable}
 
 type field_dbg_info =
   | Fld_record of {name: string; mutable_flag: Asttypes.mutable_flag}

compiler/ml/lambda.mli

@@ -19,8 +19,6 @@ open Asttypes
 
 type loc_kind = Loc_FILE | Loc_LINE | Loc_MODULE | Loc_LOC | Loc_POS
 
-type record_repr = Record_regular | Record_optional
-
 type tag_info =
   | Blk_constructor of {
       name: string;
@@ -39,9 +37,8 @@ type tag_info =
   | Blk_tuple
   | Blk_poly_var of string
   | Blk_record of {
-      fields: string array;
+      fields: (string * bool (* optional *)) array;
       mutable_flag: mutable_flag;
-      record_repr: record_repr;
     }
   | Blk_module of string list
   | Blk_module_export of Ident.t list
@@ -68,7 +65,6 @@ val mutable_flag_of_tag_info : tag_info -> mutable_flag
 val blk_record :
   (Types.label_description * Typedtree.record_label_definition) array ->
   mutable_flag ->
-  record_repr ->
   tag_info
 
 val blk_record_ext :

compiler/ml/printlambda.ml

@@ -97,7 +97,7 @@ let print_taginfo ppf = function
     fprintf ppf "%s/%i" name num_nonconst
   | Blk_poly_var name -> fprintf ppf "`%s" name
   | Blk_record {fields = ss} ->
-    fprintf ppf "[%s]" (String.concat ";" (Array.to_list ss))
+    fprintf ppf "[%s]" (String.concat ";" (List.map fst (Array.to_list ss)))
   | Blk_module ss -> fprintf ppf "[%s]" (String.concat ";" ss)
   | Blk_some -> fprintf ppf "some"
   | Blk_some_not_nested -> fprintf ppf "some_not_nested"

compiler/ml/translcore.ml

@@ -1206,11 +1206,7 @@ and transl_record loc env fields repres opt_init_expr =
           match repres with
           | Record_float_unused -> assert false
           | Record_regular ->
-            Lconst
-              (Const_block
-                 ( Lambda.blk_record fields mut
-                     (if optional then Record_optional else Record_regular),
-                   cl ))
+            Lconst (Const_block (Lambda.blk_record fields mut, cl))
           | Record_inlined {tag; name; num_nonconsts; attrs} ->
             Lconst
               (Const_block
@@ -1226,12 +1222,7 @@ and transl_record loc env fields repres opt_init_expr =
         with Not_constant -> (
           match repres with
           | Record_regular ->
-            Lprim
-              ( Pmakeblock
-                  (Lambda.blk_record fields mut
-                     (if optional then Record_optional else Record_regular)),
-                ll,
-                loc )
+            Lprim (Pmakeblock (Lambda.blk_record fields mut), ll, loc)
           | Record_float_unused -> assert false
           | Record_inlined {tag; name; num_nonconsts; attrs} ->
             Lprim

tests/tests/src/record_regression.mjs

@@ -55,7 +55,8 @@ newrecord$4.aa = undefined;
 
 function setAA(ao) {
   return {
-    aa: ao
+    aa: ao,
+    bb: undefined
   };
 }