language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge #10701

Browse source 
10701: internal: Cache ast::MacroCalls to their expansions in Semantics::descend_into_macros_impl r=Veykril a=Veykril

Saves ~45ms when highlighting `rust-analyzer/src/config.rs` for me
bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-11-05 13:26:56 +00:00 • committed by GitHub
commit d1e449e313
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/hir/src/semantics.rs
View file

@ -121,7 +121,10 @@ pub struct SemanticsImpl<'db> {
pub db: &'db dyn HirDatabase, pub db: &'db dyn HirDatabase,
s2d_cache: RefCell<SourceToDefCache>, s2d_cache: RefCell<SourceToDefCache>,
expansion_info_cache: RefCell<FxHashMap<HirFileId, Option<ExpansionInfo>>>, expansion_info_cache: RefCell<FxHashMap<HirFileId, Option<ExpansionInfo>>>,
// Rootnode to HirFileId cache
cache: RefCell<FxHashMap<SyntaxNode, HirFileId>>, cache: RefCell<FxHashMap<SyntaxNode, HirFileId>>,
// MacroCall to its expansion's HirFileId cache
macro_call_cache: RefCell<FxHashMap<InFile<ast::MacroCall>, HirFileId>>,
} }
impl<DB> fmt::Debug for Semantics<'_, DB> { impl<DB> fmt::Debug for Semantics<'_, DB> {
@ -396,6 +399,7 @@ impl<'db> SemanticsImpl<'db> {
s2d_cache: Default::default(), s2d_cache: Default::default(),
cache: Default::default(), cache: Default::default(),
expansion_info_cache: Default::default(), expansion_info_cache: Default::default(),
macro_call_cache: Default::default(),
} }
} }
@ -554,6 +558,7 @@ impl<'db> SemanticsImpl<'db> {
let sa = self.analyze(&parent); let sa = self.analyze(&parent);
let mut stack: SmallVec<[_; 1]> = smallvec![InFile::new(sa.file_id, token)]; let mut stack: SmallVec<[_; 1]> = smallvec![InFile::new(sa.file_id, token)];
let mut cache = self.expansion_info_cache.borrow_mut(); let mut cache = self.expansion_info_cache.borrow_mut();
let mut mcache = self.macro_call_cache.borrow_mut();
let mut process_expansion_for_token = let mut process_expansion_for_token =
|stack: &mut SmallVec<_>, file_id, item, token: InFile<&_>| { |stack: &mut SmallVec<_>, file_id, item, token: InFile<&_>| {
@ -582,14 +587,10 @@ impl<'db> SemanticsImpl<'db> {
let was_not_remapped = (|| { let was_not_remapped = (|| {
// are we inside an attribute macro call // are we inside an attribute macro call
let containing_attribute_macro_call = self.with_ctx(|ctx| { let containing_attribute_macro_call = self.with_ctx(|ctx| {
token token.value.ancestors().filter_map(ast::Item::cast).find_map(|item| {
.value // investigate this, seems to be VERY(250ms) expensive in rust-analyzer/src/config.rs?
.ancestors()
.filter_map(ast::Item::cast)
.filter_map(|item| {
Some((ctx.item_to_macro_call(token.with_value(item.clone()))?, item)) Some((ctx.item_to_macro_call(token.with_value(item.clone()))?, item))
}) })
.last()
}); });
if let Some((call_id, item)) = containing_attribute_macro_call { if let Some((call_id, item)) = containing_attribute_macro_call {
let file_id = call_id.as_file(); let file_id = call_id.as_file();
@ -616,7 +617,15 @@ impl<'db> SemanticsImpl<'db> {
return None; return None;
} }
let file_id = sa.expand(self.db, token.with_value(&macro_call))?; let mcall = token.with_value(macro_call);
let file_id = match mcache.get(&mcall) {
Some(&it) => it,
None => {
let it = sa.expand(self.db, mcall.as_ref())?;
mcache.insert(mcall, it);
it
}
};
return process_expansion_for_token(&mut stack, file_id, None, token.as_ref()); return process_expansion_for_token(&mut stack, file_id, None, token.as_ref());
} }