language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-01 07:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

refactor

Browse source
This commit is contained in:
Folkert 2021-06-19 14:01:47 +02:00
parent 53ce8b2d25
commit dd341508e4
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/mono/src/ir.rs
View file

@ -6285,7 +6285,6 @@ fn call_by_name<'a>(
assign_to_symbols(env, procs, layout_cache, iter, result) assign_to_symbols(env, procs, layout_cache, iter, result)
} }
} else { } else {
let orig = Layout::Closure(arg_layouts, lambda_set, ret_layout);
match lambda_set.extend_function_layout(env.arena, arg_layouts, ret_layout) { match lambda_set.extend_function_layout(env.arena, arg_layouts, ret_layout) {
Layout::FunctionPointer(argument_layouts, ret_layout) => call_by_name_help( Layout::FunctionPointer(argument_layouts, ret_layout) => call_by_name_help(
env, env,
@ -6293,7 +6292,7 @@ fn call_by_name<'a>(
fn_var, fn_var,
proc_name, proc_name,
loc_args, loc_args,
orig, lambda_set,
argument_layouts, argument_layouts,
ret_layout, ret_layout,
layout_cache, layout_cache,
@ -6334,7 +6333,7 @@ fn call_by_name_help<'a>(
fn_var: Variable, fn_var: Variable,
proc_name: Symbol, proc_name: Symbol,
loc_args: std::vec::Vec<(Variable, Located<roc_can::expr::Expr>)>, loc_args: std::vec::Vec<(Variable, Located<roc_can::expr::Expr>)>,
maybe_closure_layout: Layout<'a>, lambda_set: LambdaSet<'a>,
argument_layouts: &'a [Layout<'a>], argument_layouts: &'a [Layout<'a>],
ret_layout: &'a Layout<'a>, ret_layout: &'a Layout<'a>,
layout_cache: &mut LayoutCache<'a>, layout_cache: &mut LayoutCache<'a>,
@ -6403,7 +6402,13 @@ fn call_by_name_help<'a>(
debug_assert_ne!(proc_name.module_id(), ModuleId::ATTR); debug_assert_ne!(proc_name.module_id(), ModuleId::ATTR);
if procs.imported_module_thunks.contains(&proc_name) { if procs.imported_module_thunks.contains(&proc_name) {
force_thunk(env, proc_name, maybe_closure_layout, assigned, hole) force_thunk(
env,
proc_name,
lambda_set.runtime_representation(),
assigned,
hole,
)
} else { } else {
debug_assert!( debug_assert!(
!field_symbols.is_empty(), !field_symbols.is_empty(),