Unnamed repository; edit this file 'description' to name the repository.
Merge #10703
10703: internal: Don't check items for macro calls if they have no attributes r=Veykril a=Veykril
Turns out when highlighting we currently populate the Dynmaps of pretty much every item in a file, who would've known that would be so costly...
Shaves off 250 ms for the integrated benchmark on `rust-analyzer/src/config.rs`.
We are still looking at a heft `154ms - descend_into_macros (2190 calls)` but I feel like this is slowly nearing towards just call overhead.
bors r+
Co-authored-by: Lukas Wirth <[email protected]>
| -rw-r--r-- | crates/hir/src/semantics.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs index 1acad1ae39..302d666318 100644 --- a/crates/hir/src/semantics.rs +++ b/crates/hir/src/semantics.rs @@ -17,7 +17,7 @@ use rustc_hash::{FxHashMap, FxHashSet}; use smallvec::{smallvec, SmallVec}; use syntax::{ algo::skip_trivia_token, - ast::{self, HasGenericParams, HasLoopBody}, + ast::{self, HasAttrs, HasGenericParams, HasLoopBody}, match_ast, AstNode, Direction, SyntaxNode, SyntaxNodePtr, SyntaxToken, TextRange, TextSize, }; @@ -588,7 +588,10 @@ impl<'db> SemanticsImpl<'db> { // are we inside an attribute macro call let containing_attribute_macro_call = self.with_ctx(|ctx| { token.value.ancestors().filter_map(ast::Item::cast).find_map(|item| { - // investigate this, seems to be VERY(250ms) expensive in rust-analyzer/src/config.rs? + if item.attrs().next().is_none() { + // Don't force populate the dyn cache for items that don't have an attribute anyways + return None; + } Some((ctx.item_to_macro_call(token.with_value(item.clone()))?, item)) }) }); |