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

Don't intern recursive unions with pointer-fixing if they've been resolved

Browse source
This commit is contained in:
Ayaz Hafiz 2023-03-28 14:49:39 -05:00
parent 18858b9eb3
commit 92657b6f4c
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/compiler/mono/src/layout.rs
View file

@ -4188,6 +4188,7 @@ where
// The naked pointer will get fixed-up to loopback to the union below when we
// intern the union.
tag_layout.push(Layout::NAKED_RECURSIVE_PTR);
criteria.and(NAKED_RECURSION_PTR);
continue;
}
@ -4228,12 +4229,17 @@ where
} else {
UnionLayout::Recursive(tag_layouts.into_bump_slice())
};
criteria.pass_through_recursive_union(rec_var);
let union_layout = env
.cache
.interner
.insert_recursive(env.arena, Layout::Union(union_layout));
let union_layout = if criteria.has_naked_recursion_pointer {
env.cache
.interner
.insert_recursive(env.arena, Layout::Union(union_layout))
} else {
// There are no naked recursion pointers, so we can insert the layout as-is.
env.cache.interner.insert(Layout::Union(union_layout))
};
criteria.pass_through_recursive_union(rec_var);
Cacheable(Ok(union_layout), criteria)
}