language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 14:54:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

prevent unrolling of recursive types

Browse source
This commit is contained in:
Folkert 2021-07-16 17:54:44 +02:00
parent 2bc3ddae46
commit 71672bb7ad
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4201,8 +4201,18 @@ fn convert_tag_union<'a>(
layouts.push(arg_layouts); layouts.push(arg_layouts);
} }
// we must derive the union layout from the whole_var, building it up
// from `layouts` would unroll recursive tag unions, and that leads to
// problems down the line because we hash layouts and an unrolled
// version is not the same as the minimal version.
debug_assert!(layouts.len() > 1); debug_assert!(layouts.len() > 1);
let union_layout = UnionLayout::Recursive(layouts.into_bump_slice()); let union_layout = match return_on_layout_error!(
env,
layout_cache.from_var(env.arena, variant_var, env.subs)
) {
Layout::Union(ul) => ul,
_ => unreachable!(),
};
let tag = Expr::Tag { let tag = Expr::Tag {
tag_layout: union_layout, tag_layout: union_layout,
@ -7095,6 +7105,7 @@ fn from_can_pattern_help<'a>(
temp temp
}; };
debug_assert!(layouts.len() > 1);
let layout = UnionLayout::NonRecursive(layouts.into_bump_slice()); let layout = UnionLayout::NonRecursive(layouts.into_bump_slice());
Pattern::AppliedTag { Pattern::AppliedTag {
@ -7152,8 +7163,16 @@ fn from_can_pattern_help<'a>(
temp temp
}; };
// we must derive the union layout from the whole_var, building it up
// from `layouts` would unroll recursive tag unions, and that leads to
// problems down the line because we hash layouts and an unrolled
// version is not the same as the minimal version.
debug_assert!(layouts.len() > 1); debug_assert!(layouts.len() > 1);
let layout = UnionLayout::Recursive(layouts.into_bump_slice()); let layout =
match layout_cache.from_var(env.arena, *whole_var, env.subs) {
Ok(Layout::Union(ul)) => ul,
_ => unreachable!(),
};
Pattern::AppliedTag { Pattern::AppliedTag {
tag_name: tag_name.clone(), tag_name: tag_name.clone(),