diff options
| author | bors <bors@rust-lang.org> | 2023-02-22 08:44:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-02-22 08:44:30 +0000 |
| commit | bd4a96a12d0bf6dc12edf20a45df3a33052c9d7d (patch) | |
| tree | ed3ba2827ca35cc6c3da1d26b1de65fc63799745 /compiler/rustc_session/src | |
| parent | f9216b75646cde0c4c69ae00232778a47fc893d3 (diff) | |
| parent | decfb4d123651a0673db47542e18ca60d1c501ac (diff) | |
| download | rust-bd4a96a12d0bf6dc12edf20a45df3a33052c9d7d.tar.gz rust-bd4a96a12d0bf6dc12edf20a45df3a33052c9d7d.zip | |
Auto merge of #108300 - oli-obk:elsa, r=eholk
Use a lock-free datastructure for source_span follow up to the perf regression in https://github.com/rust-lang/rust/pull/105462 The main regression is likely the CStore, but let's evaluate the perf impact of this on its own
Diffstat (limited to 'compiler/rustc_session/src')
| -rw-r--r-- | compiler/rustc_session/src/cstore.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/rustc_session/src/cstore.rs b/compiler/rustc_session/src/cstore.rs index 97aa930b5ec..868ffdf0f1d 100644 --- a/compiler/rustc_session/src/cstore.rs +++ b/compiler/rustc_session/src/cstore.rs @@ -6,10 +6,9 @@ use crate::search_paths::PathKind; use crate::utils::NativeLibKind; use crate::Session; use rustc_ast as ast; -use rustc_data_structures::sync::{self, MetadataRef, RwLock}; +use rustc_data_structures::sync::{self, AppendOnlyVec, MetadataRef, RwLock}; use rustc_hir::def_id::{CrateNum, DefId, LocalDefId, StableCrateId, LOCAL_CRATE}; use rustc_hir::definitions::{DefKey, DefPath, DefPathHash, Definitions}; -use rustc_index::vec::IndexVec; use rustc_span::hygiene::{ExpnHash, ExpnId}; use rustc_span::symbol::Symbol; use rustc_span::Span; @@ -252,10 +251,9 @@ pub trait CrateStore: std::fmt::Debug { pub type CrateStoreDyn = dyn CrateStore + sync::Sync + sync::Send; -#[derive(Debug)] pub struct Untracked { pub cstore: RwLock<Box<CrateStoreDyn>>, /// Reference span for definitions. - pub source_span: RwLock<IndexVec<LocalDefId, Span>>, + pub source_span: AppendOnlyVec<LocalDefId, Span>, pub definitions: RwLock<Definitions>, } |
