Skip to content

Fix Flambda 2 typing for immutable arrays #1457

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
merged 4 commits into from
Jun 7, 2023
Merged

Fix Flambda 2 typing for immutable arrays #1457

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8638646
Fix join for immutable arrays
mshinwell Jun 7, 2023
1603fe8
meet
mshinwell Jun 7, 2023
931ab91
Meet
lthls Jun 7, 2023
f567c13
Typos
lthls Jun 7, 2023
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
33 changes: 28 additions & 5 deletions middle_end/flambda2/types/meet_and_join.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ and meet_head_of_kind_value env (head1 : TG.head_of_kind_value)
let element_kind = meet_array_element_kinds element_kind1 element_kind2 in
let<* contents, env_extension =
meet_array_contents env array_contents1 array_contents2
~meet_element_kind:element_kind
in
let<* length, env_extension' = meet env length1 length2 in
(* CR-someday vlaviron: If the element kind is Bottom, we could meet the
Expand All @@ -410,7 +411,8 @@ and meet_head_of_kind_value env (head1 : TG.head_of_kind_value)
Bottom

and meet_array_contents env (array_contents1 : TG.array_contents Or_unknown.t)
(array_contents2 : TG.array_contents Or_unknown.t) =
(array_contents2 : TG.array_contents Or_unknown.t)
~(meet_element_kind : _ Or_unknown_or_bottom.t) =
meet_unknown
(fun env (array_contents1 : TG.array_contents)
(array_contents2 : TG.array_contents) :
Expand All @@ -429,7 +431,20 @@ and meet_array_contents env (array_contents1 : TG.array_contents Or_unknown.t)
let<* fields_rev, env_extension' =
fields_rev_and_env_extension
in
let<* field, env_extension = meet env field1 field2 in
let<* field, env_extension =
match meet_element_kind with
| Bottom -> Bottom
| Unknown ->
(* vlaviron: If the meet of the kinds is Unknown, then both
inputs had Unknown kinds. I don't see how we could end up
with an array type where the contents are known but we
don't know the kind, but in that case we wouldn't be able
to call meet because the two sides may have different
kinds. So we'll just return the first input, which is
guaranteed to be a correct approximation of the meet. *)
Ok (field1, TEE.empty)
| Ok _ -> meet env field1 field2
in
let<+ env_extension =
meet_env_extension env env_extension env_extension'
in
Expand Down Expand Up @@ -1186,7 +1201,10 @@ and join_head_of_kind_value env (head1 : TG.head_of_kind_value)
} ) ->
let alloc_mode = join_alloc_mode alloc_mode1 alloc_mode2 in
let element_kind = join_array_element_kinds element_kind1 element_kind2 in
let contents = join_array_contents env array_contents1 array_contents2 in
let contents =
join_array_contents env array_contents1 array_contents2
~joined_element_kind:element_kind
in
let>+ length = join env length1 length2 in
TG.Head_of_kind_value.create_array_with_contents ~element_kind ~length
contents alloc_mode
Expand All @@ -1196,7 +1214,8 @@ and join_head_of_kind_value env (head1 : TG.head_of_kind_value)
Unknown

and join_array_contents env (array_contents1 : TG.array_contents Or_unknown.t)
(array_contents2 : TG.array_contents Or_unknown.t) =
(array_contents2 : TG.array_contents Or_unknown.t)
~(joined_element_kind : _ Or_unknown_or_bottom.t) =
join_unknown
(fun env (array_contents1 : TG.array_contents)
(array_contents2 : TG.array_contents) : TG.array_contents Or_unknown.t ->
Expand All @@ -1211,7 +1230,11 @@ and join_array_contents env (array_contents1 : TG.array_contents Or_unknown.t)
List.fold_left2
(fun (fields_rev : _ Or_unknown.t) field1 field2 : _ Or_unknown.t ->
let>* fields_rev = fields_rev in
let>+ field = join env field1 field2 in
let>+ field =
match joined_element_kind with
| Bottom | Unknown -> Or_unknown.Unknown
| Ok _ -> join env field1 field2
in
field :: fields_rev)
(Or_unknown.Known []) fields1 fields2
in
Expand Down