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

more bump

Browse source
This commit is contained in:
Folkert 2021-05-01 00:04:56 +02:00
parent 58ba5c09fd
commit 503d011c43
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@ use roc_builtins::std::StdLib;
use roc_can::constraint::Constraint; use roc_can::constraint::Constraint;
use roc_can::def::{Declaration, Def}; use roc_can::def::{Declaration, Def};
use roc_can::module::{canonicalize_module_defs, Module}; use roc_can::module::{canonicalize_module_defs, Module};
use roc_collections::all::{default_hasher, MutMap, MutSet}; use roc_collections::all::{default_hasher, BumpMap, MutMap, MutSet};
use roc_constrain::module::{ use roc_constrain::module::{
constrain_imports, pre_constrain_imports, ConstrainableImports, Import, constrain_imports, pre_constrain_imports, ConstrainableImports, Import,
}; };
@ -769,7 +769,7 @@ enum Msg<'a> {
module_id: ModuleId, module_id: ModuleId,
ident_ids: IdentIds, ident_ids: IdentIds,
layout_cache: LayoutCache<'a>, layout_cache: LayoutCache<'a>,
external_specializations_requested: MutMap<ModuleId, ExternalSpecializations>, external_specializations_requested: BumpMap<'a, ModuleId, ExternalSpecializations>,
procedures: MutMap<(Symbol, Layout<'a>), Proc<'a>>, procedures: MutMap<(Symbol, Layout<'a>), Proc<'a>>,
problems: Vec<roc_mono::ir::MonoProblem>, problems: Vec<roc_mono::ir::MonoProblem>,
module_timing: ModuleTiming, module_timing: ModuleTiming,

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

@ -276,29 +276,29 @@ impl ExternalSpecializations {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct Procs<'a> { pub struct Procs<'a> {
pub partial_procs: MutMap<Symbol, PartialProc<'a>>, pub partial_procs: BumpMap<'a, Symbol, PartialProc<'a>>,
pub imported_module_thunks: MutSet<Symbol>, pub imported_module_thunks: MutSet<Symbol>,
pub module_thunks: MutSet<Symbol>, pub module_thunks: MutSet<Symbol>,
pub pending_specializations: pub pending_specializations:
Option<MutMap<Symbol, MutMap<Layout<'a>, PendingSpecialization<'a>>>>, Option<MutMap<Symbol, MutMap<Layout<'a>, PendingSpecialization<'a>>>>,
pub specialized: MutMap<(Symbol, Layout<'a>), InProgressProc<'a>>, pub specialized: BumpMap<'a, (Symbol, Layout<'a>), InProgressProc<'a>>,
pub call_by_pointer_wrappers: MutMap<Symbol, Symbol>, pub runtime_errors: BumpMap<'a, Symbol, &'a str>,
pub runtime_errors: MutMap<Symbol, &'a str>, pub call_by_pointer_wrappers: BumpMap<'a, Symbol, Symbol>,
pub externals_others_need: ExternalSpecializations, pub externals_others_need: ExternalSpecializations,
pub externals_we_need: MutMap<ModuleId, ExternalSpecializations>, pub externals_we_need: BumpMap<'a, ModuleId, ExternalSpecializations>,
} }
impl<'a> Procs<'a> { impl<'a> Procs<'a> {
pub fn new_in(arena: &'a Bump) -> Self { pub fn new_in(arena: &'a Bump) -> Self {
Self { Self {
partial_procs: MutMap::default(), partial_procs: BumpMap::new_in(arena),
imported_module_thunks: MutSet::default(), imported_module_thunks: MutSet::default(),
module_thunks: MutSet::default(), module_thunks: MutSet::default(),
pending_specializations: Some(MutMap::default()), pending_specializations: Some(MutMap::default()),
specialized: MutMap::default(), specialized: BumpMap::new_in(arena),
runtime_errors: MutMap::default(), runtime_errors: BumpMap::new_in(arena),
call_by_pointer_wrappers: MutMap::default(), call_by_pointer_wrappers: BumpMap::new_in(arena),
externals_we_need: MutMap::default(), externals_we_need: BumpMap::new_in(arena),
externals_others_need: ExternalSpecializations::default(), externals_others_need: ExternalSpecializations::default(),
} }
} }
@ -5948,7 +5948,7 @@ fn add_needed_external<'a>(
name: Symbol, name: Symbol,
) { ) {
// call of a function that is not in this module // call of a function that is not in this module
use std::collections::hash_map::Entry::{Occupied, Vacant}; use hashbrown::hash_map::Entry::{Occupied, Vacant};
let existing = match procs.externals_we_need.entry(name.module_id()) { let existing = match procs.externals_we_need.entry(name.module_id()) {
Vacant(entry) => entry.insert(ExternalSpecializations::default()), Vacant(entry) => entry.insert(ExternalSpecializations::default()),