Skip to content

Commit 1ddf65d

Browse files
flambda-backend: Reroute legacy immediate support for jkinds (#1907)
* Change parsetree layouts to strings * make depend * Striate jkind annotations from attributes * Restore check and add test that `type t : unboxed` isn't allowed * Fix build * Main changes * Restore a similar behavior to [legacy_immediate] (so that we can allow `type t : value` and `type t : immediate` even in layouts stable) * Change tests to not use `[@@void]`, `[@@value]`, etc. * Change tests to use new error message * Disallow multiple sources of jkind * Rename `legacy_immediate` to `is_type_decl` This concept now just exists within `jkind.ml`, so let's name it with the appropriate implementation detail. * `make bootstrap` * Minor changes suggested in review * More minor changes suggested in review * More minor changes suggested in review * Update ocaml/typing/jkind.ml Co-authored-by: Richard Eisenberg <[email protected]> * Revert change that I can't explain * Store both typed/untyped jkind annotation in typedtree, and delete `const_to_user_written_annotation` * Remove misleading comment * Add CRs for doubling-down on backward-incompatible change * Update ocaml/typing/types.mli Co-authored-by: Richard Eisenberg <[email protected]> * Make predefs less confusing if printed * Resolve merge conflicts and fix build * Remove obviated module * Add missing case to comment * Drop the needless is_type_decl param * Split Location argument into its components * Remove no-longer-necessary builtin attrs * make depend * Layout annotations in untypeast * Resolve merge conflicts and update whitespace in tests * Fix merge conflicts * make {depend,boot,parser} * Resolve merge conflicts due to squash+merge * Fix tests broken by error message change * Resolve merge conflicts in typing-layouts-float64 * make fmt * Remove test unintentionally added back in the merge * Collapse *_beta versions of layouts tests with their stable versions now that the error message is the same * git rm files that I intended to remove in 5b2bd0c * Suggestion from review --------- Co-authored-by: Richard Eisenberg <[email protected]>
1 parent b862776 commit 1ddf65d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2123
-4041
lines changed

.depend

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,6 +1080,7 @@ typing/includemod_errorprinter.cmi : \
10801080
typing/includemod.cmi
10811081
typing/jkind.cmo : \
10821082
typing/path.cmi \
1083+
parsing/parsetree.cmi \
10831084
utils/misc.cmi \
10841085
parsing/location.cmi \
10851086
utils/language_extension.cmi \
@@ -1090,6 +1091,7 @@ typing/jkind.cmo : \
10901091
typing/jkind.cmi
10911092
typing/jkind.cmx : \
10921093
typing/path.cmx \
1094+
parsing/parsetree.cmi \
10931095
utils/misc.cmx \
10941096
parsing/location.cmx \
10951097
utils/language_extension.cmx \
@@ -1103,8 +1105,7 @@ typing/jkind.cmi : \
11031105
parsing/parsetree.cmi \
11041106
parsing/location.cmi \
11051107
parsing/jane_asttypes.cmi \
1106-
typing/ident.cmi \
1107-
parsing/builtin_attributes.cmi
1108+
typing/ident.cmi
11081109
typing/mode.cmo : \
11091110
utils/misc.cmi \
11101111
typing/mode.cmi
@@ -1148,17 +1149,20 @@ typing/oprint.cmo : \
11481149
parsing/printast.cmi \
11491150
typing/outcometree.cmi \
11501151
utils/language_extension.cmi \
1152+
typing/jkind.cmi \
11511153
parsing/asttypes.cmi \
11521154
typing/oprint.cmi
11531155
typing/oprint.cmx : \
11541156
parsing/printast.cmx \
11551157
typing/outcometree.cmi \
11561158
utils/language_extension.cmx \
1159+
typing/jkind.cmx \
11571160
parsing/asttypes.cmi \
11581161
typing/oprint.cmi
11591162
typing/oprint.cmi : \
11601163
typing/outcometree.cmi
11611164
typing/outcometree.cmi : \
1165+
typing/jkind.cmi \
11621166
parsing/asttypes.cmi
11631167
typing/parmatch.cmo : \
11641168
utils/warnings.cmi \
@@ -1222,6 +1226,7 @@ typing/patterns.cmo : \
12221226
typing/mode.cmi \
12231227
parsing/longident.cmi \
12241228
parsing/location.cmi \
1229+
typing/jkind.cmi \
12251230
typing/ident.cmi \
12261231
typing/env.cmi \
12271232
typing/ctype.cmi \
@@ -1233,6 +1238,7 @@ typing/patterns.cmx : \
12331238
typing/mode.cmx \
12341239
parsing/longident.cmx \
12351240
parsing/location.cmx \
1241+
typing/jkind.cmx \
12361242
typing/ident.cmx \
12371243
typing/env.cmx \
12381244
typing/ctype.cmx \
@@ -1243,6 +1249,7 @@ typing/patterns.cmi : \
12431249
typing/typedtree.cmi \
12441250
typing/mode.cmi \
12451251
parsing/longident.cmi \
1252+
typing/jkind.cmi \
12461253
typing/ident.cmi \
12471254
parsing/asttypes.cmi
12481255
typing/persistent_env.cmo : \
@@ -1284,6 +1291,7 @@ typing/predef.cmo : \
12841291
parsing/parsetree.cmi \
12851292
parsing/location.cmi \
12861293
typing/jkind.cmi \
1294+
parsing/jane_asttypes.cmi \
12871295
typing/ident.cmi \
12881296
typing/btype.cmi \
12891297
parsing/asttypes.cmi \
@@ -1295,6 +1303,7 @@ typing/predef.cmx : \
12951303
parsing/parsetree.cmi \
12961304
parsing/location.cmx \
12971305
typing/jkind.cmx \
1306+
parsing/jane_asttypes.cmx \
12981307
typing/ident.cmx \
12991308
typing/btype.cmx \
13001309
parsing/asttypes.cmi \
@@ -1362,7 +1371,6 @@ typing/printtyp.cmo : \
13621371
typing/ctype.cmi \
13631372
utils/compilation_unit.cmi \
13641373
utils/clflags.cmi \
1365-
parsing/builtin_attributes.cmi \
13661374
typing/btype.cmi \
13671375
parsing/asttypes.cmi \
13681376
typing/printtyp.cmi
@@ -1388,7 +1396,6 @@ typing/printtyp.cmx : \
13881396
typing/ctype.cmx \
13891397
utils/compilation_unit.cmx \
13901398
utils/clflags.cmx \
1391-
parsing/builtin_attributes.cmx \
13921399
typing/btype.cmx \
13931400
parsing/asttypes.cmi \
13941401
typing/printtyp.cmi
@@ -1933,6 +1940,7 @@ typing/typedtree.cmo : \
19331940
parsing/longident.cmi \
19341941
parsing/location.cmi \
19351942
typing/jkind.cmi \
1943+
parsing/jane_asttypes.cmi \
19361944
typing/ident.cmi \
19371945
typing/env.cmi \
19381946
parsing/asttypes.cmi \
@@ -1948,6 +1956,7 @@ typing/typedtree.cmx : \
19481956
parsing/longident.cmx \
19491957
parsing/location.cmx \
19501958
typing/jkind.cmx \
1959+
parsing/jane_asttypes.cmx \
19511960
typing/ident.cmx \
19521961
typing/env.cmx \
19531962
parsing/asttypes.cmi \
@@ -1963,6 +1972,7 @@ typing/typedtree.cmi : \
19631972
parsing/longident.cmi \
19641973
parsing/location.cmi \
19651974
typing/jkind.cmi \
1975+
parsing/jane_asttypes.cmi \
19661976
typing/ident.cmi \
19671977
typing/env.cmi \
19681978
parsing/asttypes.cmi

0 commit comments

Comments
 (0)