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

Fix interning bug with exposed symbols

Browse source
This commit is contained in:
Richard Feldman 2020-08-03 20:48:28 -04:00
parent 41a8875a4c
commit 6ba54c986f
1 changed files with 29 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -190,7 +190,7 @@ type IdentIdsByModule = MutMap<ModuleId, IdentIds>;
type MsgSender<'a> = Sender<Msg<'a>>; type MsgSender<'a> = Sender<Msg<'a>>;
/// Add a task to the queue, and notify all the listeners. /// Add a task to the queue, and notify all the listeners.
fn enqueue_task<'a, 'b>( fn enqueue_task<'a>(
injector: &Injector<BuildTask<'a>>, injector: &Injector<BuildTask<'a>>,
listeners: &[Sender<WorkerMsg>], listeners: &[Sender<WorkerMsg>],
task: BuildTask<'a>, task: BuildTask<'a>,
@ -372,18 +372,15 @@ pub fn load(
// Find a task - either from this thread's queue, // Find a task - either from this thread's queue,
// or from the main queue, or from another worker's // or from the main queue, or from another worker's
// queue - and run it. // queue - and run it.
match find_task(&worker, injector, stealers) { //
Some(task) => { // There might be no tasks to work on! That could
run_task(task, worker_arena, src_dir, msg_tx.clone(), stdlib) // happen if another thread is working on a task
.expect("Msg channel closed unexpectedly."); // which will later result in more tasks being
} // added. In that case, do nothing, and keep waiting
None => { // until we receive a Shutdown message.
// No tasks to work on! This might be because if let Some(task) = find_task(&worker, injector, stealers) {
// another thread is working on a task which run_task(task, worker_arena, src_dir, msg_tx.clone(), stdlib)
// will later result in more tasks being .expect("Msg channel closed unexpectedly.");
// added, so keep waiting until we receive
// a Shutdown message.
}
} }
} }
} }
@ -924,15 +921,12 @@ fn send_header<'a>(
.entry(home) .entry(home)
.or_insert_with(IdentIds::default); .or_insert_with(IdentIds::default);
// This can't possibly fail, because we just ensured it
// has an entry with this key.
let ident_ids = ident_ids_by_module.get_mut(&home).unwrap();
let mut imports_to_expose = Vec::with_capacity(imports.len());
// For each of our imports, add an entry to deps_by_name // For each of our imports, add an entry to deps_by_name
// //
// e.g. for `imports [ Foo.{ bar } ]`, add `Foo` to deps_by_name // e.g. for `imports [ Foo.{ bar } ]`, add `Foo` to deps_by_name
for (module_name, exposed, region) in imported.into_iter() { //
// Also build a list of imported_values_to_expose (like `bar` above.)
for (module_name, exposed_idents, region) in imported.into_iter() {
let cloned_module_name = module_name.clone(); let cloned_module_name = module_name.clone();
let module_id = module_ids.get_or_insert(&module_name.into()); let module_id = module_ids.get_or_insert(&module_name.into());
@ -940,18 +934,26 @@ fn send_header<'a>(
imported_modules.insert(module_id); imported_modules.insert(module_id);
imports_to_expose.push((module_id, exposed, region)); // Add the new exposed idents to the dep module's IdentIds, so
} // once that module later gets loaded, its lookups will resolve
// to the same symbols as the ones we're using here.
let ident_ids = ident_ids_by_module
.entry(module_id)
.or_insert_with(IdentIds::default);
// For each of our imports, add any exposed values to scope. for ident in exposed_idents {
// let ident_id = ident_ids.get_or_insert(ident.as_inline_str());
// e.g. for `imports [ Foo.{ bar } ]`, add `bar` to scope. let symbol = Symbol::new(module_id, ident_id);
for (module_id, exposed, region) in imports_to_expose.into_iter() {
if !exposed.is_empty() { // Since this value is exposed, add it to our module's default scope.
add_exposed_to_scope(module_id, &mut scope, exposed, ident_ids, region); debug_assert!(!scope.contains_key(&ident.clone()));
scope.insert(ident, (symbol, region));
} }
} }
let ident_ids = ident_ids_by_module.get_mut(&home).unwrap();
// Generate IdentIds entries for all values this module exposes. // Generate IdentIds entries for all values this module exposes.
// This way, when we encounter them in Defs later, they already // This way, when we encounter them in Defs later, they already
// have an IdentIds entry. // have an IdentIds entry.
@ -1002,24 +1004,6 @@ fn send_header<'a>(
) )
} }
fn add_exposed_to_scope(
module_id: ModuleId,
scope: &mut MutMap<Ident, (Symbol, Region)>,
exposed: Vec<Ident>,
ident_ids: &mut IdentIds,
region: Region,
) {
for ident in exposed {
// Since this value is exposed, add it to our module's default scope.
debug_assert!(!scope.contains_key(&ident.clone()));
let ident_id = ident_ids.add(ident.clone().into());
let symbol = Symbol::new(module_id, ident_id);
scope.insert(ident, (symbol, region));
}
}
impl<'a> BuildTask<'a> { impl<'a> BuildTask<'a> {
// TODO trim down these arguments - possibly by moving Constraint into Module // TODO trim down these arguments - possibly by moving Constraint into Module
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]