Skip to content

Commit 4c007c8

Browse files
borsbors
committed
Auto merge of #17004 - Veykril:ide-macro-caching, r=Veykril
Try caching macro calls more aggressively in Semantics
2 parents 59c3a3a + 6eab89f commit 4c007c8

19 files changed

+476
-361
lines changed

‎src/tools/rust-analyzer/crates/hir-def/src/body.rs

+6
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,12 @@ impl BodySourceMap {
395395
self.expr_map.get(&src).copied()
396396
}
397397

398+
pub fn expansions(
399+
&self,
400+
) -> impl Iterator<Item = (&InFile<AstPtr<ast::MacroCall>>, &MacroFileId)> {
401+
self.expansions.iter()
402+
}
403+
398404
pub fn implicit_format_args(
399405
&self,
400406
node: InFile<&ast::FormatArgsExpr>,

‎src/tools/rust-analyzer/crates/hir-def/src/body/lower.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use intern::Interned;
1212
use rustc_hash::FxHashMap;
1313
use smallvec::SmallVec;
1414
use span::AstIdMap;
15+
use stdx::never;
1516
use syntax::{
1617
ast::{
1718
self, ArrayExprKind, AstChildren, BlockExpr, HasArgList, HasAttrs, HasLoopBody, HasName,
@@ -480,7 +481,8 @@ impl ExprCollector<'_> {
480481
} else if e.const_token().is_some() {
481482
Mutability::Shared
482483
} else {
483-
unreachable!("parser only remaps to raw_token() if matching mutability token follows")
484+
never!("parser only remaps to raw_token() if matching mutability token follows");
485+
Mutability::Shared
484486
}
485487
} else {
486488
Mutability::from_mutable(e.mut_token().is_some())
@@ -1006,9 +1008,9 @@ impl ExprCollector<'_> {
10061008
Some((mark, expansion)) => {
10071009
// Keep collecting even with expansion errors so we can provide completions and
10081010
// other services in incomplete macro expressions.
1009-
self.source_map
1010-
.expansions
1011-
.insert(macro_call_ptr, self.expander.current_file_id().macro_file().unwrap());
1011+
if let Some(macro_file) = self.expander.current_file_id().macro_file() {
1012+
self.source_map.expansions.insert(macro_call_ptr, macro_file);
1013+
}
10121014
let prev_ast_id_map = mem::replace(
10131015
&mut self.ast_id_map,
10141016
self.db.ast_id_map(self.expander.current_file_id()),

‎src/tools/rust-analyzer/crates/hir-def/src/child_by_source.rs

+32-20
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
77
use either::Either;
88
use hir_expand::{attrs::collect_attrs, HirFileId};
9-
use syntax::ast;
9+
use syntax::{ast, AstPtr};
1010

1111
use crate::{
1212
db::DefDatabase,
@@ -38,7 +38,7 @@ impl ChildBySource for TraitId {
3838

3939
data.attribute_calls().filter(|(ast_id, _)| ast_id.file_id == file_id).for_each(
4040
|(ast_id, call_id)| {
41-
res[keys::ATTR_MACRO_CALL].insert(ast_id.to_node(db.upcast()), call_id);
41+
res[keys::ATTR_MACRO_CALL].insert(ast_id.to_ptr(db.upcast()), call_id);
4242
},
4343
);
4444
data.items.iter().for_each(|&(_, item)| {
@@ -50,9 +50,10 @@ impl ChildBySource for TraitId {
5050
impl ChildBySource for ImplId {
5151
fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap, file_id: HirFileId) {
5252
let data = db.impl_data(*self);
53+
// FIXME: Macro calls
5354
data.attribute_calls().filter(|(ast_id, _)| ast_id.file_id == file_id).for_each(
5455
|(ast_id, call_id)| {
55-
res[keys::ATTR_MACRO_CALL].insert(ast_id.to_node(db.upcast()), call_id);
56+
res[keys::ATTR_MACRO_CALL].insert(ast_id.to_ptr(db.upcast()), call_id);
5657
},
5758
);
5859
data.items.iter().for_each(|&item| {
@@ -80,15 +81,15 @@ impl ChildBySource for ItemScope {
8081
.for_each(|konst| insert_item_loc(db, res, file_id, konst, keys::CONST));
8182
self.attr_macro_invocs().filter(|(id, _)| id.file_id == file_id).for_each(
8283
|(ast_id, call_id)| {
83-
res[keys::ATTR_MACRO_CALL].insert(ast_id.to_node(db.upcast()), call_id);
84+
res[keys::ATTR_MACRO_CALL].insert(ast_id.to_ptr(db.upcast()), call_id);
8485
},
8586
);
8687
self.legacy_macros().for_each(|(_, ids)| {
8788
ids.iter().for_each(|&id| {
8889
if let MacroId::MacroRulesId(id) = id {
8990
let loc = id.lookup(db);
9091
if loc.id.file_id() == file_id {
91-
res[keys::MACRO_RULES].insert(loc.source(db).value, id);
92+
res[keys::MACRO_RULES].insert(loc.ast_ptr(db).value, id);
9293
}
9394
}
9495
})
@@ -100,12 +101,18 @@ impl ChildBySource for ItemScope {
100101
if let Some((_, Either::Left(attr))) =
101102
collect_attrs(&adt).nth(attr_id.ast_index())
102103
{
103-
res[keys::DERIVE_MACRO_CALL].insert(attr, (attr_id, call_id, calls.into()));
104+
res[keys::DERIVE_MACRO_CALL]
105+
.insert(AstPtr::new(&attr), (attr_id, call_id, calls.into()));
104106
}
105107
});
106108
},
107109
);
108-
110+
self.iter_macro_invoc().filter(|(id, _)| id.file_id == file_id).for_each(
111+
|(ast_id, &call)| {
112+
let ast = ast_id.to_ptr(db.upcast());
113+
res[keys::MACRO_CALL].insert(ast, call);
114+
},
115+
);
109116
fn add_module_def(
110117
db: &dyn DefDatabase,
111118
map: &mut DynMap,
@@ -155,8 +162,8 @@ impl ChildBySource for VariantId {
155162
for (local_id, source) in arena_map.value.iter() {
156163
let id = FieldId { parent, local_id };
157164
match source.clone() {
158-
Either::Left(source) => res[keys::TUPLE_FIELD].insert(source, id),
159-
Either::Right(source) => res[keys::RECORD_FIELD].insert(source, id),
165+
Either::Left(source) => res[keys::TUPLE_FIELD].insert(AstPtr::new(&source), id),
166+
Either::Right(source) => res[keys::RECORD_FIELD].insert(AstPtr::new(&source), id),
160167
}
161168
}
162169
}
@@ -171,29 +178,30 @@ impl ChildBySource for EnumId {
171178

172179
let tree = loc.id.item_tree(db);
173180
let ast_id_map = db.ast_id_map(loc.id.file_id());
174-
let root = db.parse_or_expand(loc.id.file_id());
175181

176182
db.enum_data(*self).variants.iter().for_each(|&(variant, _)| {
177-
res[keys::ENUM_VARIANT].insert(
178-
ast_id_map.get(tree[variant.lookup(db).id.value].ast_id).to_node(&root),
179-
variant,
180-
);
183+
res[keys::ENUM_VARIANT]
184+
.insert(ast_id_map.get(tree[variant.lookup(db).id.value].ast_id), variant);
181185
});
182186
}
183187
}
184188

185189
impl ChildBySource for DefWithBodyId {
186190
fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap, file_id: HirFileId) {
187-
let body = db.body(*self);
191+
let (body, sm) = db.body_with_source_map(*self);
188192
if let &DefWithBodyId::VariantId(v) = self {
189193
VariantId::EnumVariantId(v).child_by_source_to(db, res, file_id)
190194
}
191195

196+
sm.expansions().filter(|(ast, _)| ast.file_id == file_id).for_each(|(ast, &exp_id)| {
197+
res[keys::MACRO_CALL].insert(ast.value, exp_id.macro_call_id);
198+
});
199+
192200
for (block, def_map) in body.blocks(db) {
193201
// All block expressions are merged into the same map, because they logically all add
194202
// inner items to the containing `DefWithBodyId`.
195203
def_map[DefMap::ROOT].scope.child_by_source_to(db, res, file_id);
196-
res[keys::BLOCK].insert(block.lookup(db).ast_id.to_node(db.upcast()), block);
204+
res[keys::BLOCK].insert(block.lookup(db).ast_id.to_ptr(db.upcast()), block);
197205
}
198206
}
199207
}
@@ -220,13 +228,17 @@ impl ChildBySource for GenericDefId {
220228
{
221229
let id = TypeOrConstParamId { parent: *self, local_id };
222230
match ast_param {
223-
ast::TypeOrConstParam::Type(a) => res[keys::TYPE_PARAM].insert(a, id),
224-
ast::TypeOrConstParam::Const(a) => res[keys::CONST_PARAM].insert(a, id),
231+
ast::TypeOrConstParam::Type(a) => {
232+
res[keys::TYPE_PARAM].insert(AstPtr::new(&a), id)
233+
}
234+
ast::TypeOrConstParam::Const(a) => {
235+
res[keys::CONST_PARAM].insert(AstPtr::new(&a), id)
236+
}
225237
}
226238
}
227239
for (local_id, ast_param) in lts_idx_iter.zip(generic_params_list.lifetime_params()) {
228240
let id = LifetimeParamId { parent: *self, local_id };
229-
res[keys::LIFETIME_PARAM].insert(ast_param, id);
241+
res[keys::LIFETIME_PARAM].insert(AstPtr::new(&ast_param), id);
230242
}
231243
}
232244
}
@@ -246,7 +258,7 @@ fn insert_item_loc<ID, N, Data>(
246258
{
247259
let loc = id.lookup(db);
248260
if loc.item_tree_id().file_id() == file_id {
249-
res[key].insert(loc.source(db).value, id)
261+
res[key].insert(loc.ast_ptr(db).value, id)
250262
}
251263
}
252264

‎src/tools/rust-analyzer/crates/hir-def/src/dyn_map/keys.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use crate::{
1313
TraitId, TypeAliasId, TypeOrConstParamId, UnionId, UseId,
1414
};
1515

16-
pub type Key<K, V> = crate::dyn_map::Key<K, V, AstPtrPolicy<K, V>>;
16+
pub type Key<K, V> = crate::dyn_map::Key<AstPtr<K>, V, AstPtrPolicy<K, V>>;
1717

1818
pub const BLOCK: Key<ast::BlockExpr, BlockId> = Key::new();
1919
pub const FUNCTION: Key<ast::Fn, FunctionId> = Key::new();
@@ -39,6 +39,7 @@ pub const LIFETIME_PARAM: Key<ast::LifetimeParam, LifetimeParamId> = Key::new();
3939
pub const MACRO_RULES: Key<ast::MacroRules, MacroRulesId> = Key::new();
4040
pub const MACRO2: Key<ast::MacroDef, Macro2Id> = Key::new();
4141
pub const PROC_MACRO: Key<ast::Fn, ProcMacroId> = Key::new();
42+
pub const MACRO_CALL: Key<ast::MacroCall, MacroCallId> = Key::new();
4243
pub const ATTR_MACRO_CALL: Key<ast::Item, MacroCallId> = Key::new();
4344
pub const DERIVE_MACRO_CALL: Key<ast::Attr, (AttrId, MacroCallId, Box<[Option<MacroCallId>]>)> =
4445
Key::new();
@@ -54,18 +55,16 @@ pub struct AstPtrPolicy<AST, ID> {
5455
}
5556

5657
impl<AST: AstNode + 'static, ID: 'static> Policy for AstPtrPolicy<AST, ID> {
57-
type K = AST;
58+
type K = AstPtr<AST>;
5859
type V = ID;
59-
fn insert(map: &mut DynMap, key: AST, value: ID) {
60-
let key = AstPtr::new(&key);
60+
fn insert(map: &mut DynMap, key: AstPtr<AST>, value: ID) {
6161
map.map
6262
.entry::<FxHashMap<AstPtr<AST>, ID>>()
6363
.or_insert_with(Default::default)
6464
.insert(key, value);
6565
}
66-
fn get<'a>(map: &'a DynMap, key: &AST) -> Option<&'a ID> {
67-
let key = AstPtr::new(key);
68-
map.map.get::<FxHashMap<AstPtr<AST>, ID>>()?.get(&key)
66+
fn get<'a>(map: &'a DynMap, key: &AstPtr<AST>) -> Option<&'a ID> {
67+
map.map.get::<FxHashMap<AstPtr<AST>, ID>>()?.get(key)
6968
}
7069
fn is_empty(map: &DynMap) -> bool {
7170
map.map.get::<FxHashMap<AstPtr<AST>, ID>>().map_or(true, |it| it.is_empty())

‎src/tools/rust-analyzer/crates/hir-expand/src/builtin_fn_macro.rs

+4
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ impl BuiltinFnLikeExpander {
6767
let span = span_with_def_site_ctxt(db, span, id);
6868
self.expander()(db, id, tt, span)
6969
}
70+
71+
pub fn is_asm(&self) -> bool {
72+
matches!(self, Self::Asm | Self::GlobalAsm)
73+
}
7074
}
7175

7276
impl EagerExpander {

‎src/tools/rust-analyzer/crates/hir-expand/src/files.rs

+7-20
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
//! Things to wrap other things in file ids.
2-
use std::iter;
3-
42
use either::Either;
53
use span::{
64
AstIdNode, ErasedFileAstId, FileAstId, FileId, FileRange, HirFileId, HirFileIdRepr,
@@ -150,27 +148,16 @@ impl<FileId: Copy, N: AstNode> InFileWrapper<FileId, N> {
150148
}
151149
}
152150

151+
impl<FileId: Copy, N: AstNode> InFileWrapper<FileId, &N> {
152+
// unfortunately `syntax` collides with the impl above, because `&_` is fundamental
153+
pub fn syntax_ref(&self) -> InFileWrapper<FileId, &SyntaxNode> {
154+
self.with_value(self.value.syntax())
155+
}
156+
}
157+
153158
// region:specific impls
154159

155160
impl InFile<&SyntaxNode> {
156-
/// Traverse up macro calls and skips the macro invocation node
157-
pub fn ancestors_with_macros(
158-
self,
159-
db: &dyn db::ExpandDatabase,
160-
) -> impl Iterator<Item = InFile<SyntaxNode>> + '_ {
161-
let succ = move |node: &InFile<SyntaxNode>| match node.value.parent() {
162-
Some(parent) => Some(node.with_value(parent)),
163-
None => db
164-
.lookup_intern_macro_call(node.file_id.macro_file()?.macro_call_id)
165-
.to_node_item(db)
166-
.syntax()
167-
.cloned()
168-
.map(|node| node.parent())
169-
.transpose(),
170-
};
171-
iter::successors(succ(&self.cloned()), succ)
172-
}
173-
174161
/// Falls back to the macro call range if the node cannot be mapped up fully.
175162
///
176163
/// For attributes and derives, this will point back to the attribute only.

0 commit comments

Comments
 (0)