language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-05 01:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Turn BlockId into a #[salsa::tracked]

Browse source
This commit is contained in:
Lukas Wirth 2025-06-13 17:15:28 +02:00
parent 9f051ee104
commit 8643a858db
4 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/hir-def/src/db.rs
View file

@ -12,10 +12,10 @@ use thin_vec::ThinVec;
use triomphe::Arc; use triomphe::Arc;
use crate::{ use crate::{
AttrDefId, BlockId, BlockLoc, ConstId, ConstLoc, DefWithBodyId, EnumId, EnumLoc, EnumVariantId, AttrDefId, ConstId, ConstLoc, DefWithBodyId, EnumId, EnumLoc, EnumVariantId, EnumVariantLoc,
EnumVariantLoc, ExternBlockId, ExternBlockLoc, ExternCrateId, ExternCrateLoc, FunctionId, ExternBlockId, ExternBlockLoc, ExternCrateId, ExternCrateLoc, FunctionId, FunctionLoc,
FunctionLoc, GenericDefId, ImplId, ImplLoc, LocalFieldId, Macro2Id, Macro2Loc, MacroExpander, GenericDefId, ImplId, ImplLoc, LocalFieldId, Macro2Id, Macro2Loc, MacroExpander, MacroId,
MacroId, MacroRulesId, MacroRulesLoc, MacroRulesLocFlags, ProcMacroId, ProcMacroLoc, StaticId, MacroRulesId, MacroRulesLoc, MacroRulesLocFlags, ProcMacroId, ProcMacroLoc, StaticId,
StaticLoc, StructId, StructLoc, TraitAliasId, TraitAliasLoc, TraitId, TraitLoc, TypeAliasId, StaticLoc, StructId, StructLoc, TraitAliasId, TraitAliasLoc, TraitId, TraitLoc, TypeAliasId,
TypeAliasLoc, UnionId, UnionLoc, UseId, UseLoc, VariantId, TypeAliasLoc, UnionId, UnionLoc, UseId, UseLoc, VariantId,
attr::{Attrs, AttrsWithOwner}, attr::{Attrs, AttrsWithOwner},
@ -96,9 +96,6 @@ pub trait InternDatabase: RootQueryDb {
#[salsa::interned] #[salsa::interned]
fn intern_macro_rules(&self, loc: MacroRulesLoc) -> MacroRulesId; fn intern_macro_rules(&self, loc: MacroRulesLoc) -> MacroRulesId;
// // endregion: items // // endregion: items
#[salsa::interned]
fn intern_block(&self, loc: BlockLoc) -> BlockId;
} }
#[query_group::query_group] #[query_group::query_group]

4
crates/hir-def/src/expr_store/lower.rs
View file

@ -11,7 +11,7 @@ use base_db::FxIndexSet;
use cfg::CfgOptions; use cfg::CfgOptions;
use either::Either; use either::Either;
use hir_expand::{ use hir_expand::{
HirFileId, InFile, MacroDefId, HirFileId, InFile, Intern, MacroDefId,
mod_path::tool_path, mod_path::tool_path,
name::{AsName, Name}, name::{AsName, Name},
span_map::SpanMapRef, span_map::SpanMapRef,
@ -2148,7 +2148,7 @@ impl ExprCollector<'_> {
) -> ExprId { ) -> ExprId {
let block_id = self.expander.ast_id_map().ast_id_for_block(&block).map(|file_local_id| { let block_id = self.expander.ast_id_map().ast_id_for_block(&block).map(|file_local_id| {
let ast_id = self.expander.in_file(file_local_id); let ast_id = self.expander.in_file(file_local_id);
self.db.intern_block(BlockLoc { ast_id, module: self.module }) BlockLoc { ast_id, module: self.module }.intern(self.db)
}); });
let (module, def_map) = let (module, def_map) =

4
crates/hir-def/src/expr_store/tests/body/block.rs
View file

@ -189,8 +189,8 @@ fn f() {
} }
"#, "#,
expect![[r#" expect![[r#"
BlockId(3c01) in BlockRelativeModuleId { block: Some(BlockId(3c00)), local_id: Idx::<ModuleData>(1) } BlockIdLt { [salsa id]: Id(3c01) } in BlockRelativeModuleId { block: Some(BlockIdLt { [salsa id]: Id(3c00) }), local_id: Idx::<ModuleData>(1) }
BlockId(3c00) in BlockRelativeModuleId { block: None, local_id: Idx::<ModuleData>(0) } BlockIdLt { [salsa id]: Id(3c00) } in BlockRelativeModuleId { block: None, local_id: Idx::<ModuleData>(0) }
crate scope crate scope
"#]], "#]],
); );

21
crates/hir-def/src/lib.rs
View file

@ -344,7 +344,26 @@ pub struct BlockLoc {
/// The containing module. /// The containing module.
pub module: ModuleId, pub module: ModuleId,
} }
impl_intern!(BlockId, BlockLoc, intern_block, lookup_intern_block); #[salsa_macros::tracked(debug)]
#[derive(PartialOrd, Ord)]
pub struct BlockIdLt<'db> {
pub loc: BlockLoc,
}
pub type BlockId = BlockIdLt<'static>;
impl hir_expand::Intern for BlockLoc {
type Database = dyn DefDatabase;
type ID = BlockId;
fn intern(self, db: &Self::Database) -> Self::ID {
unsafe { std::mem::transmute::<BlockIdLt<'_>, BlockId>(BlockIdLt::new(db, self)) }
}
}
impl hir_expand::Lookup for BlockId {
type Database = dyn DefDatabase;
type Data = BlockLoc;
fn lookup(&self, db: &Self::Database) -> Self::Data {
self.loc(db)
}
}
/// A `ModuleId` that is always a crate's root module. /// A `ModuleId` that is always a crate's root module.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]