language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-11-03 06:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Ensure that field layouts passed to closure unwrapping are sorted

Browse source
This commit is contained in:
Ayaz Hafiz 2022-08-13 08:58:07 -07:00
parent 9ffe6eb6dd
commit 7215acdbac
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/compiler/mono/src/ir.rs
View file

@ -3183,6 +3183,9 @@ fn specialize_external<'a>(
ClosureRepresentation::AlphabeticOrderStruct(field_layouts) => { ClosureRepresentation::AlphabeticOrderStruct(field_layouts) => {
// captured variables are in symbol-alphabetic order, but now we want // captured variables are in symbol-alphabetic order, but now we want
// them ordered by their alignment requirements // them ordered by their alignment requirements
//
// TODO: sort only the fields and apply the found permutation to the symbols
// TODO: can we move this ordering to `layout_for_member`?
let mut combined = Vec::from_iter_in( let mut combined = Vec::from_iter_in(
captured.iter().map(|(x, _)| x).zip(field_layouts.iter()), captured.iter().map(|(x, _)| x).zip(field_layouts.iter()),
env.arena, env.arena,
@ -3197,19 +3200,25 @@ fn specialize_external<'a>(
size2.cmp(&size1) size2.cmp(&size1)
}); });
let ordered_field_layouts = Vec::from_iter_in(
combined.iter().map(|(_, layout)| **layout),
env.arena,
);
let ordered_field_layouts = ordered_field_layouts.into_bump_slice();
debug_assert_eq!( debug_assert_eq!(
captured.len(), captured.len(),
field_layouts.len(), ordered_field_layouts.len(),
"{:?} captures {:?} but has layout {:?}", "{:?} captures {:?} but has layout {:?}",
lambda_name, lambda_name,
&captured, &captured,
&field_layouts &ordered_field_layouts
); );
for (index, (symbol, layout)) in combined.iter().enumerate() { for (index, (symbol, layout)) in combined.iter().enumerate() {
let expr = Expr::StructAtIndex { let expr = Expr::StructAtIndex {
index: index as _, index: index as _,
field_layouts, field_layouts: ordered_field_layouts,
structure: Symbol::ARG_CLOSURE, structure: Symbol::ARG_CLOSURE,
}; };
@ -3222,14 +3231,6 @@ fn specialize_external<'a>(
env.arena.alloc(specialized_body), env.arena.alloc(specialized_body),
); );
} }
// let symbol = captured[0].0;
//
// substitute_in_exprs(
// env.arena,
// &mut specialized_body,
// symbol,
// Symbol::ARG_CLOSURE,
// );
} }
ClosureRepresentation::Other(layout) => match layout { ClosureRepresentation::Other(layout) => match layout {