language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 21:39:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Simplify how glue_procs are handled

Browse source
This commit is contained in:
Richard Feldman 2022-11-13 21:04:27 -05:00
parent d35d268a6b
commit 8e2bbee377
No known key found for this signature in database
GPG key ID: F1F21AA5B1D9E43B
5 changed files with 557 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10762,9 +10762,10 @@ pub struct GlueLayouts<'a> {
pub getters: std::vec::Vec<(Symbol, ProcLayout<'a>)>,
}
pub struct GlueProcs<'a> {
pub procs: Vec<'a, ((Symbol, ProcLayout<'a>), Proc<'a>)>,
pub layouts: Vec<'a, Layout<'a>>,
pub struct GlueProc<'a> {
pub name: Symbol,
pub proc_layout: ProcLayout<'a>,
pub proc: Proc<'a>,
}
pub fn generate_glue_procs<'a, I: Interner<'a, Layout<'a>>>(
@ -10773,10 +10774,9 @@ pub fn generate_glue_procs<'a, I: Interner<'a, Layout<'a>>>(
arena: &'a Bump,
layout_interner: &mut I,
layout: Layout<'a>,
) -> GlueProcs<'a> {
) -> Vec<'a, (Layout<'a>, Vec<'a, GlueProc<'a>>)> {
let mut stack = Vec::new_in(arena);
let mut procs = Vec::new_in(arena);
let mut layouts = Vec::new_in(arena);
let mut answer = Vec::new_in(arena);
stack.push(layout);
@ -10792,17 +10792,16 @@ pub fn generate_glue_procs<'a, I: Interner<'a, Layout<'a>>>(
},
Layout::Struct { field_layouts, .. } => {
if layout.contains_function(arena) {
layouts.push(layout);
generate_glue_procs_for_fields(
let procs = generate_glue_procs_for_fields(
home,
ident_ids,
arena,
layout,
field_layouts,
&mut procs,
);
answer.push((layout, procs));
stack.extend(field_layouts);
}
}
@ -10834,7 +10833,7 @@ pub fn generate_glue_procs<'a, I: Interner<'a, Layout<'a>>>(
}
}
GlueProcs { procs, layouts }
answer
}
fn generate_glue_procs_for_fields<'a>(
@ -10843,24 +10842,22 @@ fn generate_glue_procs_for_fields<'a>(
arena: &'a Bump,
unboxed_struct_layout: Layout<'a>,
field_layouts: &'a [Layout<'a>],
output: &mut Vec<'a, ((Symbol, ProcLayout<'a>), Proc<'a>)>,
) {
output.reserve(field_layouts.len());
) -> Vec<'a, GlueProc<'a>> {
let boxed_struct_layout = Layout::Boxed(arena.alloc(unboxed_struct_layout));
let mut answer = bumpalo::collections::Vec::with_capacity_in(field_layouts.len(), arena);
for (index, field) in field_layouts.iter().enumerate() {
let symbol = Symbol::new(home, ident_ids.gen_unique());
let argument = Symbol::new(home, ident_ids.gen_unique());
let unboxed = Symbol::new(home, ident_ids.gen_unique());
let result = Symbol::new(home, ident_ids.gen_unique());
let proc_layout = ProcLayout {
arguments: arena.alloc([boxed_struct_layout]),
result: *field,
captures_niche: CapturesNiche::no_niche(),
};
let symbol = Symbol::new(home, ident_ids.gen_unique());
let argument = Symbol::new(home, ident_ids.gen_unique());
let unboxed = Symbol::new(home, ident_ids.gen_unique());
let result = Symbol::new(home, ident_ids.gen_unique());
let ret_stmt = arena.alloc(Stmt::Ret(result));
let field_get_expr = Expr::StructAtIndex {
@ -10891,6 +10888,12 @@ fn generate_glue_procs_for_fields<'a>(
host_exposed_layouts: HostExposedLayouts::NotHostExposed,
};
output.push(((symbol, proc_layout), proc));
answer.push(GlueProc {
name: symbol,
proc_layout,
proc,
});
}
answer
}