bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #115082 - Zoxc:syntax-context-decode-race, r=cjgillot

Browse source 
Fix races conditions with `SyntaxContext` decoding

This changes `SyntaxContext` decoding to work with concurrent decoding. The `remapped_ctxts` field now only stores `SyntaxContext` which have completed decoding, while the new `decoding` and `local_in_progress` keeps track of `SyntaxContext`s which are in process of being decoding and on which threads.

This fixes 2 issues with the current implementation. It can return an `SyntaxContext` which contains dummy data if another thread starts decoding before the first one has completely finished. Multiple threads could also allocate multiple `SyntaxContext`s for the same `raw_id`.
This commit is contained in:
bors 2023-08-24 17:43:02 +00:00
commit b60e31b673
2 changed files with 91 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_data_structures/src/sync/worker_local.rs
View file

@ -171,3 +171,9 @@ impl<T> Deref for WorkerLocal<T> {
unsafe { &self.locals.get_unchecked(self.registry.id().verify()).0 }
}
}
impl<T: Default> Default for WorkerLocal<T> {
fn default() -> Self {
WorkerLocal::new(|_| T::default())
}
}