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

Fix anonymous function specialization

Browse source
This commit is contained in:
Richard Feldman 2020-07-12 23:53:58 -04:00
parent 2318384740
commit 764eda0780
1 changed files with 34 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
compiler/mono/src/expr.rs
View file

@ -82,7 +82,8 @@ impl<'a> Procs<'a> {
ret_var: Variable, ret_var: Variable,
layout_cache: &mut LayoutCache<'a>, layout_cache: &mut LayoutCache<'a>,
) -> Layout<'a> { ) -> Layout<'a> {
let (_, pattern_symbols, body) = patterns_to_when(env, loc_args, ret_var, loc_body); let (pattern_vars, pattern_symbols, body) =
patterns_to_when(env, loc_args, ret_var, loc_body);
// an anonymous closure. These will always be specialized already // an anonymous closure. These will always be specialized already
// by the surrounding context, so we can add pending specializations // by the surrounding context, so we can add pending specializations
@ -97,7 +98,10 @@ impl<'a> Procs<'a> {
pattern_vars, pattern_vars,
}; };
self.add_pending_specialization(symbol, layout.clone(), pending); match &mut self.pending_specializations {
Some(pending_specializations) => {
// register the pending specialization, so this gets code genned later
add_pending(pending_specializations, symbol, layout.clone(), pending);
debug_assert!(!self.partial_procs.contains_key(&symbol), "Procs was told to insert a value for symbol {:?}, but there was already an entry for that key! Procs should never attempt to insert duplicates.", symbol); debug_assert!(!self.partial_procs.contains_key(&symbol), "Procs was told to insert a value for symbol {:?}, but there was already an entry for that key! Procs should never attempt to insert duplicates.", symbol);
@ -109,6 +113,25 @@ impl<'a> Procs<'a> {
body: body.value, body: body.value,
}, },
); );
}
None => {
// TODO should pending_procs hold a Rc<Proc>?
let partial_proc = PartialProc {
annotation,
pattern_symbols,
body: body.value,
};
match specialize(env, self, symbol, layout_cache, pending, partial_proc) {
Ok(proc) => {
self.specialized.insert((symbol, layout.clone()), proc);
}
Err(_) => {
self.runtime_errors.insert(symbol);
}
}
}
}
layout layout
} }