Skip to content

Commit

Permalink
Merge pull request #18409 from Veykril/veykril/push-rkrkpvzvumvx
Browse files Browse the repository at this point in the history
Only construct a resolver in macro descension when needed
  • Loading branch information
Veykril authored Oct 25, 2024
2 parents 52a03ec + a12f178 commit f446671
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion crates/hir-def/src/resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1043,12 +1043,12 @@ impl HasResolver for ModuleId {
fn resolver(self, db: &dyn DefDatabase) -> Resolver {
let mut def_map = self.def_map(db);
let mut module_id = self.local_id;
let mut modules: SmallVec<[_; 1]> = smallvec![];

if !self.is_block_module() {
return Resolver { scopes: vec![], module_scope: ModuleItemMap { def_map, module_id } };
}

let mut modules: SmallVec<[_; 1]> = smallvec![];
while let Some(parent) = def_map.parent() {
let block_def_map = mem::replace(&mut def_map, parent.def_map(db));
modules.push(block_def_map);
Expand Down
32 changes: 19 additions & 13 deletions crates/hir/src/semantics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -936,16 +936,7 @@ impl<'db> SemanticsImpl<'db> {
}
}

let (file_id, tokens) = stack.first()?;
// make sure we pick the token in the expanded include if we encountered an include,
// otherwise we'll get the wrong semantics
let sa =
tokens.first()?.0.parent().and_then(|parent| {
self.analyze_impl(InFile::new(*file_id, &parent), None, false)
})?;

let mut m_cache = self.macro_call_cache.borrow_mut();
let def_map = sa.resolver.def_map();

// Filters out all tokens that contain the given range (usually the macro call), any such
// token is redundant as the corresponding macro call has already been processed
Expand Down Expand Up @@ -1024,8 +1015,16 @@ impl<'db> SemanticsImpl<'db> {
) {
call.as_macro_file()
} else {
// FIXME: This is wrong, the SourceAnalyzer might be invalid here
sa.expand(self.db, mcall.as_ref())?
token
.parent()
.and_then(|parent| {
self.analyze_impl(
InFile::new(expansion, &parent),
None,
false,
)
})?
.expand(self.db, mcall.as_ref())?
};
m_cache.insert(mcall, it);
it
Expand Down Expand Up @@ -1095,9 +1094,16 @@ impl<'db> SemanticsImpl<'db> {
attr.path().and_then(|it| it.as_single_name_ref())?.as_name();
// Not an attribute, nor a derive, so it's either an intert attribute or a derive helper
// Try to resolve to a derive helper and downmap
let resolver = &token
.parent()
.and_then(|parent| {
self.analyze_impl(InFile::new(expansion, &parent), None, false)
})?
.resolver;
let id = self.db.ast_id_map(expansion).ast_id(&adt);
let helpers =
def_map.derive_helpers_in_scope(InFile::new(expansion, id))?;
let helpers = resolver
.def_map()
.derive_helpers_in_scope(InFile::new(expansion, id))?;

if !helpers.is_empty() {
let text_range = attr.syntax().text_range();
Expand Down

0 comments on commit f446671

Please sign in to comment.