Skip to content

Merge 5.2.0-minus11 #146

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 15 commits into from
Jun 18, 2025
Merged

Merge 5.2.0-minus11 #146

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7590887
Import ocaml sources for ocaml-flambda/flambda-backend@60158e06115
goldfirere Jun 9, 2025
dd2a500
Merge changes
goldfirere Jun 10, 2025
e174f16
Move Unit_info from parsing to typing
goldfirere Jun 10, 2025
019117e
Now merlin needs Numbers (dependency from Jkind)
goldfirere Jun 10, 2025
669c924
Fix easy errors
goldfirere Jun 10, 2025
2e48759
Harder fixes. Please review.
goldfirere Jun 10, 2025
5f4e47b
More edits that require review
goldfirere Jun 10, 2025
b8a8b5b
Fix default pattern recovery
liam923 Jun 11, 2025
028a45b
Bump magic numbers
liam923 Jun 11, 2025
0a61a4c
Format files
liam923 Jun 11, 2025
6341c53
Promote some tests
liam923 Jun 11, 2025
cd4428d
Fix test to use new mode syntax
liam923 Jun 11, 2025
1ccc448
Promote failing parameters test
liam923 Jun 11, 2025
188a9ae
Add new ignored flags
liam923 Jun 11, 2025
4123c5a
Improve construction of unit_info
liam923 Jun 13, 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/analysis/ptyp_of_type.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ and core_type type_expr =
in
let snap = Btype.snapshot () in
let arg_modes =
Typemode.untransl_mode_annots ~loc:Location.none
Typemode.untransl_mode_annots
@@ Mode.Alloc.(Const.diff (zap_to_legacy arg_alloc_mode) Const.legacy)
in
let ret_modes =
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/stack_or_heap_enclosing.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ let from_nodes ~lsp_compat ~pos ~path =
| None, Record_unboxed -> ret_no_alloc "unboxed record"
| None, (Record_boxed _ | Record_float | Record_ufloat | Record_mixed _)
-> ret Unexpected_no_alloc)
| Texp_field (_, _, _, boxed_or_unboxed, _) -> (
| Texp_field (_, _, _, _, boxed_or_unboxed, _) -> (
match boxed_or_unboxed with
| Boxing (alloc_mode, _) -> ret_alloc alloc_mode.mode
| Non_boxing _ -> None)
Expand Down
2 changes: 1 addition & 1 deletion src/ocaml/preprocess/parser_explain.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ let nullable (type a) : a MenhirInterpreter.nonterminal -> bool =
| N_private_virtual_flags -> true
| N_private_flag -> true
| N_payload -> true
| N_optional_poly_type_and_modes -> true
| N_optional_atomic_constraint_ -> true
| N_optional_atat_modalities_expr -> true
| N_optional_at_modalities_expr -> true
| N_option_type_constraint_ -> true
| N_option_preceded_EQUAL_seq_expr__ -> true
| N_option_preceded_EQUAL_pattern__ -> true
Expand Down
32 changes: 16 additions & 16 deletions src/ocaml/preprocess/parser_printer.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ let print_symbol = function
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_str_exception_declaration) -> "str_exception_declaration"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_single_attr_id) -> "single_attr_id"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_simple_pattern_not_ident) -> "simple_pattern_not_ident"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_simple_pattern_extend_modes_or_poly) -> "simple_pattern_extend_modes_or_poly"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_simple_pattern) -> "simple_pattern"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_simple_expr) -> "simple_expr"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_simple_delimited_pattern) -> "simple_delimited_pattern"
Expand Down Expand Up @@ -247,6 +248,7 @@ let print_symbol = function
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_possibly_poly_core_type_no_attr_) -> "possibly_poly_core_type_no_attr_"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_possibly_poly_core_type_) -> "possibly_poly_core_type_"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_payload) -> "payload"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_pattern_with_modes_or_poly) -> "pattern_with_modes_or_poly"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_pattern_var) -> "pattern_var"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_pattern_no_exn) -> "pattern_no_exn"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_pattern_gen) -> "pattern_gen"
Expand All @@ -265,9 +267,9 @@ let print_symbol = function
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_parenthesized_type_parameter) -> "parenthesized_type_parameter"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_paren_module_expr) -> "paren_module_expr"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_optlabel) -> "optlabel"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_optional_poly_type_and_modes) -> "optional_poly_type_and_modes"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_optional_atomic_constraint_) -> "optional_atomic_constraint_"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_optional_atat_modalities_expr) -> "optional_atat_modalities_expr"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_optional_at_modalities_expr) -> "optional_at_modalities_expr"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_option_type_constraint_) -> "option_type_constraint_"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_option_preceded_EQUAL_seq_expr__) -> "option_preceded_EQUAL_seq_expr__"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_option_preceded_EQUAL_pattern__) -> "option_preceded_EQUAL_pattern__"
Expand Down Expand Up @@ -300,14 +302,15 @@ let print_symbol = function
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_mty_longident) -> "mty_longident"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_type_subst) -> "module_type_subst"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_type_declaration) -> "module_type_declaration"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_type_atomic) -> "module_type_atomic"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_type) -> "module_type"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_subst) -> "module_subst"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_name_modal_atat_modalities_expr_) -> "module_name_modal_atat_modalities_expr_"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_name_modal_at_mode_expr_) -> "module_name_modal_at_mode_expr_"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_name_modal_at_modalities_expr_) -> "module_name_modal_at_modalities_expr_"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_name) -> "module_name"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_expr) -> "module_expr"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_declaration_body_optional_atat_mode_expr_) -> "module_declaration_body_optional_atat_mode_expr_"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_declaration_body_optional_atat_modalities_expr_) -> "module_declaration_body_optional_atat_modalities_expr_"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_declaration_body_module_type_with_optional_modes_) -> "module_declaration_body_module_type_with_optional_modes_"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_declaration_body___anonymous_8_) -> "module_declaration_body___anonymous_8_"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_module_binding_body) -> "module_binding_body"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_mod_longident) -> "mod_longident"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_mod_ext_longident) -> "mod_ext_longident"
Expand Down Expand Up @@ -341,8 +344,6 @@ let print_symbol = function
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_list_and_class_declaration_) -> "list_and_class_declaration_"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_letop_bindings) -> "letop_bindings"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_letop_binding_body) -> "letop_binding_body"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_let_pattern_required_modes) -> "let_pattern_required_modes"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_let_pattern_no_modes) -> "let_pattern_no_modes"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_let_pattern) -> "let_pattern"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_let_bindings_no_ext_) -> "let_bindings_no_ext_"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_let_bindings_ext_) -> "let_bindings_ext_"
Expand Down Expand Up @@ -419,9 +420,8 @@ let print_symbol = function
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_attr_payload) -> "attr_payload"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_attr_id) -> "attr_id"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_atomic_type) -> "atomic_type"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_atat_mode_expr) -> "atat_mode_expr"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_atat_modalities_expr) -> "atat_modalities_expr"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_at_mode_expr) -> "at_mode_expr"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_at_modalities_expr) -> "at_modalities_expr"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_any_longident) -> "any_longident"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_and_let_binding) -> "and_let_binding"
| MenhirInterpreter.X (MenhirInterpreter.N MenhirInterpreter.N_alias_type) -> "alias_type"
Expand Down Expand Up @@ -609,6 +609,7 @@ let print_value (type a) : a MenhirInterpreter.symbol -> a -> string = function
| MenhirInterpreter.N MenhirInterpreter.N_str_exception_declaration -> (fun _ -> "str_exception_declaration")
| MenhirInterpreter.N MenhirInterpreter.N_single_attr_id -> (fun _ -> "single_attr_id")
| MenhirInterpreter.N MenhirInterpreter.N_simple_pattern_not_ident -> (fun _ -> "simple_pattern_not_ident")
| MenhirInterpreter.N MenhirInterpreter.N_simple_pattern_extend_modes_or_poly -> (fun _ -> "simple_pattern_extend_modes_or_poly")
| MenhirInterpreter.N MenhirInterpreter.N_simple_pattern -> (fun _ -> "simple_pattern")
| MenhirInterpreter.N MenhirInterpreter.N_simple_expr -> (fun _ -> "simple_expr")
| MenhirInterpreter.N MenhirInterpreter.N_simple_delimited_pattern -> (fun _ -> "simple_delimited_pattern")
Expand Down Expand Up @@ -657,6 +658,7 @@ let print_value (type a) : a MenhirInterpreter.symbol -> a -> string = function
| MenhirInterpreter.N MenhirInterpreter.N_possibly_poly_core_type_no_attr_ -> (fun _ -> "possibly_poly_core_type_no_attr_")
| MenhirInterpreter.N MenhirInterpreter.N_possibly_poly_core_type_ -> (fun _ -> "possibly_poly_core_type_")
| MenhirInterpreter.N MenhirInterpreter.N_payload -> (fun _ -> "payload")
| MenhirInterpreter.N MenhirInterpreter.N_pattern_with_modes_or_poly -> (fun _ -> "pattern_with_modes_or_poly")
| MenhirInterpreter.N MenhirInterpreter.N_pattern_var -> (fun _ -> "pattern_var")
| MenhirInterpreter.N MenhirInterpreter.N_pattern_no_exn -> (fun _ -> "pattern_no_exn")
| MenhirInterpreter.N MenhirInterpreter.N_pattern_gen -> (fun _ -> "pattern_gen")
Expand All @@ -675,9 +677,9 @@ let print_value (type a) : a MenhirInterpreter.symbol -> a -> string = function
| MenhirInterpreter.N MenhirInterpreter.N_parenthesized_type_parameter -> (fun _ -> "parenthesized_type_parameter")
| MenhirInterpreter.N MenhirInterpreter.N_paren_module_expr -> (fun _ -> "paren_module_expr")
| MenhirInterpreter.N MenhirInterpreter.N_optlabel -> (fun _ -> "optlabel")
| MenhirInterpreter.N MenhirInterpreter.N_optional_poly_type_and_modes -> (fun _ -> "optional_poly_type_and_modes")
| MenhirInterpreter.N MenhirInterpreter.N_optional_atomic_constraint_ -> (fun _ -> "optional_atomic_constraint_")
| MenhirInterpreter.N MenhirInterpreter.N_optional_atat_modalities_expr -> (fun _ -> "optional_atat_modalities_expr")
| MenhirInterpreter.N MenhirInterpreter.N_optional_at_modalities_expr -> (fun _ -> "optional_at_modalities_expr")
| MenhirInterpreter.N MenhirInterpreter.N_option_type_constraint_ -> (fun _ -> "option_type_constraint_")
| MenhirInterpreter.N MenhirInterpreter.N_option_preceded_EQUAL_seq_expr__ -> (fun _ -> "option_preceded_EQUAL_seq_expr__")
| MenhirInterpreter.N MenhirInterpreter.N_option_preceded_EQUAL_pattern__ -> (fun _ -> "option_preceded_EQUAL_pattern__")
Expand Down Expand Up @@ -710,14 +712,15 @@ let print_value (type a) : a MenhirInterpreter.symbol -> a -> string = function
| MenhirInterpreter.N MenhirInterpreter.N_mty_longident -> (fun _ -> "mty_longident")
| MenhirInterpreter.N MenhirInterpreter.N_module_type_subst -> (fun _ -> "module_type_subst")
| MenhirInterpreter.N MenhirInterpreter.N_module_type_declaration -> (fun _ -> "module_type_declaration")
| MenhirInterpreter.N MenhirInterpreter.N_module_type_atomic -> (fun _ -> "module_type_atomic")
| MenhirInterpreter.N MenhirInterpreter.N_module_type -> (fun _ -> "module_type")
| MenhirInterpreter.N MenhirInterpreter.N_module_subst -> (fun _ -> "module_subst")
| MenhirInterpreter.N MenhirInterpreter.N_module_name_modal_atat_modalities_expr_ -> (fun _ -> "module_name_modal_atat_modalities_expr_")
| MenhirInterpreter.N MenhirInterpreter.N_module_name_modal_at_mode_expr_ -> (fun _ -> "module_name_modal_at_mode_expr_")
| MenhirInterpreter.N MenhirInterpreter.N_module_name_modal_at_modalities_expr_ -> (fun _ -> "module_name_modal_at_modalities_expr_")
| MenhirInterpreter.N MenhirInterpreter.N_module_name -> (fun _ -> "module_name")
| MenhirInterpreter.N MenhirInterpreter.N_module_expr -> (fun _ -> "module_expr")
| MenhirInterpreter.N MenhirInterpreter.N_module_declaration_body_optional_atat_mode_expr_ -> (fun _ -> "module_declaration_body_optional_atat_mode_expr_")
| MenhirInterpreter.N MenhirInterpreter.N_module_declaration_body_optional_atat_modalities_expr_ -> (fun _ -> "module_declaration_body_optional_atat_modalities_expr_")
| MenhirInterpreter.N MenhirInterpreter.N_module_declaration_body_module_type_with_optional_modes_ -> (fun _ -> "module_declaration_body_module_type_with_optional_modes_")
| MenhirInterpreter.N MenhirInterpreter.N_module_declaration_body___anonymous_8_ -> (fun _ -> "module_declaration_body___anonymous_8_")
| MenhirInterpreter.N MenhirInterpreter.N_module_binding_body -> (fun _ -> "module_binding_body")
| MenhirInterpreter.N MenhirInterpreter.N_mod_longident -> (fun _ -> "mod_longident")
| MenhirInterpreter.N MenhirInterpreter.N_mod_ext_longident -> (fun _ -> "mod_ext_longident")
Expand Down Expand Up @@ -751,8 +754,6 @@ let print_value (type a) : a MenhirInterpreter.symbol -> a -> string = function
| MenhirInterpreter.N MenhirInterpreter.N_list_and_class_declaration_ -> (fun _ -> "list_and_class_declaration_")
| MenhirInterpreter.N MenhirInterpreter.N_letop_bindings -> (fun _ -> "letop_bindings")
| MenhirInterpreter.N MenhirInterpreter.N_letop_binding_body -> (fun _ -> "letop_binding_body")
| MenhirInterpreter.N MenhirInterpreter.N_let_pattern_required_modes -> (fun _ -> "let_pattern_required_modes")
| MenhirInterpreter.N MenhirInterpreter.N_let_pattern_no_modes -> (fun _ -> "let_pattern_no_modes")
| MenhirInterpreter.N MenhirInterpreter.N_let_pattern -> (fun _ -> "let_pattern")
| MenhirInterpreter.N MenhirInterpreter.N_let_bindings_no_ext_ -> (fun _ -> "let_bindings_no_ext_")
| MenhirInterpreter.N MenhirInterpreter.N_let_bindings_ext_ -> (fun _ -> "let_bindings_ext_")
Expand Down Expand Up @@ -829,9 +830,8 @@ let print_value (type a) : a MenhirInterpreter.symbol -> a -> string = function
| MenhirInterpreter.N MenhirInterpreter.N_attr_payload -> (fun _ -> "attr_payload")
| MenhirInterpreter.N MenhirInterpreter.N_attr_id -> (fun _ -> "attr_id")
| MenhirInterpreter.N MenhirInterpreter.N_atomic_type -> (fun _ -> "atomic_type")
| MenhirInterpreter.N MenhirInterpreter.N_atat_mode_expr -> (fun _ -> "atat_mode_expr")
| MenhirInterpreter.N MenhirInterpreter.N_atat_modalities_expr -> (fun _ -> "atat_modalities_expr")
| MenhirInterpreter.N MenhirInterpreter.N_at_mode_expr -> (fun _ -> "at_mode_expr")
| MenhirInterpreter.N MenhirInterpreter.N_at_modalities_expr -> (fun _ -> "at_modalities_expr")
| MenhirInterpreter.N MenhirInterpreter.N_any_longident -> (fun _ -> "any_longident")
| MenhirInterpreter.N MenhirInterpreter.N_and_let_binding -> (fun _ -> "and_let_binding")
| MenhirInterpreter.N MenhirInterpreter.N_alias_type -> (fun _ -> "alias_type")
Expand Down
Loading