language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-30 07:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

don't respecialize call by pointer wrappers

Browse source
This commit is contained in:
Folkert 2021-03-02 20:23:22 +01:00
parent ac91db41b7
commit 84d036bd91
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -277,6 +277,7 @@ pub struct Procs<'a> {
pub module_thunks: MutSet<Symbol>, pub module_thunks: MutSet<Symbol>,
pub pending_specializations: Option<MutMap<Symbol, MutMap<Layout<'a>, PendingSpecialization>>>, pub pending_specializations: Option<MutMap<Symbol, MutMap<Layout<'a>, PendingSpecialization>>>,
pub specialized: MutMap<(Symbol, Layout<'a>), InProgressProc<'a>>, pub specialized: MutMap<(Symbol, Layout<'a>), InProgressProc<'a>>,
pub call_by_pointer_wrappers: MutMap<Symbol, Symbol>,
pub runtime_errors: MutMap<Symbol, &'a str>, pub runtime_errors: MutMap<Symbol, &'a str>,
pub externals_others_need: ExternalSpecializations, pub externals_others_need: ExternalSpecializations,
pub externals_we_need: MutMap<ModuleId, ExternalSpecializations>, pub externals_we_need: MutMap<ModuleId, ExternalSpecializations>,
@ -291,6 +292,7 @@ impl<'a> Default for Procs<'a> {
pending_specializations: Some(MutMap::default()), pending_specializations: Some(MutMap::default()),
specialized: MutMap::default(), specialized: MutMap::default(),
runtime_errors: MutMap::default(), runtime_errors: MutMap::default(),
call_by_pointer_wrappers: MutMap::default(),
externals_we_need: MutMap::default(), externals_we_need: MutMap::default(),
externals_others_need: ExternalSpecializations::default(), externals_others_need: ExternalSpecializations::default(),
} }
@ -5733,6 +5735,10 @@ fn call_by_pointer<'a>(
match layout { match layout {
Layout::FunctionPointer(arg_layouts, ret_layout) if !is_thunk => { Layout::FunctionPointer(arg_layouts, ret_layout) if !is_thunk => {
if arg_layouts.iter().any(|l| l.contains_refcounted()) { if arg_layouts.iter().any(|l| l.contains_refcounted()) {
if let Some(wrapper) = procs.call_by_pointer_wrappers.get(&symbol) {
return Expr::FunctionPointer(*wrapper, layout);
}
let name = env.unique_symbol(); let name = env.unique_symbol();
let mut args = Vec::with_capacity_in(arg_layouts.len(), env.arena); let mut args = Vec::with_capacity_in(arg_layouts.len(), env.arena);
let mut arg_symbols = Vec::with_capacity_in(arg_layouts.len(), env.arena); let mut arg_symbols = Vec::with_capacity_in(arg_layouts.len(), env.arena);
@ -5777,6 +5783,9 @@ fn call_by_pointer<'a>(
procs procs
.specialized .specialized
.insert((name, layout.clone()), InProgressProc::Done(proc)); .insert((name, layout.clone()), InProgressProc::Done(proc));
procs.call_by_pointer_wrappers.insert(symbol, name);
Expr::FunctionPointer(name, layout) Expr::FunctionPointer(name, layout)
} else { } else {
// if none of the arguments is refcounted, then owning the arguments has no // if none of the arguments is refcounted, then owning the arguments has no
@ -5786,6 +5795,10 @@ fn call_by_pointer<'a>(
} }
Layout::FunctionPointer(arg_layouts, ret_layout) => { Layout::FunctionPointer(arg_layouts, ret_layout) => {
if arg_layouts.iter().any(|l| l.contains_refcounted()) { if arg_layouts.iter().any(|l| l.contains_refcounted()) {
if let Some(wrapper) = procs.call_by_pointer_wrappers.get(&symbol) {
return Expr::FunctionPointer(*wrapper, layout);
}
let name = env.unique_symbol(); let name = env.unique_symbol();
let mut args = Vec::with_capacity_in(arg_layouts.len(), env.arena); let mut args = Vec::with_capacity_in(arg_layouts.len(), env.arena);
let mut arg_symbols = Vec::with_capacity_in(arg_layouts.len(), env.arena); let mut arg_symbols = Vec::with_capacity_in(arg_layouts.len(), env.arena);
@ -5834,6 +5847,9 @@ fn call_by_pointer<'a>(
procs procs
.specialized .specialized
.insert((name, layout.clone()), InProgressProc::Done(proc)); .insert((name, layout.clone()), InProgressProc::Done(proc));
procs.call_by_pointer_wrappers.insert(symbol, name);
Expr::FunctionPointer(name, layout) Expr::FunctionPointer(name, layout)
} else { } else {
// if none of the arguments is refcounted, then owning the arguments has no // if none of the arguments is refcounted, then owning the arguments has no