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

Be sure to preserve layout wrappers during reification

Browse source
This commit is contained in:
Ayaz Hafiz 2023-05-11 13:11:13 -05:00
parent 9a8d138424
commit 57bd0d29d6
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/compiler/mono/src/layout/intern.rs
View file

@ -1057,7 +1057,7 @@ mod reify {
use bumpalo::{collections::Vec, Bump};
use roc_module::symbol::Symbol;
use crate::layout::{Builtin, LambdaSet, Layout, LayoutRepr, UnionLayout};
use crate::layout::{Builtin, LambdaSet, Layout, LayoutRepr, LayoutWrapper, UnionLayout};
use super::{InLayout, LayoutInterner, NeedsRecursionPointerFixup};
@ -1068,8 +1068,24 @@ mod reify {
slot: InLayout<'a>,
normalized_layout: Layout<'a>,
) -> Layout<'a> {
// TODO: what if the layout repr is a newtype - should we preserve all the links?
let repr = match normalized_layout.repr(interner) {
let Layout { repr, semantic } = normalized_layout;
let reified_repr = match repr {
LayoutWrapper::Direct(repr) => {
reify_recursive_layout_repr(arena, interner, slot, repr).direct()
}
LayoutWrapper::Newtype(inner) => reify_layout(arena, interner, slot, inner).newtype(),
};
Layout::new(reified_repr, semantic)
}
fn reify_recursive_layout_repr<'a>(
arena: &'a Bump,
interner: &mut impl LayoutInterner<'a>,
slot: InLayout<'a>,
repr: LayoutRepr<'a>,
) -> LayoutRepr<'a> {
match repr {
LayoutRepr::Builtin(builtin) => {
LayoutRepr::Builtin(reify_builtin(arena, interner, slot, builtin))
}
@ -1086,10 +1102,6 @@ mod reify {
// another recursive union's layout, do not change it.
LayoutRepr::RecursivePointer(if l == Layout::VOID { slot } else { l })
}
};
Layout {
repr: repr.direct(),
semantic: normalized_layout.semantic,
}
}