an attempt: thread through *all* unbound type vars

Author: glittershark

typing/jkind.ml

@@ -1112,8 +1112,8 @@ module Layout_and_axes = struct
                     match jkind_of_type wb_ty with
                     | None -> Mod_bounds.max
                     | Some jkind ->
-                      (!normalize' jkind (* CR aspsmith: unbound_type_vars? *)
-                         ~mode:Ignore_best ~jkind_of_type)
+                      (!normalize' jkind ~unbound_type_vars ~mode:Ignore_best
+                         ~jkind_of_type)
                         .jkind
                         .mod_bounds
                   in
@@ -2235,13 +2235,12 @@ let for_object =
 (******************************)
 (* elimination and defaulting *)
 
-let[@inline] normalize ?(unbound_type_vars = Btype.TypeSet.empty) ~mode
-    ~jkind_of_type t =
+let[@inline] normalize ?unbound_type_vars ~mode ~jkind_of_type t =
   let mode : _ Layout_and_axes.normalize_mode =
     match mode with Require_best -> Require_best | Ignore_best -> Ignore_best
   in
   let jkind, fuel_result =
-    Layout_and_axes.normalize ~unbound_type_vars ~jkind_of_type
+    Layout_and_axes.normalize ?unbound_type_vars ~jkind_of_type
       ~skip_axes:Axis_set.empty ~mode t.jkind
   in
   { t with

typing/typedecl.ml

@@ -2656,14 +2656,20 @@ let check_redefined_unit (td: Parsetree.type_declaration) =
 
 (* Normalize the jkinds in a list of (potentially mutually recursive) type declarations *)
 let normalize_decl_jkinds env shapes decls =
+  let unbound_type_vars =
+    List.fold_left
+      (fun acc (_, _, _, decl) ->
+         Btype.TypeSet.union acc (Datarepr.unbound_type_vars decl))
+      Btype.TypeSet.empty
+      decls
+  in
   let rec normalize_decl_jkind env original_decl allow_any_crossing decl path =
     let type_unboxed_version =
       Option.map (fun type_unboxed_version ->
         normalize_decl_jkind env (Option.get original_decl.type_unboxed_version)
           allow_any_crossing type_unboxed_version (Path.unboxed_version path))
       decl.type_unboxed_version
     in
-    let unbound_type_vars = Datarepr.unbound_type_vars decl in
     let normalized_jkind =
       Jkind.normalize
         ~unbound_type_vars