more dce

Author: cristianoc

jscomp/gentype/GenTypeCommon.ml

@@ -92,12 +92,7 @@ and variant = {
   unboxed: bool;
 }
 
-and payload = {
-  case: case;
-  inlineRecord: bool; [@live]
-  numArgs: int; [@live]
-  t: type_;
-}
+and payload = {case: case; numArgs: int; [@live] t: type_}
 
 type label = Nolabel | Label of string | OptLabel of string
 

jscomp/gentype/TranslateCoreType.ml

@@ -204,7 +204,6 @@ and translateCoreType_ ~config ~typeVarsGen
         |> List.map (fun (label, _attributes, translation) ->
                {
                  case = {label; labelJS = StringLabel label};
-                 inlineRecord = false;
                  numArgs = 1;
                  t = translation.type_;
                })

jscomp/gentype/TranslateTypeDeclarations.ml

@@ -240,11 +240,6 @@ let traslateDeclarationKind ~config ~loc ~outputFileRelative ~resolver
                         ~recordRepresentation:Types.Record_regular;
                  ]
              in
-             let inlineRecord =
-               match constructorArgs with
-               | Cstr_tuple _ -> false
-               | Cstr_record _ -> true
-             in
              let argTypes =
                argsTranslation
                |> List.map (fun {TranslateTypeExprFromTypes.type_} -> type_)
@@ -266,36 +261,21 @@ let traslateDeclarationKind ~config ~loc ~outputFileRelative ~resolver
                attributes,
                argTypes,
                importTypes,
-               inlineRecord,
                recordValue |> Runtime.recordValueToString ))
     in
     let variantsNoPayload, variantsWithPayload =
-      variants
-      |> List.partition (fun (_, _, argTypes, _, _, _) -> argTypes = [])
+      variants |> List.partition (fun (_, _, argTypes, _, _) -> argTypes = [])
     in
     let noPayloads =
       variantsNoPayload
       |> List.map
-           (fun
-             ( name,
-               attributes,
-               _argTypes,
-               _importTypes,
-               _inlineRecord,
-               recordValue )
-           -> {((name, attributes) |> createCase) with label = recordValue})
+           (fun (name, attributes, _argTypes, _importTypes, recordValue) ->
+             {((name, attributes) |> createCase) with label = recordValue})
     in
     let payloads =
       variantsWithPayload
       |> List.map
-           (fun
-             ( name,
-               attributes,
-               argTypes,
-               _importTypes,
-               inlineRecord,
-               recordValue )
-           ->
+           (fun (name, attributes, argTypes, _importTypes, recordValue) ->
              let type_ =
                match argTypes with
                | [type_] -> type_
@@ -305,7 +285,6 @@ let traslateDeclarationKind ~config ~loc ~outputFileRelative ~resolver
              {
                case =
                  {((name, attributes) |> createCase) with label = recordValue};
-               inlineRecord;
                numArgs;
                t = type_;
              })
@@ -324,7 +303,7 @@ let traslateDeclarationKind ~config ~loc ~outputFileRelative ~resolver
     in
     let importTypes =
       variants
-      |> List.map (fun (_, _, _, importTypes, _, _) -> importTypes)
+      |> List.map (fun (_, _, _, importTypes, _) -> importTypes)
       |> List.concat
     in
     {CodeItem.exportFromTypeDeclaration; importTypes} |> returnTypeDeclaration

jscomp/gentype/TranslateTypeExprFromTypes.ml

@@ -134,7 +134,6 @@ let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
     let case n name type_ =
       {
         case = {label = string_of_int n; labelJS = StringLabel name};
-        inlineRecord = false;
         numArgs = 1;
         t = type_;
       }
@@ -411,7 +410,6 @@ and translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
         |> List.map (fun (label, translation) ->
                {
                  case = {label; labelJS = StringLabel label};
-                 inlineRecord = false;
                  numArgs = 1;
                  t = translation.type_;
                })