mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

internal: Don't eagerly construct AstIdMaps

Browse source
This commit is contained in:
Lukas Wirth 2022-07-20 15:12:00 +02:00
parent 84544134f6
commit e507807837
4 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/hir-def/src/body.rs
View file

@ -50,7 +50,7 @@ pub struct Expander {
cfg_expander: CfgExpander, cfg_expander: CfgExpander,
def_map: Arc<DefMap>, def_map: Arc<DefMap>,
current_file_id: HirFileId, current_file_id: HirFileId,
ast_id_map: Arc<AstIdMap>, ast_id_map: Option<Arc<AstIdMap>>,
module: LocalModuleId, module: LocalModuleId,
recursion_limit: usize, recursion_limit: usize,
} }
@ -80,12 +80,11 @@ impl Expander {
pub fn new(db: &dyn DefDatabase, current_file_id: HirFileId, module: ModuleId) -> Expander { pub fn new(db: &dyn DefDatabase, current_file_id: HirFileId, module: ModuleId) -> Expander {
let cfg_expander = CfgExpander::new(db, current_file_id, module.krate); let cfg_expander = CfgExpander::new(db, current_file_id, module.krate);
let def_map = module.def_map(db); let def_map = module.def_map(db);
let ast_id_map = db.ast_id_map(current_file_id);
Expander { Expander {
cfg_expander, cfg_expander,
def_map, def_map,
current_file_id, current_file_id,
ast_id_map, ast_id_map: None,
module: module.local_id, module: module.local_id,
recursion_limit: 0, recursion_limit: 0,
} }
@ -175,7 +174,7 @@ impl Expander {
}; };
self.cfg_expander.hygiene = Hygiene::new(db.upcast(), file_id); self.cfg_expander.hygiene = Hygiene::new(db.upcast(), file_id);
self.current_file_id = file_id; self.current_file_id = file_id;
self.ast_id_map = db.ast_id_map(file_id); self.ast_id_map = None;
ExpandResult { value: Some((mark, node)), err } ExpandResult { value: Some((mark, node)), err }
} }
@ -213,8 +212,9 @@ impl Expander {
self.def_map.resolve_path(db, self.module, path, BuiltinShadowMode::Other).0.take_macros() self.def_map.resolve_path(db, self.module, path, BuiltinShadowMode::Other).0.take_macros()
} }
fn ast_id<N: AstNode>(&self, item: &N) -> AstId<N> { fn ast_id<N: AstNode>(&mut self, db: &dyn DefDatabase, item: &N) -> AstId<N> {
let file_local_id = self.ast_id_map.ast_id(item); let file_local_id =
self.ast_id_map.get_or_insert_with(|| db.ast_id_map(self.current_file_id)).ast_id(item);
AstId::new(self.current_file_id, file_local_id) AstId::new(self.current_file_id, file_local_id)
} }
@ -233,7 +233,7 @@ impl Expander {
#[derive(Debug)] #[derive(Debug)]
pub struct Mark { pub struct Mark {
file_id: HirFileId, file_id: HirFileId,
ast_id_map: Arc<AstIdMap>, ast_id_map: Option<Arc<AstIdMap>>,
bomb: DropBomb, bomb: DropBomb,
} }

23
crates/hir-def/src/body/lower.rs
View file

@ -11,6 +11,7 @@ use hir_expand::{
ExpandError, HirFileId, InFile, ExpandError, HirFileId, InFile,
}; };
use la_arena::Arena; use la_arena::Arena;
use once_cell::unsync::OnceCell;
use profile::Count; use profile::Count;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use syntax::{ use syntax::{
@ -41,8 +42,7 @@ use crate::{
pub struct LowerCtx<'a> { pub struct LowerCtx<'a> {
pub db: &'a dyn DefDatabase, pub db: &'a dyn DefDatabase,
hygiene: Hygiene, hygiene: Hygiene,
file_id: Option<HirFileId>, ast_id_map: Option<(HirFileId, OnceCell<Arc<AstIdMap>>)>,
source_ast_id_map: Option<Arc<AstIdMap>>,
} }
impl<'a> LowerCtx<'a> { impl<'a> LowerCtx<'a> {
@ -50,13 +50,12 @@ impl<'a> LowerCtx<'a> {
LowerCtx { LowerCtx {
db, db,
hygiene: Hygiene::new(db.upcast(), file_id), hygiene: Hygiene::new(db.upcast(), file_id),
file_id: Some(file_id), ast_id_map: Some((file_id, OnceCell::new())),
source_ast_id_map: Some(db.ast_id_map(file_id)),
} }
} }
pub fn with_hygiene(db: &'a dyn DefDatabase, hygiene: &Hygiene) -> Self { pub fn with_hygiene(db: &'a dyn DefDatabase, hygiene: &Hygiene) -> Self {
LowerCtx { db, hygiene: hygiene.clone(), file_id: None, source_ast_id_map: None } LowerCtx { db, hygiene: hygiene.clone(), ast_id_map: None }
} }
pub(crate) fn hygiene(&self) -> &Hygiene { pub(crate) fn hygiene(&self) -> &Hygiene {
@ -64,15 +63,21 @@ impl<'a> LowerCtx<'a> {
} }
pub(crate) fn file_id(&self) -> HirFileId { pub(crate) fn file_id(&self) -> HirFileId {
self.file_id.unwrap() self.ast_id_map.as_ref().unwrap().0
} }
pub(crate) fn lower_path(&self, ast: ast::Path) -> Option<Path> { pub(crate) fn lower_path(&self, ast: ast::Path) -> Option<Path> {
Path::from_src(ast, self) Path::from_src(ast, self)
} }
pub(crate) fn ast_id<N: AstNode>(&self, item: &N) -> Option<FileAstId<N>> { pub(crate) fn ast_id<N: AstNode>(
self.source_ast_id_map.as_ref().map(|ast_id_map| ast_id_map.ast_id(item)) &self,
db: &dyn DefDatabase,
item: &N,
) -> Option<FileAstId<N>> {
let (file_id, ast_id_map) = self.ast_id_map.as_ref()?;
let ast_id_map = ast_id_map.get_or_init(|| db.ast_id_map(*file_id));
Some(ast_id_map.ast_id(item))
} }
} }
@ -675,7 +680,7 @@ impl ExprCollector<'_> {
} }
fn collect_block(&mut self, block: ast::BlockExpr) -> ExprId { fn collect_block(&mut self, block: ast::BlockExpr) -> ExprId {
let ast_id = self.expander.ast_id(&block); let ast_id = self.expander.ast_id(self.db, &block);
let block_loc = let block_loc =
BlockLoc { ast_id, module: self.expander.def_map.module_id(self.expander.module) }; BlockLoc { ast_id, module: self.expander.def_map.module_id(self.expander.module) };
let block_id = self.db.intern_block(block_loc); let block_id = self.db.intern_block(block_loc);

17
crates/hir-def/src/data.rs
View file

@ -550,14 +550,17 @@ impl<'a> AssocItemCollector<'a> {
AssocItem::MacroCall(call) => { AssocItem::MacroCall(call) => {
let call = &item_tree[call]; let call = &item_tree[call];
let ast_id_map = self.db.ast_id_map(self.expander.current_file_id()); let ast_id_map = self.db.ast_id_map(self.expander.current_file_id());
let root = self.db.parse_or_expand(self.expander.current_file_id()).unwrap(); if let Some(root) = self.db.parse_or_expand(self.expander.current_file_id()) {
let call = ast_id_map.get(call.ast_id).to_node(&root); let call = ast_id_map.get(call.ast_id).to_node(&root);
let _cx = let _cx = stdx::panic_context::enter(format!(
stdx::panic_context::enter(format!("collect_items MacroCall: {}", call)); "collect_items MacroCall: {}",
let res = self.expander.enter_expand(self.db, call); call
));
let res = self.expander.enter_expand(self.db, call);
if let Ok(ExpandResult { value: Some((mark, mac)), .. }) = res { if let Ok(ExpandResult { value: Some((mark, mac)), .. }) = res {
self.collect_macro_items(mark, mac); self.collect_macro_items(mark, mac);
}
} }
} }
} }

2
crates/hir-def/src/type_ref.rs
View file

@ -237,7 +237,7 @@ impl TypeRef {
} }
ast::Type::MacroType(mt) => match mt.macro_call() { ast::Type::MacroType(mt) => match mt.macro_call() {
Some(mc) => ctx Some(mc) => ctx
.ast_id(&mc) .ast_id(ctx.db, &mc)
.map(|mc| TypeRef::Macro(InFile::new(ctx.file_id(), mc))) .map(|mc| TypeRef::Macro(InFile::new(ctx.file_id(), mc)))
.unwrap_or(TypeRef::Error), .unwrap_or(TypeRef::Error),
None => TypeRef::Error, None => TypeRef::Error,