flambda-backend: Make jkind and types mutually recursive (#2538)

* Make jkind and types mutually recursive

* Update comment in ocaml/typing/jkind_types.mli

Co-authored-by: Richard Eisenberg <[email protected]>

* Fix line length

* Cleanup sort changelog refs

* Cleanup sort refs in primitive

* Update commend about jkind_types

* Add diagram of dependency chain

* Remove a lot of duplication

* Tiny improvement around include sig

* Fix build error

* Fix the build, I think

* Remove duplicate jkind_intf in dune file

* Revert "Fix the build, I think"

I had some build error that I tried to fix, but it seems that
I just had done something silly. The previous commit to the
one reverted is the actual fix.

This reverts commit cc0a0dc.

---------

Co-authored-by: Richard Eisenberg <[email protected]>
Co-authored-by: Richard Eisenberg <[email protected]>

Author: liam923

.depend

@@ -1116,34 +1116,62 @@ typing/includemod_errorprinter.cmx : \
 typing/includemod_errorprinter.cmi : \
     typing/includemod.cmi
 typing/jkind.cmo : \
+    typing/types.cmi \
+    typing/primitive.cmi \
     typing/path.cmi \
     parsing/parsetree.cmi \
     typing/mode.cmi \
     utils/misc.cmi \
     parsing/location.cmi \
     utils/language_extension.cmi \
+    typing/jkind_types.cmi \
     parsing/jane_syntax.cmi \
     parsing/jane_asttypes.cmi \
     typing/ident.cmi \
     parsing/builtin_attributes.cmi \
     typing/jkind.cmi
 typing/jkind.cmx : \
+    typing/types.cmx \
+    typing/primitive.cmx \
     typing/path.cmx \
     parsing/parsetree.cmi \
     typing/mode.cmx \
     utils/misc.cmx \
     parsing/location.cmx \
     utils/language_extension.cmx \
+    typing/jkind_types.cmx \
     parsing/jane_syntax.cmx \
     parsing/jane_asttypes.cmx \
     typing/ident.cmx \
     parsing/builtin_attributes.cmx \
     typing/jkind.cmi
 typing/jkind.cmi : \
+    typing/types.cmi \
     typing/path.cmi \
     parsing/parsetree.cmi \
     typing/mode.cmi \
     parsing/location.cmi \
+    typing/jkind_types.cmi \
+    parsing/jane_asttypes.cmi \
+    typing/ident.cmi
+typing/jkind_types.cmo : \
+    typing/path.cmi \
+    typing/mode.cmi \
+    parsing/location.cmi \
+    parsing/jane_asttypes.cmi \
+    typing/ident.cmi \
+    typing/jkind_types.cmi
+typing/jkind_types.cmx : \
+    typing/path.cmx \
+    typing/mode.cmx \
+    parsing/location.cmx \
+    parsing/jane_asttypes.cmx \
+    typing/ident.cmx \
+    typing/jkind_types.cmi
+typing/jkind_types.cmi : \
+    typing/path.cmi \
+    typing/mode.cmi \
+    parsing/location.cmi \
     parsing/jane_asttypes.cmi \
     typing/ident.cmi
 typing/mode.cmo : \
@@ -1210,7 +1238,7 @@ typing/oprint.cmx : \
 typing/oprint.cmi : \
     typing/outcometree.cmi
 typing/outcometree.cmi : \
-    typing/jkind.cmi \
+    typing/jkind_types.cmi \
     parsing/asttypes.cmi
 typing/parmatch.cmo : \
     utils/warnings.cmi \
@@ -1374,7 +1402,7 @@ typing/primitive.cmo : \
     utils/misc.cmi \
     parsing/location.cmi \
     utils/language_extension.cmi \
-    typing/jkind.cmi \
+    typing/jkind_types.cmi \
     parsing/attr_helper.cmi \
     typing/primitive.cmi
 typing/primitive.cmx : \
@@ -1383,14 +1411,14 @@ typing/primitive.cmx : \
     utils/misc.cmx \
     parsing/location.cmx \
     utils/language_extension.cmx \
-    typing/jkind.cmx \
+    typing/jkind_types.cmx \
     parsing/attr_helper.cmx \
     typing/primitive.cmi
 typing/primitive.cmi : \
     parsing/parsetree.cmi \
     typing/outcometree.cmi \
     parsing/location.cmi \
-    typing/jkind.cmi
+    typing/jkind_types.cmi
 typing/printpat.cmo : \
     typing/types.cmi \
     typing/typedtree.cmi \
@@ -2236,7 +2264,7 @@ typing/types.cmo : \
     parsing/longident.cmi \
     parsing/location.cmi \
     utils/local_store.cmi \
-    typing/jkind.cmi \
+    typing/jkind_types.cmi \
     typing/ident.cmi \
     utils/config.cmi \
     parsing/builtin_attributes.cmi \
@@ -2252,7 +2280,7 @@ typing/types.cmx : \
     parsing/longident.cmx \
     parsing/location.cmx \
     utils/local_store.cmx \
-    typing/jkind.cmx \
+    typing/jkind_types.cmx \
     typing/ident.cmx \
     utils/config.cmx \
     parsing/builtin_attributes.cmx \
@@ -2266,7 +2294,7 @@ typing/types.cmi : \
     typing/mode.cmi \
     parsing/longident.cmi \
     parsing/location.cmi \
-    typing/jkind.cmi \
+    typing/jkind_types.cmi \
     typing/ident.cmi \
     parsing/builtin_attributes.cmi \
     parsing/asttypes.cmi

compilerlibs/Makefile.compilerlibs

@@ -87,10 +87,11 @@ TYPING = \
   typing/solver.cmo \
   typing/path.cmo \
   typing/mode.cmo \
-  typing/jkind.cmo \
+  typing/jkind_types.cmo \
   typing/primitive.cmo \
   typing/shape.cmo \
   typing/types.cmo \
+  typing/jkind.cmo \
   typing/btype.cmo \
   typing/oprint.cmo \
   typing/subst.cmo \

debugger4/.depend

@@ -287,6 +287,7 @@ loadprinter.cmo : \
     ../parsing/longident.cmi \
     ../utils/load_path.cmi \
     ../typing/jkind.cmi \
+    ../typing/jkind_types.cmi \
     ../typing/ident.cmi \
     ../typing/env.cmi \
     ../otherlibs/dynlink/dynlink.cmi \
@@ -304,6 +305,7 @@ loadprinter.cmx : \
     ../parsing/longident.cmx \
     ../utils/load_path.cmx \
     ../typing/jkind.cmx \
+    ../typing/jkind_types.cmx \
     ../typing/ident.cmx \
     ../typing/env.cmx \
     ../otherlibs/dynlink/dynlink.cmx \

dune

@@ -88,7 +88,7 @@
 
    ;; TYPING
    ident path jkind primitive shape shape_reduce types btype oprint subst predef datarepr
-   cmi_format persistent_env env errortrace mode
+   cmi_format persistent_env env errortrace mode jkind_types jkind_intf
    typedtree printtyped ctype printtyp includeclass mtype envaux includecore
    tast_iterator tast_mapper signature_group cmt_format cms_format untypeast
    includemod includemod_errorprinter
@@ -286,6 +286,7 @@
     (ident.mli as compiler-libs/ident.mli)
     (path.mli as compiler-libs/path.mli)
     (jkind.mli as compiler-libs/jkind.mli)
+    (jkind_types.mli as compiler-libs/jkind_types.mli)
     (primitive.mli as compiler-libs/primitive.mli)
     (types.mli as compiler-libs/types.mli)
     (btype.mli as compiler-libs/btype.mli)

jane/build-resolved-files-for-ci

@@ -88,6 +88,7 @@ typing_mls=(
   includecore
   includemod
   jkind
+  jkind_types
   mtype
   oprint
   parmatch

ocamldoc/.depend

@@ -761,6 +761,7 @@ odoc_sig.cmo : \
     ../parsing/longident.cmi \
     ../parsing/location.cmi \
     ../typing/jkind.cmi \
+    ../typing/jkind_types.cmi \
     ../parsing/jane_syntax.cmi \
     ../typing/ident.cmi \
     ../typing/ctype.cmi \
@@ -788,6 +789,7 @@ odoc_sig.cmx : \
     ../parsing/longident.cmx \
     ../parsing/location.cmx \
     ../typing/jkind.cmx \
+    ../typing/jkind_types.cmx \
     ../parsing/jane_syntax.cmx \
     ../typing/ident.cmx \
     ../typing/ctype.cmx \

otherlibs/dynlink/Makefile

@@ -120,9 +120,10 @@ COMPILERLIBS_SOURCES=\
   typing/mode.ml \
   typing/path.ml \
   typing/shape.ml \
-  typing/jkind.ml \
+  typing/jkind_types.ml \
   typing/primitive.ml \
   typing/types.ml \
+  typing/jkind.ml \
   typing/typedtree.ml \
   typing/btype.ml \
   typing/subst.ml \

otherlibs/dynlink/dune

@@ -87,9 +87,11 @@
     mode_intf
     mode
     typemode
-    jkind
+    jkind_intf
+    jkind_types
     primitive
     types
+    jkind
     value_rec_types
     btype
     lazy_backtrack
@@ -185,6 +187,8 @@
 (copy_files ../../typing/ident.ml)
 (copy_files ../../typing/path.ml)
 (copy_files ../../typing/jkind.ml)
+(copy_files ../../typing/jkind_intf.ml)
+(copy_files ../../typing/jkind_types.ml)
 (copy_files ../../typing/primitive.ml)
 (copy_files ../../typing/shape.ml)
 (copy_files ../../typing/solver.ml)
@@ -253,6 +257,8 @@
 (copy_files ../../typing/ident.mli)
 (copy_files ../../typing/path.mli)
 (copy_files ../../typing/jkind.mli)
+(copy_files ../../typing/jkind_intf.mli)
+(copy_files ../../typing/jkind_types.mli)
 (copy_files ../../typing/primitive.mli)
 (copy_files ../../typing/shape.mli)
 (copy_files ../../typing/solver.mli)
@@ -370,8 +376,12 @@
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Solver.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Mode.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Typemode.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Jkind.cmo
+      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Jkind_intf.cmo
+      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Jkind_types.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Types.cmo
+      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Attr_helper.cmo
+      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Primitive.cmo
+      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Jkind.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Btype.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Subst.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Bytesections.cmo
@@ -381,8 +391,6 @@
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Shape.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Datarepr.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Persistent_env.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Attr_helper.cmo
-      .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Primitive.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Predef.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Env.cmo
       .dynlink_compilerlibs.objs/byte/dynlink_compilerlibs__Lambda.cmo
@@ -452,8 +460,12 @@
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Solver.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Mode.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Typemode.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Jkind.cmx
+      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Jkind_intf.cmx
+      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Jkind_types.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Types.cmx
+      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Attr_helper.cmx
+      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Primitive.cmx
+      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Jkind.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Btype.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Subst.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Bytesections.cmx
@@ -463,8 +475,6 @@
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Shape.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Datarepr.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Persistent_env.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Attr_helper.cmx
-      .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Primitive.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Predef.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Env.cmx
       .dynlink_compilerlibs.objs/native/dynlink_compilerlibs__Lambda.cmx

typing/.ocamlformat-enable

@@ -1,5 +1,8 @@
 jkind.ml
 jkind.mli
+jkind_types.ml
+jkind_types.mli
+jkind_intf.ml
 uniqueness_analysis.ml
 uniqueness_analysis.mli
 mode_intf.mli
@@ -9,4 +12,4 @@ solver_intf.mli
 solver.ml
 solver.mli
 typemode.mli
-typemode.ml
+typemode.ml