language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-22 04:44:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

use env through backend, preventing a double borrow

Browse source
This commit is contained in:
Folkert 2021-12-03 20:49:51 +01:00
parent edf113513c
commit 47840a4e65
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
compiler/gen_dev/src/object_builder.rs
View file

@ -169,7 +169,7 @@ fn generate_wrapper<'a, B: Backend<'a>>(
} }
fn build_object<'a, B: Backend<'a>>( fn build_object<'a, B: Backend<'a>>(
env: &'a Env, _env: &'a Env,
ident_ids: &'a mut IdentIds, ident_ids: &'a mut IdentIds,
procedures: MutMap<(symbol::Symbol, ProcLayout<'a>), Proc<'a>>, procedures: MutMap<(symbol::Symbol, ProcLayout<'a>), Proc<'a>>,
mut backend: B, mut backend: B,
@ -177,6 +177,8 @@ fn build_object<'a, B: Backend<'a>>(
) -> Object { ) -> Object {
let data_section = output.section_id(StandardSection::Data); let data_section = output.section_id(StandardSection::Data);
let arena = backend.env().arena;
/* /*
// Commented out because we couldn't figure out how to get it to work on mac - see https://github.com/rtfeldman/roc/pull/1323 // Commented out because we couldn't figure out how to get it to work on mac - see https://github.com/rtfeldman/roc/pull/1323
let comment = output.add_section(vec![], b".comment".to_vec(), SectionKind::OtherString); let comment = output.add_section(vec![], b".comment".to_vec(), SectionKind::OtherString);
@ -187,7 +189,7 @@ fn build_object<'a, B: Backend<'a>>(
); );
*/ */
if env.generate_allocators { if backend.env().generate_allocators {
generate_wrapper( generate_wrapper(
&mut backend, &mut backend,
&mut output, &mut output,
@ -216,7 +218,7 @@ fn build_object<'a, B: Backend<'a>>(
// Setup layout_ids for procedure calls. // Setup layout_ids for procedure calls.
let mut layout_ids = LayoutIds::default(); let mut layout_ids = LayoutIds::default();
let mut procs = Vec::with_capacity_in(procedures.len(), env.arena); let mut procs = Vec::with_capacity_in(procedures.len(), arena);
// Names and linker data for user procedures // Names and linker data for user procedures
for ((sym, layout), proc) in procedures { for ((sym, layout), proc) in procedures {
@ -224,7 +226,7 @@ fn build_object<'a, B: Backend<'a>>(
&mut output, &mut output,
&mut layout_ids, &mut layout_ids,
&mut procs, &mut procs,
env, backend.env(),
sym, sym,
layout, layout,
proc, proc,
@ -232,7 +234,7 @@ fn build_object<'a, B: Backend<'a>>(
} }
// Build procedures from user code // Build procedures from user code
let mut relocations = bumpalo::vec![in env.arena]; let mut relocations = bumpalo::vec![in arena];
for (fn_name, section_id, proc_id, proc) in procs { for (fn_name, section_id, proc_id, proc) in procs {
build_proc( build_proc(
&mut output, &mut output,
@ -249,11 +251,12 @@ fn build_object<'a, B: Backend<'a>>(
// Generate IR for refcounting procedures // Generate IR for refcounting procedures
let rc_proc_gen = backend.refcount_proc_gen_mut(); let rc_proc_gen = backend.refcount_proc_gen_mut();
let rc_procs = rc_proc_gen.generate_refcount_procs(env.arena, ident_ids); let rc_procs = rc_proc_gen.generate_refcount_procs(arena, ident_ids);
env.module_id.register_debug_idents(ident_ids); backend.env().module_id.register_debug_idents(ident_ids);
let rc_symbols_and_layouts = backend.refcount_proc_symbols_mut(); let empty = bumpalo::collections::Vec::new_in(arena);
let mut rc_names_symbols_procs = Vec::with_capacity_in(rc_procs.len(), env.arena); let rc_symbols_and_layouts = std::mem::replace(backend.refcount_proc_symbols_mut(), empty);
let mut rc_names_symbols_procs = Vec::with_capacity_in(rc_procs.len(), arena);
// Names and linker data for refcounting procedures // Names and linker data for refcounting procedures
for ((sym, layout), proc) in rc_symbols_and_layouts.into_iter().zip(rc_procs) { for ((sym, layout), proc) in rc_symbols_and_layouts.into_iter().zip(rc_procs) {
@ -261,9 +264,9 @@ fn build_object<'a, B: Backend<'a>>(
&mut output, &mut output,
&mut layout_ids, &mut layout_ids,
&mut rc_names_symbols_procs, &mut rc_names_symbols_procs,
env, backend.env(),
*sym, sym,
*layout, layout,
proc, proc,
) )
} }