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

Consolidate calling specialized proc

Browse source
This commit is contained in:
Ayaz Hafiz 2022-07-03 16:36:32 -04:00
parent 634d4c534a
commit f940cc18c1
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
11 changed files with 134 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7724,52 +7724,21 @@ fn call_by_name_help<'a>(
proc_name, proc_name,
); );
let has_captures = argument_layouts.len() != top_level_layout.arguments.len();
let closure_argument = env.unique_symbol();
if has_captures {
field_symbols.push(closure_argument);
}
let field_symbols = field_symbols.into_bump_slice(); let field_symbols = field_symbols.into_bump_slice();
let call = self::Call { call_specialized_proc(
call_type: CallType::ByName { env,
name: proc_name, procs,
ret_layout, proc_name,
arg_layouts: top_level_layout.arguments, lambda_set,
specialization_id: env.next_call_specialization_id(), RawFunctionLayout::Function(argument_layouts, lambda_set, ret_layout),
}, top_level_layout,
arguments: field_symbols, field_symbols,
}; loc_args,
layout_cache,
let result = build_call(env, call, assigned, *ret_layout, hole); assigned,
hole,
// NOTE: the zip omits the closure symbol, if it exists, )
// because loc_args then is shorter than field_symbols
debug_assert!([0, 1].contains(&(field_symbols.len() - loc_args.len())));
let iter = loc_args.into_iter().zip(field_symbols.iter()).rev();
let result = assign_to_symbols(env, procs, layout_cache, iter, result);
if has_captures {
let partial_proc = procs.partial_procs.get_symbol(proc_name.name()).unwrap();
let captured = match partial_proc.captured_symbols {
CapturedSymbols::None => &[],
CapturedSymbols::Captured(slice) => slice,
};
construct_closure_data(
env,
lambda_set,
proc_name,
captured.iter(),
closure_argument,
env.arena.alloc(result),
)
} else {
result
}
} }
PendingSpecializations::Making => { PendingSpecializations::Making => {
let opt_partial_proc = procs.partial_procs.symbol_to_id(proc_name.name()); let opt_partial_proc = procs.partial_procs.symbol_to_id(proc_name.name());
@ -7795,10 +7764,11 @@ fn call_by_name_help<'a>(
partial_proc, partial_proc,
) { ) {
Ok((proc, layout)) => { Ok((proc, layout)) => {
let proc_name = proc.name;
let function_layout = ProcLayout::from_raw( let function_layout = ProcLayout::from_raw(
env.arena, env.arena,
layout, layout,
proc.name.captures_niche(), proc_name.captures_niche(),
); );
procs.specialized.insert_specialized( procs.specialized.insert_specialized(
proc_name.name(), proc_name.name(),
@ -7828,6 +7798,7 @@ fn call_by_name_help<'a>(
attempted_layout, attempted_layout,
); );
let proc_name = proc.name;
let function_layout = ProcLayout::from_raw( let function_layout = ProcLayout::from_raw(
env.arena, env.arena,
attempted_layout, attempted_layout,

12
crates/compiler/test_mono/generated/empty_list_of_function_type.txt
View file

@ -1,6 +1,6 @@
procedure List.2 (List.75, List.76): procedure List.2 (List.75, List.76):
let List.285 : U64 = CallByName List.6 List.75; let List.284 : U64 = CallByName List.6 List.75;
let List.281 : Int1 = CallByName Num.22 List.76 List.285; let List.281 : Int1 = CallByName Num.22 List.76 List.284;
if List.281 then if List.281 then
let List.283 : {} = CallByName List.60 List.75 List.76; let List.283 : {} = CallByName List.60 List.75 List.76;
let List.282 : [C {}, C {}] = TagId(1) List.283; let List.282 : [C {}, C {}] = TagId(1) List.283;
@ -11,12 +11,12 @@ procedure List.2 (List.75, List.76):
ret List.279; ret List.279;
procedure List.6 (#Attr.2): procedure List.6 (#Attr.2):
let List.288 : U64 = lowlevel ListLen #Attr.2; let List.286 : U64 = lowlevel ListLen #Attr.2;
ret List.288; ret List.286;
procedure List.60 (#Attr.2, #Attr.3): procedure List.60 (#Attr.2, #Attr.3):
let List.287 : {} = lowlevel ListGetUnsafe #Attr.2 #Attr.3; let List.285 : {} = lowlevel ListGetUnsafe #Attr.2 #Attr.3;
ret List.287; ret List.285;
procedure Num.22 (#Attr.2, #Attr.3): procedure Num.22 (#Attr.2, #Attr.3):
let Num.188 : Int1 = lowlevel NumLt #Attr.2 #Attr.3; let Num.188 : Int1 = lowlevel NumLt #Attr.2 #Attr.3;

26
crates/compiler/test_mono/generated/issue_2583_specialize_errors_behind_unified_branches.txt
View file

@ -1,22 +1,22 @@
procedure List.2 (List.75, List.76): procedure List.2 (List.75, List.76):
let List.294 : U64 = CallByName List.6 List.75; let List.293 : U64 = CallByName List.6 List.75;
let List.290 : Int1 = CallByName Num.22 List.76 List.294; let List.289 : Int1 = CallByName Num.22 List.76 List.293;
if List.290 then if List.289 then
let List.292 : I64 = CallByName List.60 List.75 List.76; let List.291 : I64 = CallByName List.60 List.75 List.76;
let List.291 : [C {}, C I64] = TagId(1) List.292; let List.290 : [C {}, C I64] = TagId(1) List.291;
ret List.291; ret List.290;
else else
let List.289 : {} = Struct {}; let List.288 : {} = Struct {};
let List.288 : [C {}, C I64] = TagId(0) List.289; let List.287 : [C {}, C I64] = TagId(0) List.288;
ret List.288; ret List.287;
procedure List.6 (#Attr.2): procedure List.6 (#Attr.2):
let List.295 : U64 = lowlevel ListLen #Attr.2; let List.294 : U64 = lowlevel ListLen #Attr.2;
ret List.295; ret List.294;
procedure List.60 (#Attr.2, #Attr.3): procedure List.60 (#Attr.2, #Attr.3):
let List.293 : I64 = lowlevel ListGetUnsafe #Attr.2 #Attr.3; let List.292 : I64 = lowlevel ListGetUnsafe #Attr.2 #Attr.3;
ret List.293; ret List.292;
procedure List.9 (List.201): procedure List.9 (List.201):
let List.286 : U64 = 0i64; let List.286 : U64 = 0i64;

18
crates/compiler/test_mono/generated/list_cannot_update_inplace.txt
View file

@ -6,22 +6,22 @@ procedure List.3 (List.83, List.84, List.85):
ret List.281; ret List.281;
procedure List.57 (List.80, List.81, List.82): procedure List.57 (List.80, List.81, List.82):
let List.288 : U64 = CallByName List.6 List.80; let List.287 : U64 = CallByName List.6 List.80;
let List.285 : Int1 = CallByName Num.22 List.81 List.288; let List.284 : Int1 = CallByName Num.22 List.81 List.287;
if List.285 then if List.284 then
let List.286 : {List I64, I64} = CallByName List.61 List.80 List.81 List.82; let List.285 : {List I64, I64} = CallByName List.61 List.80 List.81 List.82;
ret List.286; ret List.285;
else else
let List.284 : {List I64, I64} = Struct {List.80, List.82}; let List.283 : {List I64, I64} = Struct {List.80, List.82};
ret List.284; ret List.283;
procedure List.6 (#Attr.2): procedure List.6 (#Attr.2):
let List.280 : U64 = lowlevel ListLen #Attr.2; let List.280 : U64 = lowlevel ListLen #Attr.2;
ret List.280; ret List.280;
procedure List.61 (#Attr.2, #Attr.3, #Attr.4): procedure List.61 (#Attr.2, #Attr.3, #Attr.4):
let List.287 : {List I64, I64} = lowlevel ListReplaceUnsafe #Attr.2 #Attr.3 #Attr.4; let List.286 : {List I64, I64} = lowlevel ListReplaceUnsafe #Attr.2 #Attr.3 #Attr.4;
ret List.287; ret List.286;
procedure Num.19 (#Attr.2, #Attr.3): procedure Num.19 (#Attr.2, #Attr.3):
let Num.188 : U64 = lowlevel NumAdd #Attr.2 #Attr.3; let Num.188 : U64 = lowlevel NumAdd #Attr.2 #Attr.3;

12
crates/compiler/test_mono/generated/list_get.txt
View file

@ -1,6 +1,6 @@
procedure List.2 (List.75, List.76): procedure List.2 (List.75, List.76):
let List.285 : U64 = CallByName List.6 List.75; let List.284 : U64 = CallByName List.6 List.75;
let List.281 : Int1 = CallByName Num.22 List.76 List.285; let List.281 : Int1 = CallByName Num.22 List.76 List.284;
if List.281 then if List.281 then
let List.283 : I64 = CallByName List.60 List.75 List.76; let List.283 : I64 = CallByName List.60 List.75 List.76;
let List.282 : [C {}, C I64] = TagId(1) List.283; let List.282 : [C {}, C I64] = TagId(1) List.283;
@ -11,12 +11,12 @@ procedure List.2 (List.75, List.76):
ret List.279; ret List.279;
procedure List.6 (#Attr.2): procedure List.6 (#Attr.2):
let List.288 : U64 = lowlevel ListLen #Attr.2; let List.286 : U64 = lowlevel ListLen #Attr.2;
ret List.288; ret List.286;
procedure List.60 (#Attr.2, #Attr.3): procedure List.60 (#Attr.2, #Attr.3):
let List.287 : I64 = lowlevel ListGetUnsafe #Attr.2 #Attr.3; let List.285 : I64 = lowlevel ListGetUnsafe #Attr.2 #Attr.3;
ret List.287; ret List.285;
procedure Num.22 (#Attr.2, #Attr.3): procedure Num.22 (#Attr.2, #Attr.3):
let Num.188 : Int1 = lowlevel NumLt #Attr.2 #Attr.3; let Num.188 : Int1 = lowlevel NumLt #Attr.2 #Attr.3;

16
crates/compiler/test_mono/generated/list_map_closure_borrows.txt
View file

@ -1,6 +1,6 @@
procedure List.2 (List.75, List.76): procedure List.2 (List.75, List.76):
let List.285 : U64 = CallByName List.6 List.75; let List.284 : U64 = CallByName List.6 List.75;
let List.281 : Int1 = CallByName Num.22 List.76 List.285; let List.281 : Int1 = CallByName Num.22 List.76 List.284;
if List.281 then if List.281 then
let List.283 : Str = CallByName List.60 List.75 List.76; let List.283 : Str = CallByName List.60 List.75 List.76;
let List.282 : [C {}, C Str] = TagId(1) List.283; let List.282 : [C {}, C Str] = TagId(1) List.283;
@ -11,16 +11,16 @@ procedure List.2 (List.75, List.76):
ret List.279; ret List.279;
procedure List.5 (#Attr.2, #Attr.3): procedure List.5 (#Attr.2, #Attr.3):
let List.287 : List Str = lowlevel ListMap { xs: `#Attr.#arg1` } #Attr.2 Test.3 #Attr.3; let List.285 : List Str = lowlevel ListMap { xs: `#Attr.#arg1` } #Attr.2 Test.3 #Attr.3;
ret List.287; ret List.285;
procedure List.6 (#Attr.2): procedure List.6 (#Attr.2):
let List.289 : U64 = lowlevel ListLen #Attr.2; let List.287 : U64 = lowlevel ListLen #Attr.2;
ret List.289; ret List.287;
procedure List.60 (#Attr.2, #Attr.3): procedure List.60 (#Attr.2, #Attr.3):
let List.288 : Str = lowlevel ListGetUnsafe #Attr.2 #Attr.3; let List.286 : Str = lowlevel ListGetUnsafe #Attr.2 #Attr.3;
ret List.288; ret List.286;
procedure Num.22 (#Attr.2, #Attr.3): procedure Num.22 (#Attr.2, #Attr.3):
let Num.188 : Int1 = lowlevel NumLt #Attr.2 #Attr.3; let Num.188 : Int1 = lowlevel NumLt #Attr.2 #Attr.3;

16
crates/compiler/test_mono/generated/list_map_closure_owns.txt
View file

@ -1,6 +1,6 @@
procedure List.2 (List.75, List.76): procedure List.2 (List.75, List.76):
let List.285 : U64 = CallByName List.6 List.75; let List.284 : U64 = CallByName List.6 List.75;
let List.281 : Int1 = CallByName Num.22 List.76 List.285; let List.281 : Int1 = CallByName Num.22 List.76 List.284;
if List.281 then if List.281 then
let List.283 : Str = CallByName List.60 List.75 List.76; let List.283 : Str = CallByName List.60 List.75 List.76;
let List.282 : [C {}, C Str] = TagId(1) List.283; let List.282 : [C {}, C Str] = TagId(1) List.283;
@ -12,17 +12,17 @@ procedure List.2 (List.75, List.76):
procedure List.5 (#Attr.2, #Attr.3): procedure List.5 (#Attr.2, #Attr.3):
inc #Attr.2; inc #Attr.2;
let List.287 : List Str = lowlevel ListMap { xs: `#Attr.#arg1` } #Attr.2 Test.3 #Attr.3; let List.285 : List Str = lowlevel ListMap { xs: `#Attr.#arg1` } #Attr.2 Test.3 #Attr.3;
decref #Attr.2; decref #Attr.2;
ret List.287; ret List.285;
procedure List.6 (#Attr.2): procedure List.6 (#Attr.2):
let List.289 : U64 = lowlevel ListLen #Attr.2; let List.287 : U64 = lowlevel ListLen #Attr.2;
ret List.289; ret List.287;
procedure List.60 (#Attr.2, #Attr.3): procedure List.60 (#Attr.2, #Attr.3):
let List.288 : Str = lowlevel ListGetUnsafe #Attr.2 #Attr.3; let List.286 : Str = lowlevel ListGetUnsafe #Attr.2 #Attr.3;
ret List.288; ret List.286;
procedure Num.22 (#Attr.2, #Attr.3): procedure Num.22 (#Attr.2, #Attr.3):
let Num.188 : Int1 = lowlevel NumLt #Attr.2 #Attr.3; let Num.188 : Int1 = lowlevel NumLt #Attr.2 #Attr.3;

22
crates/compiler/test_mono/generated/list_pass_to_function.txt
View file

@ -6,22 +6,22 @@ procedure List.3 (List.83, List.84, List.85):
ret List.279; ret List.279;
procedure List.57 (List.80, List.81, List.82): procedure List.57 (List.80, List.81, List.82):
let List.286 : U64 = CallByName List.6 List.80; let List.285 : U64 = CallByName List.6 List.80;
let List.283 : Int1 = CallByName Num.22 List.81 List.286; let List.282 : Int1 = CallByName Num.22 List.81 List.285;
if List.283 then if List.282 then
let List.284 : {List I64, I64} = CallByName List.61 List.80 List.81 List.82; let List.283 : {List I64, I64} = CallByName List.61 List.80 List.81 List.82;
ret List.284; ret List.283;
else else
let List.282 : {List I64, I64} = Struct {List.80, List.82}; let List.281 : {List I64, I64} = Struct {List.80, List.82};
ret List.282; ret List.281;
procedure List.6 (#Attr.2): procedure List.6 (#Attr.2):
let List.287 : U64 = lowlevel ListLen #Attr.2; let List.286 : U64 = lowlevel ListLen #Attr.2;
ret List.287; ret List.286;
procedure List.61 (#Attr.2, #Attr.3, #Attr.4): procedure List.61 (#Attr.2, #Attr.3, #Attr.4):
let List.285 : {List I64, I64} = lowlevel ListReplaceUnsafe #Attr.2 #Attr.3 #Attr.4; let List.284 : {List I64, I64} = lowlevel ListReplaceUnsafe #Attr.2 #Attr.3 #Attr.4;
ret List.285; ret List.284;
procedure Num.22 (#Attr.2, #Attr.3): procedure Num.22 (#Attr.2, #Attr.3):
let Num.188 : Int1 = lowlevel NumLt #Attr.2 #Attr.3; let Num.188 : Int1 = lowlevel NumLt #Attr.2 #Attr.3;

6
crates/compiler/test_mono/generated/list_sort_asc.txt
View file

@ -1,11 +1,11 @@
procedure List.28 (#Attr.2, #Attr.3): procedure List.28 (#Attr.2, #Attr.3):
let List.282 : List I64 = lowlevel ListSortWith { xs: `#Attr.#arg1` } #Attr.2 Num.46 #Attr.3; let List.281 : List I64 = lowlevel ListSortWith { xs: `#Attr.#arg1` } #Attr.2 Num.46 #Attr.3;
let Bool.9 : Int1 = lowlevel ListIsUnique #Attr.2; let Bool.9 : Int1 = lowlevel ListIsUnique #Attr.2;
if Bool.9 then if Bool.9 then
ret List.282; ret List.281;
else else
decref #Attr.2; decref #Attr.2;
ret List.282; ret List.281;
procedure List.54 (List.196): procedure List.54 (List.196):
let List.280 : {} = Struct {}; let List.280 : {} = Struct {};

54
crates/compiler/test_mono/generated/quicksort_swap.txt
View file

@ -1,43 +1,43 @@
procedure List.2 (List.75, List.76): procedure List.2 (List.75, List.76):
let List.299 : U64 = CallByName List.6 List.75; let List.294 : U64 = CallByName List.6 List.75;
let List.295 : Int1 = CallByName Num.22 List.76 List.299; let List.291 : Int1 = CallByName Num.22 List.76 List.294;
if List.295 then if List.291 then
let List.297 : I64 = CallByName List.60 List.75 List.76; let List.293 : I64 = CallByName List.60 List.75 List.76;
let List.296 : [C {}, C I64] = TagId(1) List.297; let List.292 : [C {}, C I64] = TagId(1) List.293;
ret List.296; ret List.292;
else else
let List.294 : {} = Struct {}; let List.290 : {} = Struct {};
let List.293 : [C {}, C I64] = TagId(0) List.294; let List.289 : [C {}, C I64] = TagId(0) List.290;
ret List.293; ret List.289;
procedure List.3 (List.83, List.84, List.85): procedure List.3 (List.83, List.84, List.85):
let List.283 : {List I64, I64} = CallByName List.57 List.83 List.84 List.85; let List.282 : {List I64, I64} = CallByName List.57 List.83 List.84 List.85;
let List.282 : List I64 = StructAtIndex 0 List.283; let List.281 : List I64 = StructAtIndex 0 List.282;
inc List.282; inc List.281;
dec List.283; dec List.282;
ret List.282; ret List.281;
procedure List.57 (List.80, List.81, List.82): procedure List.57 (List.80, List.81, List.82):
let List.305 : U64 = CallByName List.6 List.80; let List.299 : U64 = CallByName List.6 List.80;
let List.302 : Int1 = CallByName Num.22 List.81 List.305; let List.296 : Int1 = CallByName Num.22 List.81 List.299;
if List.302 then if List.296 then
let List.303 : {List I64, I64} = CallByName List.61 List.80 List.81 List.82; let List.297 : {List I64, I64} = CallByName List.61 List.80 List.81 List.82;
ret List.303; ret List.297;
else else
let List.301 : {List I64, I64} = Struct {List.80, List.82}; let List.295 : {List I64, I64} = Struct {List.80, List.82};
ret List.301; ret List.295;
procedure List.6 (#Attr.2): procedure List.6 (#Attr.2):
let List.306 : U64 = lowlevel ListLen #Attr.2; let List.300 : U64 = lowlevel ListLen #Attr.2;
ret List.306; ret List.300;
procedure List.60 (#Attr.2, #Attr.3): procedure List.60 (#Attr.2, #Attr.3):
let List.307 : I64 = lowlevel ListGetUnsafe #Attr.2 #Attr.3; let List.301 : I64 = lowlevel ListGetUnsafe #Attr.2 #Attr.3;
ret List.307; ret List.301;
procedure List.61 (#Attr.2, #Attr.3, #Attr.4): procedure List.61 (#Attr.2, #Attr.3, #Attr.4):
let List.304 : {List I64, I64} = lowlevel ListReplaceUnsafe #Attr.2 #Attr.3 #Attr.4; let List.298 : {List I64, I64} = lowlevel ListReplaceUnsafe #Attr.2 #Attr.3 #Attr.4;
ret List.304; ret List.298;
procedure Num.22 (#Attr.2, #Attr.3): procedure Num.22 (#Attr.2, #Attr.3):
let Num.190 : Int1 = lowlevel NumLt #Attr.2 #Attr.3; let Num.190 : Int1 = lowlevel NumLt #Attr.2 #Attr.3;

54
crates/compiler/test_mono/generated/rigids.txt
View file

@ -1,43 +1,43 @@
procedure List.2 (List.75, List.76): procedure List.2 (List.75, List.76):
let List.299 : U64 = CallByName List.6 List.75; let List.294 : U64 = CallByName List.6 List.75;
let List.295 : Int1 = CallByName Num.22 List.76 List.299; let List.291 : Int1 = CallByName Num.22 List.76 List.294;
if List.295 then if List.291 then
let List.297 : I64 = CallByName List.60 List.75 List.76; let List.293 : I64 = CallByName List.60 List.75 List.76;
let List.296 : [C {}, C I64] = TagId(1) List.297; let List.292 : [C {}, C I64] = TagId(1) List.293;
ret List.296; ret List.292;
else else
let List.294 : {} = Struct {}; let List.290 : {} = Struct {};
let List.293 : [C {}, C I64] = TagId(0) List.294; let List.289 : [C {}, C I64] = TagId(0) List.290;
ret List.293; ret List.289;
procedure List.3 (List.83, List.84, List.85): procedure List.3 (List.83, List.84, List.85):
let List.283 : {List I64, I64} = CallByName List.57 List.83 List.84 List.85; let List.282 : {List I64, I64} = CallByName List.57 List.83 List.84 List.85;
let List.282 : List I64 = StructAtIndex 0 List.283; let List.281 : List I64 = StructAtIndex 0 List.282;
inc List.282; inc List.281;
dec List.283; dec List.282;
ret List.282; ret List.281;
procedure List.57 (List.80, List.81, List.82): procedure List.57 (List.80, List.81, List.82):
let List.305 : U64 = CallByName List.6 List.80; let List.299 : U64 = CallByName List.6 List.80;
let List.302 : Int1 = CallByName Num.22 List.81 List.305; let List.296 : Int1 = CallByName Num.22 List.81 List.299;
if List.302 then if List.296 then
let List.303 : {List I64, I64} = CallByName List.61 List.80 List.81 List.82; let List.297 : {List I64, I64} = CallByName List.61 List.80 List.81 List.82;
ret List.303; ret List.297;
else else
let List.301 : {List I64, I64} = Struct {List.80, List.82}; let List.295 : {List I64, I64} = Struct {List.80, List.82};
ret List.301; ret List.295;
procedure List.6 (#Attr.2): procedure List.6 (#Attr.2):
let List.306 : U64 = lowlevel ListLen #Attr.2; let List.300 : U64 = lowlevel ListLen #Attr.2;
ret List.306; ret List.300;
procedure List.60 (#Attr.2, #Attr.3): procedure List.60 (#Attr.2, #Attr.3):
let List.307 : I64 = lowlevel ListGetUnsafe #Attr.2 #Attr.3; let List.301 : I64 = lowlevel ListGetUnsafe #Attr.2 #Attr.3;
ret List.307; ret List.301;
procedure List.61 (#Attr.2, #Attr.3, #Attr.4): procedure List.61 (#Attr.2, #Attr.3, #Attr.4):
let List.304 : {List I64, I64} = lowlevel ListReplaceUnsafe #Attr.2 #Attr.3 #Attr.4; let List.298 : {List I64, I64} = lowlevel ListReplaceUnsafe #Attr.2 #Attr.3 #Attr.4;
ret List.304; ret List.298;
procedure Num.22 (#Attr.2, #Attr.3): procedure Num.22 (#Attr.2, #Attr.3):
let Num.190 : Int1 = lowlevel NumLt #Attr.2 #Attr.3; let Num.190 : Int1 = lowlevel NumLt #Attr.2 #Attr.3;