language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-04 12:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

load world abilities sooner

Browse source
This commit is contained in:
Brendan Hansknecht 2023-12-02 13:05:24 -08:00
parent 5e8974177c
commit be17c0cadb
No known key found for this signature in database
GPG key ID: 0EA784685083E75B
3 changed files with 36 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

43
crates/compiler/load_internal/src/file.rs
View file

@ -371,6 +371,18 @@ fn start_phase<'a>(
checkmate: _,
} = typechecked;
let our_exposed_types = state
.exposed_types
.get(&module_id)
.unwrap_or_else(|| internal_error!("Exposed types for {:?} missing", module_id))
.clone();
state.world_abilities.insert(
module_id,
abilities_store.clone(),
our_exposed_types.exposed_types_storage_subs,
);
let mut imported_module_thunks = bumpalo::collections::Vec::new_in(arena);
if let Some(imports) = state.module_cache.imports.get(&module_id) {
@ -397,7 +409,7 @@ fn start_phase<'a>(
decls,
ident_ids,
exposed_to_host: state.exposed_to_host.clone(),
abilities_store,
world_abilities: state.world_abilities.clone_ref(),
// TODO: awful, how can we get rid of the clone?
exposed_by_module: state.exposed_types.clone(),
derived_module,
@ -457,23 +469,8 @@ fn start_phase<'a>(
procs_base,
layout_cache,
module_timing,
abilities_store,
expectations,
} = found_specializations;
let our_exposed_types = state
.exposed_types
.get(&module_id)
.unwrap_or_else(|| {
internal_error!("Exposed types for {:?} missing", module_id)
})
.clone();
// Add our abilities to the world.
state.world_abilities.insert(
module_id,
abilities_store,
our_exposed_types.exposed_types_storage_subs,
);
(
ident_ids,
@ -598,7 +595,6 @@ enum Msg<'a> {
procs_base: ProcsBase<'a>,
solved_subs: Solved<Subs>,
module_timing: ModuleTiming,
abilities_store: AbilitiesStore,
toplevel_expects: ToplevelExpects,
expectations: Option<Expectations>,
},
@ -906,7 +902,7 @@ enum BuildTask<'a> {
decls: Declarations,
exposed_to_host: ExposedToHost,
exposed_by_module: ExposedByModule,
abilities_store: AbilitiesStore,
world_abilities: WorldAbilities,
derived_module: SharedDerivedModule,
expectations: Option<Expectations>,
build_expects: bool,
@ -2730,7 +2726,6 @@ fn update<'a>(
ident_ids,
layout_cache,
module_timing,
abilities_store,
toplevel_expects,
expectations,
} => {
@ -2754,7 +2749,6 @@ fn update<'a>(
procs_base,
subs,
module_timing,
abilities_store,
expectations,
};
@ -5705,7 +5699,7 @@ fn build_pending_specializations<'a>(
target_info: TargetInfo,
exposed_to_host: ExposedToHost,
exposed_by_module: &ExposedByModule,
abilities_store: AbilitiesStore,
world_abilities: WorldAbilities,
derived_module: SharedDerivedModule,
mut expectations: Option<Expectations>,
build_expects: bool,
@ -5738,7 +5732,7 @@ fn build_pending_specializations<'a>(
// NB: for getting pending specializations the module view is enough because we only need
// to know the types and abilities in our modules. Only for building *all* specializations
// do we need a global view.
abilities: AbilitiesView::Module(&abilities_store),
abilities: AbilitiesView::World(&world_abilities),
exposed_by_module,
derived_module: &derived_module,
struct_indexing: UsageTrackingMap::default(),
@ -6138,7 +6132,6 @@ fn build_pending_specializations<'a>(
layout_cache,
procs_base,
module_timing,
abilities_store,
toplevel_expects,
expectations,
}
@ -6378,7 +6371,7 @@ fn run_task<'a>(
solved_subs,
imported_module_thunks,
exposed_to_host,
abilities_store,
world_abilities,
exposed_by_module,
derived_module,
expectations,
@ -6395,7 +6388,7 @@ fn run_task<'a>(
target_info,
exposed_to_host,
&exposed_by_module,
abilities_store,
world_abilities,
derived_module,
expectations,
build_expects,

1
crates/compiler/load_internal/src/module.rs
View file

@ -144,7 +144,6 @@ pub(crate) struct FoundSpecializationsModule<'a> {
pub(crate) procs_base: ProcsBase<'a>,
pub(crate) subs: Subs,
pub(crate) module_timing: ModuleTiming,
pub(crate) abilities_store: AbilitiesStore,
pub(crate) expectations: Option<Expectations>,
}

36
crates/compiler/uitest/tests/ability/specialize/inspect/opaque_automatic_late.txt
View file

@ -12,43 +12,43 @@ main =
# -emit:mono
procedure Inspect.251 (Inspect.252):
let Inspect.317 : Str = "<opaque>";
let Inspect.316 : Str = CallByName Inspect.61 Inspect.252 Inspect.317;
ret Inspect.316;
let Inspect.314 : Str = "<opaque>";
let Inspect.313 : Str = CallByName Inspect.61 Inspect.252 Inspect.314;
ret Inspect.313;
procedure Inspect.30 (Inspect.147):
ret Inspect.147;
procedure Inspect.31 (Inspect.305, Inspect.149):
let Inspect.307 : Str = CallByName Inspect.251 Inspect.149;
ret Inspect.307;
procedure Inspect.35 (Inspect.300):
ret Inspect.300;
procedure Inspect.36 (Inspect.304):
let Inspect.311 : Str = "";
ret Inspect.311;
let Inspect.309 : Str = "";
ret Inspect.309;
procedure Inspect.45 (Inspect.302):
let Inspect.314 : {} = Struct {};
let Inspect.313 : {} = CallByName Inspect.30 Inspect.314;
ret Inspect.313;
procedure Inspect.5 (Inspect.150):
let Inspect.312 : {} = CallByName Inspect.45 Inspect.150;
let Inspect.309 : {} = Struct {};
let Inspect.308 : Str = CallByName Inspect.36 Inspect.309;
let Inspect.307 : Str = CallByName Inspect.251 Inspect.308;
ret Inspect.307;
let Inspect.311 : {} = Struct {};
let Inspect.310 : {} = CallByName Inspect.30 Inspect.311;
ret Inspect.310;
procedure Inspect.61 (Inspect.303, Inspect.298):
let Inspect.319 : Str = CallByName Str.3 Inspect.303 Inspect.298;
let Inspect.316 : Str = CallByName Str.3 Inspect.303 Inspect.298;
dec Inspect.298;
ret Inspect.319;
ret Inspect.316;
procedure Str.3 (#Attr.2, #Attr.3):
let Str.292 : Str = lowlevel StrConcat #Attr.2 #Attr.3;
ret Str.292;
procedure Test.2 (Test.3):
let Test.8 : Str = CallByName Inspect.5 Test.3;
let Test.9 : {} = CallByName Inspect.45 Test.3;
let Test.11 : {} = Struct {};
let Test.10 : Str = CallByName Inspect.36 Test.11;
let Test.8 : Str = CallByName Inspect.31 Test.9 Test.10;
let Test.4 : Str = CallByName Inspect.35 Test.8;
dbg Test.4;
dec Test.4;