Skip to content

Merge 5.2.0minus-7 #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liam923 merged 3 commits into from
Feb 26, 2025
Merged

Merge 5.2.0minus-7 #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c3f625
Import ocaml sources for ocaml-flambda/flambda-backend@9af08951c69
liam923 Feb 26, 2025
3c19962
Merge changes
liam923 Feb 26, 2025
fc05122
Bump magic numbers
liam923 Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ocaml/typing/env.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2973,7 +2973,7 @@ let add_language_extension_types env =
|> add SIMD Stable Predef.add_simd_stable_extension_types
|> add Small_numbers Stable Predef.add_small_number_extension_types
|> add Small_numbers Beta Predef.add_small_number_beta_extension_types
|> add Layouts Stable Predef.add_or_null)
|> add Layouts Beta Predef.add_or_null)

(* Some predefined types are part of language extensions, and we don't want to
make them available in the initial environment if those extensions are not
Expand Down
1 change: 1 addition & 0 deletions src/ocaml/typing/magic_numbers.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ module Cmi = struct
| "Caml1999I554" -> Some "5.2.0minus-4"
| "Caml1999I555" -> Some "5.2.0minus-5"
| "Caml1999I556" -> Some "5.2.0minus-6"
| "Caml1999I557" -> Some "5.2.0minus-7"
| _ -> None

let () = assert (to_version_opt Config.cmi_magic_number <> None)
Expand Down
12 changes: 6 additions & 6 deletions src/ocaml/utils/config.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
let version = Sys.ocaml_version

(* When bumping this number, be sure to also update ../typing/magic_numbers.ml *)
let cmi_magic_number = "Caml1999I556"
let cmi_magic_number = "Caml1999I557"

let ast_impl_magic_number = "Caml1999M556"
let ast_intf_magic_number = "Caml1999N556"
let cmt_magic_number = "Caml1999T556"
let cms_magic_number = "Caml1999S556"
let index_magic_number = "Merl2023I556"
let ast_impl_magic_number = "Caml1999M557"
let ast_intf_magic_number = "Caml1999N557"
let cmt_magic_number = "Caml1999T557"
let cms_magic_number = "Caml1999S557"
let index_magic_number = "Merl2023I557"

let interface_suffix = ref ".mli"

Expand Down
24 changes: 12 additions & 12 deletions tests/test-dirs/version.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
$ $MERLIN single version | revert-newlines | jq .value.magicNumbers
{
"cmi_magic_number": "Caml1999I556",
"ast_intf_magic_number": "Caml1999N556",
"ast_impl_magic_number": "Caml1999M556",
"cmt_magic_number": "Caml1999T556",
"cms_magic_number": "Caml1999S556",
"index_magic_number": "Merl2023I556"
"cmi_magic_number": "Caml1999I557",
"ast_intf_magic_number": "Caml1999N557",
"ast_impl_magic_number": "Caml1999M557",
"cmt_magic_number": "Caml1999T557",
"cms_magic_number": "Caml1999S557",
"index_magic_number": "Merl2023I557"
}

$ ocaml-index magic-numbers | jq
{
"cmi_magic_number": "Caml1999I556",
"ast_intf_magic_number": "Caml1999N556",
"ast_impl_magic_number": "Caml1999M556",
"cmt_magic_number": "Caml1999T556",
"cms_magic_number": "Caml1999S556",
"index_magic_number": "Merl2023I556"
"cmi_magic_number": "Caml1999I557",
"ast_intf_magic_number": "Caml1999N557",
"ast_impl_magic_number": "Caml1999M557",
"cmt_magic_number": "Caml1999T557",
"cms_magic_number": "Caml1999S557",
"index_magic_number": "Merl2023I557"
}

Verify there is no difference between Merlin and Ocaml-index
Expand Down
2 changes: 1 addition & 1 deletion upstream/ocaml_flambda/base-rev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
db3778f932fc0a2f9d71ba5f9dcf7c76fcc74a63
9af08951c69b6ab8be73ee9c53b8b29a1a6e5c66
2 changes: 1 addition & 1 deletion upstream/ocaml_flambda/typing/env.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2834,7 +2834,7 @@ let add_language_extension_types env =
|> add SIMD Stable Predef.add_simd_stable_extension_types
|> add Small_numbers Stable Predef.add_small_number_extension_types
|> add Small_numbers Beta Predef.add_small_number_beta_extension_types
|> add Layouts Stable Predef.add_or_null)
|> add Layouts Beta Predef.add_or_null)

(* Some predefined types are part of language extensions, and we don't want to
make them available in the initial environment if those extensions are not
Expand Down