Skip to content
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

Fix Flambda 2 typing for immutable arrays #1457

Merged
merged 4 commits into from
Jun 7, 2023
Merged

Fix Flambda 2 typing for immutable arrays #1457

Changes from 1 commit
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
Next Next commit
Fix join for immutable arrays
  • Loading branch information
@mshinwell
mshinwell committed Jun 7, 2023
commit 863864663b7b3d326e34506e590f99796d9b848e
17 changes: 12 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 @@ -1186,17 +1186,20 @@ 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
TG.Head_of_kind_value.create_array_with_contents ~element_kind ~length contents alloc_mode
| ( ( Variant _ | Mutable_block _ | Boxed_float _ | Boxed_int32 _
| Boxed_int64 _ | Boxed_nativeint _ | Closures _ | String _ | Array _ ),
_ ) ->
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 +1214,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