cleanup

Author: zth

jscomp/ml/ctype.ml

@@ -3704,8 +3704,8 @@ let rec subtype_rec env trace t1 t2 cstrs =
     | (Tvariant {row_closed=true; row_fields}, Tconstr (_, [], _)) 
         when extract_concrete_typedecl_opt env t2 |> Variant_coercion.type_is_variant -> 
       (match extract_concrete_typedecl env t2 with
-      | (_, _, {type_kind=Type_variant (constructors); type_attributes}) -> 
-        (match Variant_coercion.can_coerce_polyvariant_to_variant ~row_fields ~constructors ~type_attributes with 
+      | (_, _, {type_kind=Type_variant variant_constructors; type_attributes}) -> 
+        (match Variant_coercion.can_coerce_polyvariant_to_variant ~row_fields ~variant_constructors ~type_attributes with 
         | Ok _ -> cstrs
         | Error _ -> (trace, t1, t2, !univar_pairs)::cstrs)
       | _ -> (trace, t1, t2, !univar_pairs)::cstrs)

jscomp/ml/variant_coercion.ml

@@ -152,11 +152,12 @@ let variant_configuration_can_be_coerced_raises ~is_spread_context ~left_loc
               error = TagName {left_tag; right_tag};
             }))
 
-let can_coerce_polyvariant_to_variant ~row_fields ~constructors ~type_attributes
+let can_coerce_polyvariant_to_variant ~row_fields ~variant_constructors ~type_attributes
     =
   let polyvariant_runtime_representations =
     row_fields
     |> List.filter_map (fun (label, (field : Types.row_field)) ->
+            (* Check that there's no payload in the polyvariant *)
             match field with
             | Rpresent None -> Some label
             | _ -> None)
@@ -167,11 +168,10 @@ let can_coerce_polyvariant_to_variant ~row_fields ~constructors ~type_attributes
     Error `PolyvariantConstructorHasPayload
   else
     let is_unboxed = Ast_untagged_variants.has_untagged type_attributes in
-    print_endline (string_of_bool is_unboxed);
     if
       List.for_all
         (fun polyvariant_value ->
-          constructors
+          variant_constructors
           |> List.exists (fun (c : Types.constructor_declaration) ->
                   let constructor_name = Ident.name c.cd_id in
                   match