language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 08:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

use a NonNullableUnwrapped union for Box

Browse source
This commit is contained in:
Folkert 2023-07-05 17:53:03 +02:00
parent b7e7059b36
commit a9813aeae7
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
2 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2118,6 +2118,24 @@ impl<'a> Expr<'a> {
arguments: std::slice::from_ref(symbol),
})
}
pub(crate) fn expr_box(symbol: &'a Symbol, element_layout: &'a InLayout<'a>) -> Expr<'a> {
Expr::Tag {
tag_layout: UnionLayout::NonNullableUnwrapped(std::slice::from_ref(element_layout)),
tag_id: 0,
arguments: std::slice::from_ref(symbol),
reuse: None,
}
}
pub(crate) fn expr_unbox(symbol: Symbol, element_layout: &'a InLayout<'a>) -> Expr<'a> {
Expr::UnionAtIndex {
structure: symbol,
tag_id: 0,
union_layout: UnionLayout::NonNullableUnwrapped(std::slice::from_ref(element_layout)),
index: 0,
}
}
}
impl<'a> Stmt<'a> {
@ -5614,13 +5632,22 @@ pub fn with_hole<'a>(
debug_assert_eq!(arg_symbols.len(), 1);
let x = arg_symbols[0];
Stmt::Let(assigned, Expr::ExprBox { symbol: x }, layout, hole)
let element_layout = match layout_cache.interner.get_repr(layout) {
LayoutRepr::Union(UnionLayout::NonNullableUnwrapped([l])) => l,
_ => unreachable!("invalid layout for a box expression"),
};
let expr = Expr::expr_box(arena.alloc(x), element_layout);
Stmt::Let(assigned, expr, layout, hole)
}
UnboxExpr => {
debug_assert_eq!(arg_symbols.len(), 1);
let x = arg_symbols[0];
Stmt::Let(assigned, Expr::ExprUnbox { symbol: x }, layout, hole)
let expr = Expr::expr_unbox(x, arena.alloc(layout));
Stmt::Let(assigned, expr, layout, hole)
}
_ => {
let call = self::Call {

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

@ -3206,8 +3206,13 @@ fn layout_from_flat_type<'a>(
let inner_var = args[0];
let inner_layout =
cached!(Layout::from_var(env, inner_var), criteria, env.subs);
let repr = LayoutRepr::Union(UnionLayout::NonNullableUnwrapped(
arena.alloc([inner_layout]),
));
let boxed_layout = env.cache.put_in(Layout {
repr: LayoutRepr::Boxed(inner_layout).direct(),
repr: repr.direct(),
semantic: SemanticRepr::NONE,
});