Skip to content

Commit 8fd1b50

Browse files
borsbors
committed
Auto merge of rust-lang#17380 - Veykril:sema-source, r=Veykril
fix: Remove extra parse cache from Semantics again Should fix rust-lang/rust-analyzer#17376, specifically 30c04d5aa9523140f0f2daa07bc461534fb09b95 The recent changes here were heavily triggering what I realized in rust-lang/rust-analyzer#17367 (comment)
2 parents 0ef2213 + ac9cdbb commit 8fd1b50

File tree

11 files changed

+122
-93
lines changed

11 files changed

+122
-93
lines changed

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

Lines changed: 66 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ use hir_def::{
88
Lookup, MacroId, VariantId,
99
};
1010
use hir_expand::{HirFileId, InFile};
11+
use hir_ty::{db::InternedClosure, CallableDefId};
1112
use syntax::ast;
1213
use tt::TextRange;
1314

1415
use crate::{
15-
db::HirDatabase, Adt, Const, Enum, ExternCrateDecl, Field, FieldSource, Function, Impl,
16-
LifetimeParam, LocalSource, Macro, Module, Static, Struct, Trait, TraitAlias, TypeAlias,
17-
TypeOrConstParam, Union, Variant,
16+
db::HirDatabase, Adt, Callee, Const, Enum, ExternCrateDecl, Field, FieldSource, Function, Impl,
17+
Label, LifetimeParam, LocalSource, Macro, Module, Param, SelfParam, Static, Struct, Trait,
18+
TraitAlias, TypeAlias, TypeOrConstParam, Union, Variant,
1819
};
1920

2021
pub trait HasSource {
@@ -222,6 +223,68 @@ impl HasSource for LocalSource {
222223
}
223224
}
224225

226+
impl HasSource for Param {
227+
type Ast = Either<ast::SelfParam, ast::Param>;
228+
229+
fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
230+
match self.func {
231+
Callee::Def(CallableDefId::FunctionId(func)) => {
232+
let InFile { file_id, value } = Function { id: func }.source(db)?;
233+
let params = value.param_list()?;
234+
if let Some(self_param) = params.self_param() {
235+
if let Some(idx) = self.idx.checked_sub(1) {
236+
params.params().nth(idx).map(Either::Right)
237+
} else {
238+
Some(Either::Left(self_param))
239+
}
240+
} else {
241+
params.params().nth(self.idx).map(Either::Right)
242+
}
243+
.map(|value| InFile { file_id, value })
244+
}
245+
Callee::Closure(closure, _) => {
246+
let InternedClosure(owner, expr_id) = db.lookup_intern_closure(closure.into());
247+
let (_, source_map) = db.body_with_source_map(owner);
248+
let ast @ InFile { file_id, value } = source_map.expr_syntax(expr_id).ok()?;
249+
let root = db.parse_or_expand(file_id);
250+
match value.to_node(&root) {
251+
ast::Expr::ClosureExpr(it) => it
252+
.param_list()?
253+
.params()
254+
.nth(self.idx)
255+
.map(Either::Right)
256+
.map(|value| InFile { file_id: ast.file_id, value }),
257+
_ => None,
258+
}
259+
}
260+
_ => None,
261+
}
262+
}
263+
}
264+
265+
impl HasSource for SelfParam {
266+
type Ast = ast::SelfParam;
267+
268+
fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
269+
let InFile { file_id, value } = Function::from(self.func).source(db)?;
270+
value
271+
.param_list()
272+
.and_then(|params| params.self_param())
273+
.map(|value| InFile { file_id, value })
274+
}
275+
}
276+
277+
impl HasSource for Label {
278+
type Ast = ast::Label;
279+
280+
fn source(self, db: &dyn HirDatabase) -> Option<InFile<Self::Ast>> {
281+
let (_body, source_map) = db.body_with_source_map(self.parent);
282+
let src = source_map.label_syntax(self.label_id);
283+
let root = src.file_syntax(db.upcast());
284+
Some(src.map(|ast| ast.to_node(&root)))
285+
}
286+
}
287+
225288
impl HasSource for ExternCrateDecl {
226289
type Ast = ast::ExternCrate;
227290

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

Lines changed: 30 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ use hir_expand::{
6464
use hir_ty::{
6565
all_super_traits, autoderef, check_orphan_rules,
6666
consteval::{try_const_usize, unknown_const_as_generic, ConstExt},
67-
db::InternedClosure,
6867
diagnostics::BodyValidationDiagnostic,
6968
error_lifetime, known_const_to_ast,
7069
layout::{Layout as TyLayout, RustcEnumVariantIdx, RustcFieldIdx, TagEncoding},
@@ -1099,6 +1098,35 @@ pub enum FieldSource {
10991098
Pos(ast::TupleField),
11001099
}
11011100

1101+
impl AstNode for FieldSource {
1102+
fn can_cast(kind: syntax::SyntaxKind) -> bool
1103+
where
1104+
Self: Sized,
1105+
{
1106+
ast::RecordField::can_cast(kind) || ast::TupleField::can_cast(kind)
1107+
}
1108+
1109+
fn cast(syntax: SyntaxNode) -> Option<Self>
1110+
where
1111+
Self: Sized,
1112+
{
1113+
if ast::RecordField::can_cast(syntax.kind()) {
1114+
<ast::RecordField as AstNode>::cast(syntax).map(FieldSource::Named)
1115+
} else if ast::TupleField::can_cast(syntax.kind()) {
1116+
<ast::TupleField as AstNode>::cast(syntax).map(FieldSource::Pos)
1117+
} else {
1118+
None
1119+
}
1120+
}
1121+
1122+
fn syntax(&self) -> &SyntaxNode {
1123+
match self {
1124+
FieldSource::Named(it) => it.syntax(),
1125+
FieldSource::Pos(it) => it.syntax(),
1126+
}
1127+
}
1128+
}
1129+
11021130
impl Field {
11031131
pub fn name(&self, db: &dyn HirDatabase) -> Name {
11041132
self.parent.variant_data(db).fields()[self.id].name.clone()
@@ -2216,47 +2244,9 @@ impl Param {
22162244
}
22172245
}
22182246

2219-
pub fn pattern_source(&self, db: &dyn HirDatabase) -> Option<ast::Pat> {
2247+
pub fn pattern_source(self, db: &dyn HirDatabase) -> Option<ast::Pat> {
22202248
self.source(db).and_then(|p| p.value.right()?.pat())
22212249
}
2222-
2223-
pub fn source(
2224-
&self,
2225-
db: &dyn HirDatabase,
2226-
) -> Option<InFile<Either<ast::SelfParam, ast::Param>>> {
2227-
match self.func {
2228-
Callee::Def(CallableDefId::FunctionId(func)) => {
2229-
let InFile { file_id, value } = Function { id: func }.source(db)?;
2230-
let params = value.param_list()?;
2231-
if let Some(self_param) = params.self_param() {
2232-
if let Some(idx) = self.idx.checked_sub(1) {
2233-
params.params().nth(idx).map(Either::Right)
2234-
} else {
2235-
Some(Either::Left(self_param))
2236-
}
2237-
} else {
2238-
params.params().nth(self.idx).map(Either::Right)
2239-
}
2240-
.map(|value| InFile { file_id, value })
2241-
}
2242-
Callee::Closure(closure, _) => {
2243-
let InternedClosure(owner, expr_id) = db.lookup_intern_closure(closure.into());
2244-
let (_, source_map) = db.body_with_source_map(owner);
2245-
let ast @ InFile { file_id, value } = source_map.expr_syntax(expr_id).ok()?;
2246-
let root = db.parse_or_expand(file_id);
2247-
match value.to_node(&root) {
2248-
ast::Expr::ClosureExpr(it) => it
2249-
.param_list()?
2250-
.params()
2251-
.nth(self.idx)
2252-
.map(Either::Right)
2253-
.map(|value| InFile { file_id: ast.file_id, value }),
2254-
_ => None,
2255-
}
2256-
}
2257-
_ => None,
2258-
}
2259-
}
22602250
}
22612251

22622252
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -2280,14 +2270,6 @@ impl SelfParam {
22802270
.unwrap_or(Access::Owned)
22812271
}
22822272

2283-
pub fn source(&self, db: &dyn HirDatabase) -> Option<InFile<ast::SelfParam>> {
2284-
let InFile { file_id, value } = Function::from(self.func).source(db)?;
2285-
value
2286-
.param_list()
2287-
.and_then(|params| params.self_param())
2288-
.map(|value| InFile { file_id, value })
2289-
}
2290-
22912273
pub fn parent_fn(&self) -> Function {
22922274
Function::from(self.func)
22932275
}
@@ -3458,13 +3440,6 @@ impl Label {
34583440
let body = db.body(self.parent);
34593441
body[self.label_id].name.clone()
34603442
}
3461-
3462-
pub fn source(self, db: &dyn HirDatabase) -> InFile<ast::Label> {
3463-
let (_body, source_map) = db.body_with_source_map(self.parent);
3464-
let src = source_map.label_syntax(self.label_id);
3465-
let root = src.file_syntax(db.upcast());
3466-
src.map(|ast| ast.to_node(&root))
3467-
}
34683443
}
34693444

34703445
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,6 @@ pub struct SemanticsImpl<'db> {
132132
s2d_cache: RefCell<SourceToDefCache>,
133133
/// Rootnode to HirFileId cache
134134
root_to_file_cache: RefCell<FxHashMap<SyntaxNode, HirFileId>>,
135-
/// HirFileId to Rootnode cache (this adds a layer over the database LRU cache to prevent
136-
/// possibly frequent invalidation)
137-
parse_cache: RefCell<FxHashMap<HirFileId, SyntaxNode>>,
138135
/// MacroCall to its expansion's MacroFileId cache
139136
macro_call_cache: RefCell<FxHashMap<InFile<ast::MacroCall>, MacroFileId>>,
140137
}
@@ -295,7 +292,6 @@ impl<'db> SemanticsImpl<'db> {
295292
db,
296293
s2d_cache: Default::default(),
297294
root_to_file_cache: Default::default(),
298-
parse_cache: Default::default(),
299295
macro_call_cache: Default::default(),
300296
}
301297
}
@@ -307,9 +303,6 @@ impl<'db> SemanticsImpl<'db> {
307303
}
308304

309305
pub fn parse_or_expand(&self, file_id: HirFileId) -> SyntaxNode {
310-
if let Some(root) = self.parse_cache.borrow().get(&file_id) {
311-
return root.clone();
312-
}
313306
let node = self.db.parse_or_expand(file_id);
314307
self.cache(node.clone(), file_id);
315308
node
@@ -1490,9 +1483,8 @@ impl<'db> SemanticsImpl<'db> {
14901483
fn cache(&self, root_node: SyntaxNode, file_id: HirFileId) {
14911484
assert!(root_node.parent().is_none());
14921485
let mut cache = self.root_to_file_cache.borrow_mut();
1493-
let prev = cache.insert(root_node.clone(), file_id);
1486+
let prev = cache.insert(root_node, file_id);
14941487
assert!(prev.is_none() || prev == Some(file_id));
1495-
self.parse_cache.borrow_mut().insert(file_id, root_node);
14961488
}
14971489

14981490
pub fn assert_contains_node(&self, node: &SyntaxNode) {

‎src/tools/rust-analyzer/crates/ide-assists/src/utils/suggest_name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ fn from_param(expr: &ast::Expr, sema: &Semantics<'_, RootDatabase>) -> Option<St
254254

255255
let (idx, _) = arg_list.args().find_position(|it| it == expr).unwrap();
256256
let param = func.params().into_iter().nth(idx)?;
257-
let pat = param.source(sema.db)?.value.right()?.pat()?;
257+
let pat = sema.source(param)?.value.right()?.pat()?;
258258
let name = var_name_from_pat(&pat)?;
259259
normalize(&name.to_string())
260260
}

‎src/tools/rust-analyzer/crates/ide-db/src/active_parameter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl ActiveParameter {
2828
return None;
2929
}
3030
let param = params.swap_remove(idx);
31-
Some(ActiveParameter { ty: param.ty().clone(), src: param.source(sema.db) })
31+
Some(ActiveParameter { ty: param.ty().clone(), src: sema.source(param) })
3232
}
3333

3434
pub fn ident(&self) -> Option<ast::Name> {

‎src/tools/rust-analyzer/crates/ide-db/src/rename.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use std::fmt;
2424

2525
use base_db::{AnchoredPathBuf, FileId, FileRange};
2626
use either::Either;
27-
use hir::{FieldSource, HasSource, HirFileIdExt, InFile, ModuleSource, Semantics};
27+
use hir::{FieldSource, HirFileIdExt, InFile, ModuleSource, Semantics};
2828
use span::SyntaxContextId;
2929
use stdx::{never, TupleExt};
3030
use syntax::{
@@ -109,7 +109,7 @@ impl Definition {
109109
let syn_ctx_is_root = |(range, ctx): (_, SyntaxContextId)| ctx.is_root().then_some(range);
110110
let res = match self {
111111
Definition::Macro(mac) => {
112-
let src = mac.source(sema.db)?;
112+
let src = sema.source(mac)?;
113113
let name = match &src.value {
114114
Either::Left(it) => it.name()?,
115115
Either::Right(it) => it.name()?,
@@ -119,7 +119,7 @@ impl Definition {
119119
.and_then(syn_ctx_is_root)
120120
}
121121
Definition::Field(field) => {
122-
let src = field.source(sema.db)?;
122+
let src = sema.source(field)?;
123123
match &src.value {
124124
FieldSource::Named(record_field) => {
125125
let name = record_field.name()?;
@@ -154,18 +154,18 @@ impl Definition {
154154
}
155155
Definition::GenericParam(generic_param) => match generic_param {
156156
hir::GenericParam::LifetimeParam(lifetime_param) => {
157-
let src = lifetime_param.source(sema.db)?;
157+
let src = sema.source(lifetime_param)?;
158158
src.with_value(src.value.lifetime()?.syntax())
159159
.original_file_range_opt(sema.db)
160160
.and_then(syn_ctx_is_root)
161161
}
162162
_ => {
163-
let x = match generic_param {
163+
let param = match generic_param {
164164
hir::GenericParam::TypeParam(it) => it.merge(),
165165
hir::GenericParam::ConstParam(it) => it.merge(),
166166
hir::GenericParam::LifetimeParam(_) => return None,
167167
};
168-
let src = x.source(sema.db)?;
168+
let src = sema.source(param)?;
169169
let name = match &src.value {
170170
Either::Left(x) => x.name()?,
171171
Either::Right(_) => return None,
@@ -176,14 +176,14 @@ impl Definition {
176176
}
177177
},
178178
Definition::Label(label) => {
179-
let src = label.source(sema.db);
179+
let src = sema.source(label)?;
180180
let lifetime = src.value.lifetime()?;
181181
src.with_value(lifetime.syntax())
182182
.original_file_range_opt(sema.db)
183183
.and_then(syn_ctx_is_root)
184184
}
185185
Definition::ExternCrateDecl(it) => {
186-
let src = it.source(sema.db)?;
186+
let src = sema.source(it)?;
187187
if let Some(rename) = src.value.rename() {
188188
let name = rename.name()?;
189189
src.with_value(name.syntax())
@@ -212,10 +212,10 @@ impl Definition {
212212
sema: &Semantics<'_, RootDatabase>,
213213
) -> Option<(FileRange, SyntaxContextId)>
214214
where
215-
D: HasSource,
215+
D: hir::HasSource,
216216
D::Ast: ast::HasName,
217217
{
218-
let src = def.source(sema.db)?;
218+
let src = sema.source(def)?;
219219
let name = src.value.name()?;
220220
src.with_value(name.syntax()).original_file_range_opt(sema.db)
221221
}

‎src/tools/rust-analyzer/crates/ide-ssr/src/matching.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ impl<'db, 'sema> Matcher<'db, 'sema> {
575575
.resolve_method_call_as_callable(code)
576576
.and_then(|callable| {
577577
let (self_param, _) = callable.receiver_param(self.sema.db)?;
578-
Some(self_param.source(self.sema.db)?.value.kind())
578+
Some(self.sema.source(self_param)?.value.kind())
579579
})
580580
.unwrap_or(ast::SelfParamKind::Owned);
581581
}

‎src/tools/rust-analyzer/crates/ide/src/inlay_hints/param_name.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,14 @@ pub(super) fn hints(
3030
.filter_map(|(p, arg)| {
3131
// Only annotate hints for expressions that exist in the original file
3232
let range = sema.original_range_opt(arg.syntax())?;
33-
let source = p.source(sema.db)?;
33+
let source = sema.source(p)?;
3434
let (param_name, name_syntax) = match source.value.as_ref() {
3535
Either::Left(pat) => (pat.name()?, pat.name()),
3636
Either::Right(param) => match param.pat()? {
3737
ast::Pat::IdentPat(it) => (it.name()?, it.name()),
3838
_ => return None,
3939
},
4040
};
41-
// make sure the file is cached so we can map out of macros
42-
sema.parse_or_expand(source.file_id);
4341
Some((name_syntax, param_name, arg, range))
4442
})
4543
.filter(|(_, param_name, arg, _)| {

0 commit comments

Comments
 (0)