language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-01 07:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Handle field layouts for more than just structs

Browse source
This commit is contained in:
Richard Feldman 2022-11-16 11:22:00 -05:00
parent b44f76f500
commit 70c949c50b
No known key found for this signature in database
GPG key ID: F1F21AA5B1D9E43B
1 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10778,7 +10778,18 @@ pub fn generate_glue_procs<'a, I: Interner<'a, Layout<'a>>>(
let mut answer = Vec::new_in(arena);
let mut stack = Vec::from_iter_in([layout], arena);
stack.push(layout);
macro_rules! handle_field_layouts {
($field_layouts: expr) => {{
if $field_layouts.iter().any(|l| l.contains_function(arena)) {
let procs =
generate_glue_procs_for_fields(home, ident_ids, arena, layout, $field_layouts);
answer.push((layout, procs));
}
stack.extend($field_layouts);
}};
}
while let Some(layout) = stack.pop() {
match layout {
@ -10791,19 +10802,7 @@ pub fn generate_glue_procs<'a, I: Interner<'a, Layout<'a>>>(
Builtin::List(element) => stack.push(*element),
},
Layout::Struct { field_layouts, .. } => {
if layout.contains_function(arena) {
let procs = generate_glue_procs_for_fields(
home,
ident_ids,
arena,
layout,
field_layouts,
);
answer.push((layout, procs));
stack.extend(field_layouts);
}
handle_field_layouts!(field_layouts);
}
Layout::Boxed(boxed) => stack.push(*boxed),
Layout::Union(tag_union) => match tag_union {
@ -10812,12 +10811,12 @@ pub fn generate_glue_procs<'a, I: Interner<'a, Layout<'a>>>(
stack.extend(tag.iter());
}
}
UnionLayout::NonNullableUnwrapped(fields) => {
stack.extend(fields);
UnionLayout::NonNullableUnwrapped(field_layouts) => {
handle_field_layouts!(field_layouts);
}
UnionLayout::NullableWrapped { other_tags, .. } => {
for tag in other_tags {
stack.extend(tag.iter());
for field_layouts in other_tags {
handle_field_layouts!(*field_layouts);
}
}
UnionLayout::NullableUnwrapped { other_fields, .. } => {