Skip to content

Commit

Permalink
bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
@goldfirere
goldfirere committed Sep 29, 2023
1 parent e6876c8 commit 2329ca2
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 12 deletions.
64 changes: 56 additions & 8 deletions ocaml/.depend
View file
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,7 @@ typing/env.cmo : \
utils/load_path.cmi \
utils/lazy_backtrack.cmi \
utils/language_extension.cmi \
typing/jkind.cmi \
typing/ident.cmi \
typing/datarepr.cmi \
utils/compilation_unit.cmi \
Expand All @@ -815,6 +816,7 @@ typing/env.cmx : \
utils/load_path.cmx \
utils/lazy_backtrack.cmx \
utils/language_extension.cmx \
typing/jkind.cmx \
typing/ident.cmx \
typing/datarepr.cmx \
utils/compilation_unit.cmx \
Expand All @@ -836,6 +838,7 @@ typing/env.cmi : \
parsing/longident.cmi \
parsing/location.cmi \
utils/load_path.cmi \
typing/jkind.cmi \
utils/import_info.cmi \
typing/ident.cmi \
utils/compilation_unit.cmi \
Expand Down Expand Up @@ -1298,13 +1301,15 @@ typing/primitive.cmo : \
typing/outcometree.cmi \
utils/misc.cmi \
parsing/location.cmi \
typing/jkind.cmi \
parsing/attr_helper.cmi \
typing/primitive.cmi
typing/primitive.cmx : \
parsing/parsetree.cmi \
typing/outcometree.cmi \
utils/misc.cmx \
parsing/location.cmx \
typing/jkind.cmx \
parsing/attr_helper.cmx \
typing/primitive.cmi
typing/primitive.cmi : \
Expand Down Expand Up @@ -2027,6 +2032,7 @@ typing/typemod.cmi : \
parsing/parsetree.cmi \
parsing/longident.cmi \
parsing/location.cmi \
typing/jkind.cmi \
typing/includemod.cmi \
typing/ident.cmi \
typing/env.cmi \
Expand Down Expand Up @@ -2076,6 +2082,7 @@ typing/typeopt.cmi : \
typing/path.cmi \
parsing/location.cmi \
lambda/lambda.cmi \
typing/jkind.cmi \
typing/env.cmi
typing/types.cmo : \
typing/shape.cmi \
Expand Down Expand Up @@ -2596,11 +2603,11 @@ asmcomp/afl_instrument.cmi : \
lambda/debuginfo.cmi \
asmcomp/cmm.cmi
asmcomp/arch.cmo : \
lambda/debuginfo.cmi \
utils/config.cmi
utils/config.cmi \
utils/clflags.cmi
asmcomp/arch.cmx : \
lambda/debuginfo.cmx \
utils/config.cmx
utils/config.cmx \
utils/clflags.cmx
asmcomp/asmgen.cmo : \
lambda/translmod.cmi \
asmcomp/split.cmi \
Expand Down Expand Up @@ -2955,6 +2962,7 @@ asmcomp/cmmgen.cmo : \
typing/primitive.cmi \
utils/misc.cmi \
lambda/lambda.cmi \
typing/jkind.cmi \
lambda/debuginfo.cmi \
utils/config.cmi \
middle_end/compilenv.cmi \
Expand All @@ -2975,6 +2983,7 @@ asmcomp/cmmgen.cmx : \
typing/primitive.cmx \
utils/misc.cmx \
lambda/lambda.cmx \
typing/jkind.cmx \
lambda/debuginfo.cmx \
utils/config.cmx \
middle_end/compilenv.cmx \
Expand Down Expand Up @@ -3064,15 +3073,23 @@ asmcomp/deadcode.cmx : \
asmcomp/deadcode.cmi : \
asmcomp/mach.cmi
asmcomp/emit.cmo : \
asmcomp/x86_proc.cmi \
asmcomp/x86_masm.cmi \
asmcomp/x86_gas.cmi \
asmcomp/x86_dsl.cmi \
asmcomp/x86_ast.cmi \
asmcomp/reg.cmi \
asmcomp/proc.cmi \
asmcomp/printmach.cmi \
utils/numbers.cmi \
utils/misc.cmi \
asmcomp/mach.cmi \
asmcomp/linear.cmi \
lambda/lambda.cmi \
asmcomp/emitenv.cmi \
asmcomp/emitaux.cmi \
utils/domainstate.cmi \
lambda/debuginfo.cmi \
utils/config.cmi \
asmcomp/cmm_helpers.cmi \
asmcomp/cmm.cmi \
Expand All @@ -3081,15 +3098,23 @@ asmcomp/emit.cmo : \
asmcomp/arch.cmo \
asmcomp/emit.cmi
asmcomp/emit.cmx : \
asmcomp/x86_proc.cmx \
asmcomp/x86_masm.cmx \
asmcomp/x86_gas.cmx \
asmcomp/x86_dsl.cmx \
asmcomp/x86_ast.cmi \
asmcomp/reg.cmx \
asmcomp/proc.cmx \
asmcomp/printmach.cmx \
utils/numbers.cmx \
utils/misc.cmx \
asmcomp/mach.cmx \
asmcomp/linear.cmx \
lambda/lambda.cmx \
asmcomp/emitenv.cmi \
asmcomp/emitaux.cmx \
utils/domainstate.cmx \
lambda/debuginfo.cmx \
utils/config.cmx \
asmcomp/cmm_helpers.cmx \
asmcomp/cmm.cmx \
Expand Down Expand Up @@ -3332,21 +3357,21 @@ asmcomp/printmach.cmi : \
asmcomp/reg.cmi \
asmcomp/mach.cmi
asmcomp/proc.cmo : \
asmcomp/x86_proc.cmi \
asmcomp/reg.cmi \
utils/misc.cmi \
asmcomp/mach.cmi \
utils/config.cmi \
asmcomp/cmm.cmi \
utils/ccomp.cmi \
asmcomp/arch.cmo \
asmcomp/proc.cmi
asmcomp/proc.cmx : \
asmcomp/x86_proc.cmx \
asmcomp/reg.cmx \
utils/misc.cmx \
asmcomp/mach.cmx \
utils/config.cmx \
asmcomp/cmm.cmx \
utils/ccomp.cmx \
asmcomp/arch.cmx \
asmcomp/proc.cmi
asmcomp/proc.cmi : \
Expand All @@ -3369,10 +3394,18 @@ asmcomp/reg.cmi : \
asmcomp/reload.cmo : \
asmcomp/reloadgen.cmi \
asmcomp/reg.cmi \
asmcomp/mach.cmi \
asmcomp/cmm.cmi \
utils/clflags.cmi \
asmcomp/arch.cmo \
asmcomp/reload.cmi
asmcomp/reload.cmx : \
asmcomp/reloadgen.cmx \
asmcomp/reg.cmx \
asmcomp/mach.cmx \
asmcomp/cmm.cmx \
utils/clflags.cmx \
asmcomp/arch.cmx \
asmcomp/reload.cmi
asmcomp/reload.cmi : \
asmcomp/mach.cmi
Expand Down Expand Up @@ -3461,15 +3494,15 @@ asmcomp/selectgen.cmi : \
asmcomp/arch.cmo
asmcomp/selection.cmo : \
asmcomp/selectgen.cmi \
asmcomp/reg.cmi \
asmcomp/proc.cmi \
asmcomp/mach.cmi \
asmcomp/cmm.cmi \
utils/clflags.cmi \
asmcomp/arch.cmo \
asmcomp/selection.cmi
asmcomp/selection.cmx : \
asmcomp/selectgen.cmx \
asmcomp/reg.cmx \
asmcomp/proc.cmx \
asmcomp/mach.cmx \
asmcomp/cmm.cmx \
utils/clflags.cmx \
Expand Down Expand Up @@ -3689,13 +3722,15 @@ middle_end/convert_primitives.cmo : \
typing/primitive.cmi \
utils/misc.cmi \
lambda/lambda.cmi \
typing/jkind.cmi \
middle_end/clambda_primitives.cmi \
middle_end/convert_primitives.cmi
middle_end/convert_primitives.cmx : \
lambda/printlambda.cmx \
typing/primitive.cmx \
utils/misc.cmx \
lambda/lambda.cmx \
typing/jkind.cmx \
middle_end/clambda_primitives.cmx \
middle_end/convert_primitives.cmi
middle_end/convert_primitives.cmi : \
Expand Down Expand Up @@ -3904,6 +3939,7 @@ lambda/matching.cmi : \
typing/typedtree.cmi \
parsing/location.cmi \
lambda/lambda.cmi \
typing/jkind.cmi \
typing/ident.cmi \
lambda/debuginfo.cmi
lambda/printlambda.cmo : \
Expand Down Expand Up @@ -3992,6 +4028,7 @@ lambda/transl_array_comprehension.cmo : \
utils/misc.cmi \
lambda/matching.cmi \
lambda/lambda.cmi \
typing/jkind.cmi \
typing/ident.cmi \
typing/env.cmi \
lambda/debuginfo.cmi \
Expand All @@ -4005,6 +4042,7 @@ lambda/transl_array_comprehension.cmx : \
utils/misc.cmx \
lambda/matching.cmx \
lambda/lambda.cmx \
typing/jkind.cmx \
typing/ident.cmx \
typing/env.cmx \
lambda/debuginfo.cmx \
Expand All @@ -4013,6 +4051,7 @@ lambda/transl_array_comprehension.cmx : \
lambda/transl_array_comprehension.cmi : \
typing/typedtree.cmi \
lambda/lambda.cmi \
typing/jkind.cmi \
lambda/debuginfo.cmi
lambda/transl_comprehension_utils.cmo : \
typing/primitive.cmi \
Expand All @@ -4034,6 +4073,7 @@ lambda/transl_list_comprehension.cmo : \
lambda/transl_comprehension_utils.cmi \
lambda/matching.cmi \
lambda/lambda.cmi \
typing/jkind.cmi \
typing/ident.cmi \
parsing/asttypes.cmi \
lambda/transl_list_comprehension.cmi
Expand All @@ -4043,12 +4083,14 @@ lambda/transl_list_comprehension.cmx : \
lambda/transl_comprehension_utils.cmx \
lambda/matching.cmx \
lambda/lambda.cmx \
typing/jkind.cmx \
typing/ident.cmx \
parsing/asttypes.cmi \
lambda/transl_list_comprehension.cmi
lambda/transl_list_comprehension.cmi : \
typing/typedtree.cmi \
lambda/lambda.cmi \
typing/jkind.cmi \
lambda/debuginfo.cmi
lambda/translattribute.cmo : \
utils/warnings.cmi \
Expand Down Expand Up @@ -4091,6 +4133,7 @@ lambda/translclass.cmo : \
lambda/matching.cmi \
parsing/location.cmi \
lambda/lambda.cmi \
typing/jkind.cmi \
typing/ident.cmi \
typing/env.cmi \
lambda/debuginfo.cmi \
Expand All @@ -4108,6 +4151,7 @@ lambda/translclass.cmx : \
lambda/matching.cmx \
parsing/location.cmx \
lambda/lambda.cmx \
typing/jkind.cmx \
typing/ident.cmx \
typing/env.cmx \
lambda/debuginfo.cmx \
Expand Down Expand Up @@ -4200,6 +4244,7 @@ lambda/translcore.cmi : \
parsing/longident.cmi \
parsing/location.cmi \
lambda/lambda.cmi \
typing/jkind.cmi \
typing/ident.cmi \
typing/env.cmi \
lambda/debuginfo.cmi \
Expand Down Expand Up @@ -4318,6 +4363,7 @@ lambda/translprim.cmo : \
lambda/matching.cmi \
parsing/location.cmi \
lambda/lambda.cmi \
typing/jkind.cmi \
typing/ident.cmi \
typing/env.cmi \
lambda/debuginfo.cmi \
Expand All @@ -4339,6 +4385,7 @@ lambda/translprim.cmx : \
lambda/matching.cmx \
parsing/location.cmx \
lambda/lambda.cmx \
typing/jkind.cmx \
typing/ident.cmx \
typing/env.cmx \
lambda/debuginfo.cmx \
Expand Down Expand Up @@ -6924,6 +6971,7 @@ toplevel/topcommon.cmi : \
typing/outcometree.cmi \
parsing/longident.cmi \
parsing/location.cmi \
typing/jkind.cmi \
typing/ident.cmi \
toplevel/genprintval.cmi \
typing/env.cmi \
Expand Down
4 changes: 2 additions & 2 deletions ocaml/asmcomp/cmmgen.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,13 +340,13 @@ let join_unboxed_number_kind ~strict k1 k2 =
(* [exttype_of_sort] and [machtype_of_sort] should be kept in sync with
[Typeopt.layout_of_const_sort]. *)
(* CR layouts v5: Void case should probably be typ_void *)
let exttype_of_sort (s : Layouts.Sort.const) =
let exttype_of_sort (s : Jkind.Sort.const) =
match s with
| Value -> XInt
| Float64 -> XFloat
| Void -> Misc.fatal_error "Cmmgen.exttype_of_sort: void encountered"

let machtype_of_sort (s : Layouts.Sort.const) =
let machtype_of_sort (s : Jkind.Sort.const) =
match s with
| Value -> typ_val
| Float64 -> typ_float
Expand Down
Binary file modified ocaml/boot/ocamlc
View file
Binary file not shown.
Binary file modified ocaml/boot/ocamllex
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions ocaml/middle_end/convert_primitives.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ let convert (prim : Lambda.primitive) : Clambda_primitives.primitive =
~effects:Only_generative_effects
~coeffects:Has_coeffects
~native_name:"caml_obj_dup"
~native_repr_args:[P.Prim_global, P.Same_as_ocaml_repr Layouts.Sort.Value]
~native_repr_res:(P.Prim_global, P.Same_as_ocaml_repr Layouts.Sort.Value))
~native_repr_args:[P.Prim_global, P.Same_as_ocaml_repr Jkind.Sort.Value]
~native_repr_res:(P.Prim_global, P.Same_as_ocaml_repr Jkind.Sort.Value))
| Punbox_float -> Punbox_float
| Pbox_float m -> Pbox_float m
| Punbox_int bi -> Punbox_int bi
Expand Down

0 comments on commit 2329ca2

Please sign in to comment.