language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 22:09:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

take the maximum of all tags when calculating layout

Browse source
This commit is contained in:
Folkert 2020-03-17 00:28:24 +01:00
parent 444e3063e0
commit ab332a37c3
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/mono/src/layout.rs
View file

@ -96,15 +96,20 @@ impl<'a> Layout<'a> {
Union(fields) => {
// the tag gets converted to a u8, so 1 byte.
// But for one-tag unions, we don't store the tag, so 0 bytes
let mut sum = (fields.len() > 1) as u32;
let discriminant_size: u32 = (fields.len() > 1) as u32;
for tag_layout in fields.values() {
for field_layout in *tag_layout {
sum += field_layout.stack_size(pointer_size);
}
}
let max_tag_size: u32 = fields
.values()
.map(|tag_layout| {
tag_layout
.iter()
.map(|field| field.stack_size(pointer_size))
.sum()
})
.max()
.unwrap_or_default();
sum
discriminant_size + max_tag_size
}
Pointer(_) | FunctionPointer(_, _) => pointer_size,
}