Skip to content

Commit c5a5c93

Browse files
VeykrilVeykril
committed
Cache file_to_def in SourceToDefCtx 
1 parent 9876913 commit c5a5c93

File tree

2 files changed

+40
-28
lines changed

2 files changed

+40
-28
lines changed

‎src/tools/rust-analyzer/crates/hir/src/semantics.rs

+10-6
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ pub struct Semantics<'db, DB> {
129129

130130
pub struct SemanticsImpl<'db> {
131131
pub db: &'db dyn HirDatabase,
132-
s2d_cache: RefCell<(SourceToDefCache, FxHashMap<MacroFileId, hir_expand::ExpansionInfo>)>,
132+
s2d_cache: RefCell<SourceToDefCache>,
133133
/// Rootnode to HirFileId cache
134134
root_to_file_cache: RefCell<FxHashMap<SyntaxNode, HirFileId>>,
135135
/// MacroCall to its expansion's MacroFileId cache
@@ -719,7 +719,8 @@ impl<'db> SemanticsImpl<'db> {
719719
let macro_file = invoc.as_macro_file();
720720
let expansion_info = {
721721
self.with_ctx(|ctx| {
722-
ctx.expansion_info_cache
722+
ctx.cache
723+
.expansion_info_cache
723724
.entry(macro_file)
724725
.or_insert_with(|| {
725726
let exp_info = macro_file.expansion_info(self.db.upcast());
@@ -806,7 +807,8 @@ impl<'db> SemanticsImpl<'db> {
806807
let process_expansion_for_token = |stack: &mut Vec<_>, macro_file| {
807808
let InMacroFile { file_id, value: mapped_tokens } = self.with_ctx(|ctx| {
808809
Some(
809-
ctx.expansion_info_cache
810+
ctx.cache
811+
.expansion_info_cache
810812
.entry(macro_file)
811813
.or_insert_with(|| {
812814
let exp_info = macro_file.expansion_info(self.db.upcast());
@@ -1086,6 +1088,7 @@ impl<'db> SemanticsImpl<'db> {
10861088

10871089
self.with_ctx(|ctx| {
10881090
let expansion_info = ctx
1091+
.cache
10891092
.expansion_info_cache
10901093
.entry(macro_file)
10911094
.or_insert_with(|| macro_file.expansion_info(self.db.upcast()));
@@ -1364,8 +1367,7 @@ impl<'db> SemanticsImpl<'db> {
13641367
}
13651368

13661369
fn with_ctx<F: FnOnce(&mut SourceToDefCtx<'_, '_>) -> T, T>(&self, f: F) -> T {
1367-
let (dynmap_cache, expansion_info_cache) = &mut *self.s2d_cache.borrow_mut();
1368-
let mut ctx = SourceToDefCtx { db: self.db, dynmap_cache, expansion_info_cache };
1370+
let mut ctx = SourceToDefCtx { db: self.db, cache: &mut self.s2d_cache.borrow_mut() };
13691371
f(&mut ctx)
13701372
}
13711373

@@ -1375,7 +1377,7 @@ impl<'db> SemanticsImpl<'db> {
13751377
}
13761378

13771379
fn file_to_module_defs(&self, file: FileId) -> impl Iterator<Item = Module> {
1378-
self.with_ctx(|ctx| ctx.file_to_def(file)).into_iter().map(Module::from)
1380+
self.with_ctx(|ctx| ctx.file_to_def(file).to_owned()).into_iter().map(Module::from)
13791381
}
13801382

13811383
pub fn scope(&self, node: &SyntaxNode) -> Option<SemanticsScope<'db>> {
@@ -1653,6 +1655,7 @@ fn macro_call_to_macro_id(
16531655
}
16541656
HirFileIdRepr::MacroFile(macro_file) => {
16551657
let expansion_info = ctx
1658+
.cache
16561659
.expansion_info_cache
16571660
.entry(macro_file)
16581661
.or_insert_with(|| macro_file.expansion_info(ctx.db.upcast()));
@@ -1668,6 +1671,7 @@ fn macro_call_to_macro_id(
16681671
}
16691672
HirFileIdRepr::MacroFile(macro_file) => {
16701673
let expansion_info = ctx
1674+
.cache
16711675
.expansion_info_cache
16721676
.entry(macro_file)
16731677
.or_insert_with(|| macro_file.expansion_info(ctx.db.upcast()));

‎src/tools/rust-analyzer/crates/hir/src/semantics/source_to_def.rs

+30-22
Original file line numberDiff line numberDiff line change
@@ -112,31 +112,37 @@ use syntax::{
112112

113113
use crate::{db::HirDatabase, InFile};
114114

115-
pub(super) type SourceToDefCache = FxHashMap<(ChildContainer, HirFileId), DynMap>;
115+
#[derive(Default)]
116+
pub(super) struct SourceToDefCache {
117+
pub(super) dynmap_cache: FxHashMap<(ChildContainer, HirFileId), DynMap>,
118+
pub(super) expansion_info_cache: FxHashMap<MacroFileId, ExpansionInfo>,
119+
pub(super) file_to_def_cache: FxHashMap<FileId, SmallVec<[ModuleId; 1]>>,
120+
}
116121

117-
pub(super) struct SourceToDefCtx<'a, 'dyn_cache> {
118-
pub(super) db: &'a dyn HirDatabase,
119-
pub(super) dynmap_cache: &'dyn_cache mut SourceToDefCache,
120-
pub(super) expansion_info_cache: &'a mut FxHashMap<MacroFileId, ExpansionInfo>,
122+
pub(super) struct SourceToDefCtx<'db, 'cache> {
123+
pub(super) db: &'db dyn HirDatabase,
124+
pub(super) cache: &'cache mut SourceToDefCache,
121125
}
122126

123127
impl SourceToDefCtx<'_, '_> {
124-
pub(super) fn file_to_def(&self, file: FileId) -> SmallVec<[ModuleId; 1]> {
128+
pub(super) fn file_to_def(&mut self, file: FileId) -> &SmallVec<[ModuleId; 1]> {
125129
let _p = tracing::span!(tracing::Level::INFO, "SourceToDefCtx::file_to_def").entered();
126-
let mut mods = SmallVec::new();
127-
for &crate_id in self.db.relevant_crates(file).iter() {
128-
// Note: `mod` declarations in block modules cannot be supported here
129-
let crate_def_map = self.db.crate_def_map(crate_id);
130-
mods.extend(
131-
crate_def_map
132-
.modules_for_file(file)
133-
.map(|local_id| crate_def_map.module_id(local_id)),
134-
)
135-
}
136-
if mods.is_empty() {
137-
// FIXME: detached file
138-
}
139-
mods
130+
self.cache.file_to_def_cache.entry(file).or_insert_with(|| {
131+
let mut mods = SmallVec::new();
132+
for &crate_id in self.db.relevant_crates(file).iter() {
133+
// Note: `mod` declarations in block modules cannot be supported here
134+
let crate_def_map = self.db.crate_def_map(crate_id);
135+
mods.extend(
136+
crate_def_map
137+
.modules_for_file(file)
138+
.map(|local_id| crate_def_map.module_id(local_id)),
139+
)
140+
}
141+
if mods.is_empty() {
142+
// FIXME: detached file
143+
}
144+
mods
145+
})
140146
}
141147

142148
pub(super) fn module_to_def(&mut self, src: InFile<&ast::Module>) -> Option<ModuleId> {
@@ -166,7 +172,7 @@ impl SourceToDefCtx<'_, '_> {
166172
Some(def_map.module_id(child_id))
167173
}
168174

169-
pub(super) fn source_file_to_def(&self, src: InFile<&ast::SourceFile>) -> Option<ModuleId> {
175+
pub(super) fn source_file_to_def(&mut self, src: InFile<&ast::SourceFile>) -> Option<ModuleId> {
170176
let _p = tracing::span!(tracing::Level::INFO, "source_file_to_def").entered();
171177
let file_id = src.file_id.original_file(self.db.upcast());
172178
self.file_to_def(file_id).first().copied()
@@ -325,7 +331,8 @@ impl SourceToDefCtx<'_, '_> {
325331

326332
fn cache_for(&mut self, container: ChildContainer, file_id: HirFileId) -> &DynMap {
327333
let db = self.db;
328-
self.dynmap_cache
334+
self.cache
335+
.dynmap_cache
329336
.entry((container, file_id))
330337
.or_insert_with(|| container.child_by_source(db, file_id))
331338
}
@@ -421,6 +428,7 @@ impl SourceToDefCtx<'_, '_> {
421428
let macro_file = node.file_id.macro_file()?;
422429

423430
let expansion_info = this
431+
.cache
424432
.expansion_info_cache
425433
.entry(macro_file)
426434
.or_insert_with(|| macro_file.expansion_info(this.db.upcast()));

0 commit comments

Comments
 (0)