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

fix imported function thunk

Browse source
This commit is contained in:
Folkert 2022-01-03 16:18:53 +01:00
parent 1a07508c9a
commit 7044e95df8
3 changed files with 46 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4017,7 +4017,8 @@ pub fn with_hole<'a>(
// if it's in there, it's a call by name, otherwise it's a call by pointer // if it's in there, it's a call by name, otherwise it's a call by pointer
let is_known = |key| { let is_known = |key| {
// a proc in this module, or an imported symbol // a proc in this module, or an imported symbol
procs.partial_procs.contains_key(key) || env.is_imported_symbol(key) procs.partial_procs.contains_key(key)
|| (env.is_imported_symbol(key) && !procs.is_imported_module_thunk(key))
}; };
match loc_expr.value { match loc_expr.value {
@ -4072,8 +4073,44 @@ pub fn with_hole<'a>(
LocalFunction(_) => { LocalFunction(_) => {
unreachable!("if this was known to be a function, we would not be here") unreachable!("if this was known to be a function, we would not be here")
} }
Imported(_) => { Imported(thunk_name) => {
unreachable!("an imported value is never an anonymous function") debug_assert!(procs.is_imported_module_thunk(thunk_name));
add_needed_external(procs, env, fn_var, thunk_name);
let function_symbol = env.unique_symbol();
match full_layout {
RawFunctionLayout::Function(
arg_layouts,
lambda_set,
ret_layout,
) => {
let closure_data_symbol = function_symbol;
result = match_on_lambda_set(
env,
lambda_set,
closure_data_symbol,
arg_symbols,
arg_layouts,
ret_layout,
assigned,
hole,
);
result = force_thunk(
env,
thunk_name,
Layout::LambdaSet(lambda_set),
function_symbol,
env.arena.alloc(result),
);
}
RawFunctionLayout::ZeroArgumentThunk(_) => {
unreachable!("calling a non-closure layout")
}
}
} }
Value(function_symbol) => match full_layout { Value(function_symbol) => match full_layout {
RawFunctionLayout::Function(arg_layouts, lambda_set, ret_layout) => { RawFunctionLayout::Function(arg_layouts, lambda_set, ret_layout) => {

4
examples/benchmarks/Issue2279.roc
View file

@ -4,6 +4,8 @@ app "issue2279"
provides [ main ] to pf provides [ main ] to pf
main = main =
text = Issue2279Help.text t1 = Issue2279Help.asText 42
t2 = Issue2279Help.text
text = if True then t1 else t2
Task.putLine text Task.putLine text

4
examples/benchmarks/Issue2279Help.roc
View file

@ -1,5 +1,7 @@
interface Issue2279Help interface Issue2279Help
exposes [ text ] exposes [ text, asText ]
imports [] imports []
text = "Hello, world!" text = "Hello, world!"
asText = Num.toStr