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

Skip refcounting on unimplemented layouts

Browse source
This commit is contained in:
Brian Carroll 2021-12-11 11:37:55 +00:00
parent f54f96281f
commit c53b3c3686
3 changed files with 43 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/gen_dev/src/lib.rs
View file

@ -163,7 +163,7 @@ trait Backend<'a> {
.push((rc_proc_symbol, rc_proc_layout)); .push((rc_proc_symbol, rc_proc_layout));
} }
self.build_stmt(&rc_stmt, ret_layout) self.build_stmt(rc_stmt, ret_layout)
} }
Stmt::Switch { Stmt::Switch {
cond_symbol, cond_symbol,

2
compiler/gen_wasm/src/backend.rs
View file

@ -523,7 +523,7 @@ impl<'a> WasmBackend<'a> {
})); }));
} }
self.build_stmt(&rc_stmt, ret_layout); self.build_stmt(rc_stmt, ret_layout);
} }
x => todo!("statement {:?}", x), x => todo!("statement {:?}", x),

57
compiler/mono/src/gen_refcount.rs
View file

@ -77,7 +77,17 @@ impl<'a> RefcountProcGenerator<'a> {
layout: Layout<'a>, layout: Layout<'a>,
modify: &ModifyRc, modify: &ModifyRc,
following: &'a Stmt<'a>, following: &'a Stmt<'a>,
) -> (Stmt<'a>, Option<(Symbol, ProcLayout<'a>)>) { ) -> (&'a Stmt<'a>, Option<(Symbol, ProcLayout<'a>)>) {
if !Self::layout_is_supported(&layout) {
// Just a warning, so we can decouple backend development from refcounting development.
// When we are closer to completion, we can change it to a panic.
println!(
"WARNING! MEMORY LEAK! Refcounting not yet implemented for Layout {:?}",
layout
);
return (following, None);
}
let arena = self.arena; let arena = self.arena;
match modify { match modify {
@ -105,7 +115,7 @@ impl<'a> RefcountProcGenerator<'a> {
arguments: arena.alloc([*structure, amount_sym]), arguments: arena.alloc([*structure, amount_sym]),
}); });
let call_stmt = Stmt::Let(call_result_empty, call_expr, LAYOUT_UNIT, following); let call_stmt = Stmt::Let(call_result_empty, call_expr, LAYOUT_UNIT, following);
let rc_stmt = amount_stmt(arena.alloc(call_stmt)); let rc_stmt = arena.alloc(amount_stmt(arena.alloc(call_stmt)));
// Create a linker symbol for the helper proc if this is the first usage // Create a linker symbol for the helper proc if this is the first usage
let new_proc_info = if is_existing { let new_proc_info = if is_existing {
@ -140,7 +150,12 @@ impl<'a> RefcountProcGenerator<'a> {
arguments: arena.alloc([*structure]), arguments: arena.alloc([*structure]),
}); });
let rc_stmt = Stmt::Let(call_result_empty, call_expr, LAYOUT_UNIT, following); let rc_stmt = arena.alloc(Stmt::Let(
call_result_empty,
call_expr,
LAYOUT_UNIT,
following,
));
// Create a linker symbol for the helper proc if this is the first usage // Create a linker symbol for the helper proc if this is the first usage
let new_proc_info = if is_existing { let new_proc_info = if is_existing {
@ -182,13 +197,19 @@ impl<'a> RefcountProcGenerator<'a> {
arguments: arena.alloc([rc_ptr_sym]), arguments: arena.alloc([rc_ptr_sym]),
}); });
let call_stmt = Stmt::Let(call_result_empty, call_expr, LAYOUT_UNIT, following); let call_stmt = Stmt::Let(call_result_empty, call_expr, LAYOUT_UNIT, following);
let rc_stmt = rc_ptr_stmt(arena.alloc(call_stmt)); let rc_stmt = arena.alloc(rc_ptr_stmt(arena.alloc(call_stmt)));
(rc_stmt, None) (rc_stmt, None)
} }
} }
} }
// TODO: consider refactoring so that we have just one place to define what's supported
// (Probably by generating procs on the fly instead of all at the end)
fn layout_is_supported(layout: &Layout) -> bool {
matches!(layout, Layout::Builtin(Builtin::Str))
}
/// Generate refcounting helper procs, each specialized to a particular Layout. /// Generate refcounting helper procs, each specialized to a particular Layout.
/// For example `List (Result { a: Str, b: Int } Str)` would get its own helper /// For example `List (Result { a: Str, b: Int } Str)` would get its own helper
/// to update the refcounts on the List, the Result and the strings. /// to update the refcounts on the List, the Result and the strings.
@ -197,20 +218,24 @@ impl<'a> RefcountProcGenerator<'a> {
arena: &'a Bump, arena: &'a Bump,
ident_ids: &mut IdentIds, ident_ids: &mut IdentIds,
) -> Vec<'a, Proc<'a>> { ) -> Vec<'a, Proc<'a>> {
// Move the vector so we can loop over it safely // Move the vector out of self, so we can loop over it safely
let mut procs_to_generate = Vec::with_capacity_in(0, arena); let mut procs_to_generate =
std::mem::swap(&mut self.procs_to_generate, &mut procs_to_generate); std::mem::replace(&mut self.procs_to_generate, Vec::with_capacity_in(0, arena));
let mut procs = Vec::with_capacity_in(procs_to_generate.len(), arena); let procs_iter = procs_to_generate
for (layout, op, proc_symbol) in procs_to_generate.drain(0..) { .drain(0..)
let proc = match layout { .map(|(layout, op, proc_symbol)| {
Layout::Builtin(Builtin::Str) => self.gen_modify_str(ident_ids, op, proc_symbol), debug_assert!(Self::layout_is_supported(&layout));
_ => todo!("Refcounting is not yet implemented for Layout {:?}", layout), match layout {
}; Layout::Builtin(Builtin::Str) => {
procs.push(proc); self.gen_modify_str(ident_ids, op, proc_symbol)
} }
procs _ => todo!("Please update layout_is_supported for {:?}", layout),
}
});
Vec::from_iter_in(procs_iter, arena)
} }
/// Find the Symbol of the procedure for this layout and refcount operation, /// Find the Symbol of the procedure for this layout and refcount operation,