language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 16:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

remove field from procs; pass separately

Browse source
This commit is contained in:
Folkert 2021-05-02 15:28:53 +02:00
parent 8df810fe0c
commit f0070e7464
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/load/src/file.rs
View file

@ -3798,14 +3798,15 @@ fn make_specializations<'a>(
ptr_bytes, ptr_bytes,
}; };
procs
.externals_others_need
.extend(specializations_we_must_make);
// TODO: for now this final specialization pass is sequential, // TODO: for now this final specialization pass is sequential,
// with no parallelization at all. We should try to parallelize // with no parallelization at all. We should try to parallelize
// this, but doing so will require a redesign of Procs. // this, but doing so will require a redesign of Procs.
procs = roc_mono::ir::specialize_all(&mut mono_env, procs, &mut layout_cache); procs = roc_mono::ir::specialize_all(
&mut mono_env,
procs,
specializations_we_must_make,
&mut layout_cache,
);
let external_specializations_requested = procs.externals_we_need.clone(); let external_specializations_requested = procs.externals_we_need.clone();
let procedures = procs.get_specialized_procs_without_rc(mono_env.arena); let procedures = procs.get_specialized_procs_without_rc(mono_env.arena);

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

@ -289,7 +289,6 @@ pub struct Procs<'a> {
pub specialized: BumpMap<(Symbol, Layout<'a>), InProgressProc<'a>>, pub specialized: BumpMap<(Symbol, Layout<'a>), InProgressProc<'a>>,
pub runtime_errors: BumpMap<Symbol, &'a str>, pub runtime_errors: BumpMap<Symbol, &'a str>,
pub call_by_pointer_wrappers: BumpMap<Symbol, Symbol>, pub call_by_pointer_wrappers: BumpMap<Symbol, Symbol>,
pub externals_others_need: ExternalSpecializations<'a>,
pub externals_we_need: BumpMap<ModuleId, ExternalSpecializations<'a>>, pub externals_we_need: BumpMap<ModuleId, ExternalSpecializations<'a>>,
} }
@ -304,7 +303,6 @@ impl<'a> Procs<'a> {
runtime_errors: BumpMap::new_in(arena), runtime_errors: BumpMap::new_in(arena),
call_by_pointer_wrappers: BumpMap::new_in(arena), call_by_pointer_wrappers: BumpMap::new_in(arena),
externals_we_need: BumpMap::new_in(arena), externals_we_need: BumpMap::new_in(arena),
externals_others_need: ExternalSpecializations::new_in(arena),
} }
} }
} }
@ -1634,9 +1632,10 @@ fn pattern_to_when<'a>(
pub fn specialize_all<'a>( pub fn specialize_all<'a>(
env: &mut Env<'a, '_>, env: &mut Env<'a, '_>,
mut procs: Procs<'a>, mut procs: Procs<'a>,
externals_others_need: ExternalSpecializations<'a>,
layout_cache: &mut LayoutCache<'a>, layout_cache: &mut LayoutCache<'a>,
) -> Procs<'a> { ) -> Procs<'a> {
specialize_all_help(env, &mut procs, layout_cache); specialize_all_help(env, &mut procs, externals_others_need, layout_cache);
// When calling from_can, pending_specializations should be unavailable. // When calling from_can, pending_specializations should be unavailable.
// This must be a single pass, and we must not add any more entries to it! // This must be a single pass, and we must not add any more entries to it!
@ -1707,11 +1706,12 @@ pub fn specialize_all<'a>(
fn specialize_all_help<'a>( fn specialize_all_help<'a>(
env: &mut Env<'a, '_>, env: &mut Env<'a, '_>,
procs: &mut Procs<'a>, procs: &mut Procs<'a>,
externals_others_need: ExternalSpecializations<'a>,
layout_cache: &mut LayoutCache<'a>, layout_cache: &mut LayoutCache<'a>,
) { ) {
let mut symbol_solved_type = Vec::new_in(env.arena); let mut symbol_solved_type = Vec::new_in(env.arena);
for (symbol, solved_types) in procs.externals_others_need.specs.iter() { for (symbol, solved_types) in externals_others_need.specs.iter() {
// for some unclear reason, the MutSet does not deduplicate according to the hash // for some unclear reason, the MutSet does not deduplicate according to the hash
// instance. So we do it manually here // instance. So we do it manually here
let mut as_vec: std::vec::Vec<_> = solved_types.iter().collect(); let mut as_vec: std::vec::Vec<_> = solved_types.iter().collect();