bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Always use parking_lot's RwLock, even without parallel compiler

Browse source
This commit is contained in:
Oli Scherer 2023-07-31 09:50:44 +00:00
parent b321edd1b2
commit 3eb5733ed4
1 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

28
compiler/rustc_data_structures/src/sync/vec.rs
View file

@ -43,37 +43,23 @@ impl<I: Idx, T: Copy> AppendOnlyIndexVec<I, T> {
#[derive(Default)] #[derive(Default)]
pub struct AppendOnlyVec<T: Copy> { pub struct AppendOnlyVec<T: Copy> {
#[cfg(not(parallel_compiler))] vec: parking_lot::RwLock<Vec<T>>,
vec: elsa::vec::FrozenVec<T>,
#[cfg(parallel_compiler)]
vec: elsa::sync::LockFreeFrozenVec<T>,
} }
impl<T: Copy> AppendOnlyVec<T> { impl<T: Copy> AppendOnlyVec<T> {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self { vec: Default::default() }
#[cfg(not(parallel_compiler))]
vec: elsa::vec::FrozenVec::new(),
#[cfg(parallel_compiler)]
vec: elsa::sync::LockFreeFrozenVec::new(),
}
} }
pub fn push(&self, val: T) -> usize { pub fn push(&self, val: T) -> usize {
#[cfg(not(parallel_compiler))] let mut v = self.vec.write();
let i = self.vec.len(); let n = v.len();
#[cfg(not(parallel_compiler))] v.push(val);
self.vec.push(val); n
#[cfg(parallel_compiler)]
let i = self.vec.push(val);
i
} }
pub fn get(&self, i: usize) -> Option<T> { pub fn get(&self, i: usize) -> Option<T> {
#[cfg(not(parallel_compiler))] self.vec.read().get(i).copied()
return self.vec.get_copy(i);
#[cfg(parallel_compiler)]
return self.vec.get(i);
} }
pub fn iter_enumerated(&self) -> impl Iterator<Item = (usize, T)> + '_ { pub fn iter_enumerated(&self) -> impl Iterator<Item = (usize, T)> + '_ {