Skip to content

Commit

Permalink
fix: Fix semantics not always correctly caching file roots
Browse files Browse the repository at this point in the history
  • Loading branch information
@Veykril
Veykril committed Jan 15, 2025
1 parent d82e1a2 commit f8ce31f
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 34 deletions.
33 changes: 14 additions & 19 deletions crates/hir/src/semantics.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,6 @@ pub struct Semantics<'db, DB> {
pub struct SemanticsImpl<'db> {
pub db: &'db dyn HirDatabase,
s2d_cache: RefCell<SourceToDefCache>,
/// Rootnode to HirFileId cache
root_to_file_cache: RefCell<FxHashMap<SyntaxNode, HirFileId>>,
/// MacroCall to its expansion's MacroFileId cache
macro_call_cache: RefCell<FxHashMap<InFile<ast::MacroCall>, MacroFileId>>,
}
Expand Down Expand Up @@ -304,12 +302,7 @@ impl<DB: HirDatabase> Semantics<'_, DB> {

impl<'db> SemanticsImpl<'db> {
fn new(db: &'db dyn HirDatabase) -> Self {
SemanticsImpl {
db,
s2d_cache: Default::default(),
root_to_file_cache: Default::default(),
macro_call_cache: Default::default(),
}
SemanticsImpl { db, s2d_cache: Default::default(), macro_call_cache: Default::default() }
}

pub fn parse(&self, file_id: EditionedFileId) -> ast::SourceFile {
Expand Down Expand Up @@ -962,7 +955,7 @@ impl<'db> SemanticsImpl<'db> {
let InMacroFile { file_id, value: mapped_tokens } = self.with_ctx(|ctx| {
Some(
ctx.cache
.get_or_insert_expansion(self, macro_file)
.get_or_insert_expansion(self.db, macro_file)
.map_range_down(span)?
.map(SmallVec::<[_; 2]>::from_iter),
)
Expand Down Expand Up @@ -1287,7 +1280,7 @@ impl<'db> SemanticsImpl<'db> {
let macro_file = file_id.macro_file()?;

self.with_ctx(|ctx| {
let expansion_info = ctx.cache.get_or_insert_expansion(self, macro_file);
let expansion_info = ctx.cache.get_or_insert_expansion(self.db, macro_file);
expansion_info.arg().map(|node| node?.parent()).transpose()
})
}
Expand Down Expand Up @@ -1725,19 +1718,20 @@ impl<'db> SemanticsImpl<'db> {
}

fn cache(&self, root_node: SyntaxNode, file_id: HirFileId) {
assert!(root_node.parent().is_none());
let mut cache = self.root_to_file_cache.borrow_mut();
let prev = cache.insert(root_node, file_id);
assert!(prev.is_none() || prev == Some(file_id));
SourceToDefCache::cache(
&mut self.s2d_cache.borrow_mut().root_to_file_cache,
root_node,
file_id,
);
}

pub fn assert_contains_node(&self, node: &SyntaxNode) {
self.find_file(node);
}

fn lookup(&self, root_node: &SyntaxNode) -> Option<HirFileId> {
let cache = self.root_to_file_cache.borrow();
cache.get(root_node).copied()
let cache = self.s2d_cache.borrow();
cache.root_to_file_cache.get(root_node).copied()
}

fn wrap_node_infile<N: AstNode>(&self, node: N) -> InFile<N> {
Expand All @@ -1761,8 +1755,9 @@ impl<'db> SemanticsImpl<'db> {
known nodes: {}\n\n",
node,
root_node,
self.root_to_file_cache
self.s2d_cache
.borrow()
.root_to_file_cache
.keys()
.map(|it| format!("{it:?}"))
.collect::<Vec<_>>()
Expand Down Expand Up @@ -1925,7 +1920,7 @@ fn macro_call_to_macro_id(
it.to_ptr(db).to_node(&db.parse(file_id).syntax_node())
}
HirFileIdRepr::MacroFile(macro_file) => {
let expansion_info = ctx.cache.get_or_insert_expansion(sema, macro_file);
let expansion_info = ctx.cache.get_or_insert_expansion(sema.db, macro_file);
it.to_ptr(db).to_node(&expansion_info.expanded().value)
}
};
Expand All @@ -1937,7 +1932,7 @@ fn macro_call_to_macro_id(
it.to_ptr(db).to_node(&db.parse(file_id).syntax_node())
}
HirFileIdRepr::MacroFile(macro_file) => {
let expansion_info = ctx.cache.get_or_insert_expansion(sema, macro_file);
let expansion_info = ctx.cache.get_or_insert_expansion(sema.db, macro_file);
it.to_ptr(db).to_node(&expansion_info.expanded().value)
}
};
Expand Down
32 changes: 17 additions & 15 deletions crates/hir/src/semantics/source_to_def.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,20 +110,29 @@ use syntax::{
AstNode, AstPtr, SyntaxNode,
};

use crate::{
db::HirDatabase, semantics::child_by_source::ChildBySource, InFile, InlineAsmOperand,
SemanticsImpl,
};
use crate::{db::HirDatabase, semantics::child_by_source::ChildBySource, InFile, InlineAsmOperand};

#[derive(Default)]
pub(super) struct SourceToDefCache {
pub(super) dynmap_cache: FxHashMap<(ChildContainer, HirFileId), DynMap>,
expansion_info_cache: FxHashMap<MacroFileId, ExpansionInfo>,
pub(super) file_to_def_cache: FxHashMap<FileId, SmallVec<[ModuleId; 1]>>,
pub(super) included_file_cache: FxHashMap<EditionedFileId, Option<MacroFileId>>,
/// Rootnode to HirFileId cache
pub(super) root_to_file_cache: FxHashMap<SyntaxNode, HirFileId>,
}

impl SourceToDefCache {
pub(super) fn cache(
root_to_file_cache: &mut FxHashMap<SyntaxNode, HirFileId>,
root_node: SyntaxNode,
file_id: HirFileId,
) {
assert!(root_node.parent().is_none());
let prev = root_to_file_cache.insert(root_node, file_id);
assert!(prev.is_none() || prev == Some(file_id));
}

pub(super) fn get_or_insert_include_for(
&mut self,
db: &dyn HirDatabase,
Expand All @@ -143,14 +152,14 @@ impl SourceToDefCache {

pub(super) fn get_or_insert_expansion(
&mut self,
sema: &SemanticsImpl<'_>,
db: &dyn HirDatabase,
macro_file: MacroFileId,
) -> &ExpansionInfo {
self.expansion_info_cache.entry(macro_file).or_insert_with(|| {
let exp_info = macro_file.expansion_info(sema.db.upcast());
let exp_info = macro_file.expansion_info(db.upcast());

let InMacroFile { file_id, value } = exp_info.expanded();
sema.cache(value, file_id.into());
Self::cache(&mut self.root_to_file_cache, value, file_id.into());

exp_info
})
Expand Down Expand Up @@ -520,18 +529,11 @@ impl SourceToDefCtx<'_, '_> {
node: InFile<&SyntaxNode>,
mut cb: impl FnMut(&mut Self, InFile<SyntaxNode>) -> Option<T>,
) -> Option<T> {
use hir_expand::MacroFileIdExt;
let parent = |this: &mut Self, node: InFile<&SyntaxNode>| match node.value.parent() {
Some(parent) => Some(node.with_value(parent)),
None => {
let macro_file = node.file_id.macro_file()?;

let expansion_info = this
.cache
.expansion_info_cache
.entry(macro_file)
.or_insert_with(|| macro_file.expansion_info(this.db.upcast()));

let expansion_info = this.cache.get_or_insert_expansion(this.db, macro_file);
expansion_info.arg().map(|node| node?.parent()).transpose()
}
};
Expand Down

0 comments on commit f8ce31f

Please sign in to comment.