internal: Put Attrs behind a query instead of AttsWithOwner

Veykril · Veykril · commit ed3a5eac3ca3 · 2023-04-14T12:47:33.000+02:00
diff --git a/crates/hir-def/src/attr.rs b/crates/hir-def/src/attr.rs
@@ -377,7 +377,11 @@ fn parse_comma_sep<S>(subtree: &tt::Subtree<S>) -> Vec<SmolStr> {
 }
 
 impl AttrsWithOwner {
-    pub(crate) fn attrs_query(db: &dyn DefDatabase, def: AttrDefId) -> Self {
+    pub(crate) fn attrs_with_owner(db: &dyn DefDatabase, owner: AttrDefId) -> Self {
+        Self { attrs: db.attrs(owner), owner }
+    }
+
+    pub(crate) fn attrs_query(db: &dyn DefDatabase, def: AttrDefId) -> Attrs {
         let _p = profile::span("attrs_query");
         // FIXME: this should use `Trace` to avoid duplication in `source_map` below
         let raw_attrs = match def {
@@ -412,13 +416,10 @@ impl AttrsWithOwner {
                 }
             }
             AttrDefId::FieldId(it) => {
-                return Self { attrs: db.fields_attrs(it.parent)[it.local_id].clone(), owner: def };
+                return db.fields_attrs(it.parent)[it.local_id].clone();
             }
             AttrDefId::EnumVariantId(it) => {
-                return Self {
-                    attrs: db.variants_attrs(it.parent)[it.local_id].clone(),
-                    owner: def,
-                };
+                return db.variants_attrs(it.parent)[it.local_id].clone();
             }
             AttrDefId::AdtId(it) => match it {
                 AdtId::StructId(it) => attrs_from_item_tree(it.lookup(db).id, db),
@@ -461,7 +462,7 @@ impl AttrsWithOwner {
         };
 
         let attrs = raw_attrs.filter(db.upcast(), def.krate(db));
-        Self { attrs: Attrs(attrs), owner: def }
+        Attrs(attrs)
     }
 
     pub fn source_map(&self, db: &dyn DefDatabase) -> AttrSourceMap {
diff --git a/crates/hir-def/src/db.rs b/crates/hir-def/src/db.rs
@@ -98,6 +98,8 @@ pub trait DefDatabase: InternDatabase + ExpandDatabase + Upcast<dyn ExpandDataba
     #[salsa::invoke(DefMap::block_def_map_query)]
     fn block_def_map(&self, block: BlockId) -> Option<Arc<DefMap>>;
 
+    // region:data
+
     #[salsa::invoke(StructData::struct_data_query)]
     fn struct_data(&self, id: StructId) -> Arc<StructData>;
 
@@ -153,6 +155,8 @@ pub trait DefDatabase: InternDatabase + ExpandDatabase + Upcast<dyn ExpandDataba
     #[salsa::invoke(ProcMacroData::proc_macro_data_query)]
     fn proc_macro_data(&self, makro: ProcMacroId) -> Arc<ProcMacroData>;
 
+    // endregion:data
+
     #[salsa::invoke(Body::body_with_source_map_query)]
     fn body_with_source_map(&self, def: DefWithBodyId) -> (Arc<Body>, Arc<BodySourceMap>);
 
@@ -165,6 +169,8 @@ pub trait DefDatabase: InternDatabase + ExpandDatabase + Upcast<dyn ExpandDataba
     #[salsa::invoke(GenericParams::generic_params_query)]
     fn generic_params(&self, def: GenericDefId) -> Interned<GenericParams>;
 
+    // region:attrs
+
     #[salsa::invoke(Attrs::variants_attrs_query)]
     fn variants_attrs(&self, def: EnumId) -> Arc<ArenaMap<LocalEnumVariantId, Attrs>>;
 
@@ -184,7 +190,13 @@ pub trait DefDatabase: InternDatabase + ExpandDatabase + Upcast<dyn ExpandDataba
     ) -> Arc<ArenaMap<LocalFieldId, Either<AstPtr<ast::TupleField>, AstPtr<ast::RecordField>>>>;
 
     #[salsa::invoke(AttrsWithOwner::attrs_query)]
-    fn attrs(&self, def: AttrDefId) -> AttrsWithOwner;
+    fn attrs(&self, def: AttrDefId) -> Attrs;
+
+    #[salsa::transparent]
+    #[salsa::invoke(AttrsWithOwner::attrs_with_owner)]
+    fn attrs_with_owner(&self, def: AttrDefId) -> AttrsWithOwner;
+
+    // endregion:attrs
 
     #[salsa::invoke(LangItems::crate_lang_items_query)]
     fn crate_lang_items(&self, krate: CrateId) -> Arc<LangItems>;
diff --git a/crates/hir-expand/src/attrs.rs b/crates/hir-expand/src/attrs.rs
@@ -21,6 +21,7 @@ use crate::{
 /// Syntactical attributes, without filtering of `cfg_attr`s.
 #[derive(Default, Debug, Clone, PartialEq, Eq)]
 pub struct RawAttrs {
+    // FIXME: Make this a ThinArc
     entries: Option<Arc<[Attr]>>,
 }
 
diff --git a/crates/hir/src/attrs.rs b/crates/hir/src/attrs.rs
@@ -41,7 +41,7 @@ macro_rules! impl_has_attrs {
         impl HasAttrs for $def {
             fn attrs(self, db: &dyn HirDatabase) -> AttrsWithOwner {
                 let def = AttrDefId::$def_id(self.into());
-                db.attrs(def)
+                db.attrs_with_owner(def)
             }
             fn docs(self, db: &dyn HirDatabase) -> Option<Documentation> {
                 let def = AttrDefId::$def_id(self.into());

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,11 @@ fn parse_comma_sep<S>(subtree: &tt::Subtree<S>) -> Vec<SmolStr> {`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`impl AttrsWithOwner {`
`380`		`- pub(crate) fn attrs_query(db: &dyn DefDatabase, def: AttrDefId) -> Self {`
	`380`	`+ pub(crate) fn attrs_with_owner(db: &dyn DefDatabase, owner: AttrDefId) -> Self {`
	`381`	`+ Self { attrs: db.attrs(owner), owner }`
	`382`	`+ }`
	`383`	`+`
	`384`	`+ pub(crate) fn attrs_query(db: &dyn DefDatabase, def: AttrDefId) -> Attrs {`
`381`	`385`	`let _p = profile::span("attrs_query");`
`382`	`386`	// FIXME: this should use `Trace` to avoid duplication in `source_map` below
`383`	`387`	`let raw_attrs = match def {`
`@@ -412,13 +416,10 @@ impl AttrsWithOwner {`
`412`	`416`	`}`
`413`	`417`	`}`
`414`	`418`	`AttrDefId::FieldId(it) => {`
`415`		`- return Self { attrs: db.fields_attrs(it.parent)[it.local_id].clone(), owner: def };`
	`419`	`+ return db.fields_attrs(it.parent)[it.local_id].clone();`
`416`	`420`	`}`
`417`	`421`	`AttrDefId::EnumVariantId(it) => {`
`418`		`- return Self {`
`419`		`- attrs: db.variants_attrs(it.parent)[it.local_id].clone(),`
`420`		`- owner: def,`
`421`		`- };`
	`422`	`+ return db.variants_attrs(it.parent)[it.local_id].clone();`
`422`	`423`	`}`
`423`	`424`	`AttrDefId::AdtId(it) => match it {`
`424`	`425`	`AdtId::StructId(it) => attrs_from_item_tree(it.lookup(db).id, db),`
`@@ -461,7 +462,7 @@ impl AttrsWithOwner {`
`461`	`462`	`};`
`462`	`463`
`463`	`464`	`let attrs = raw_attrs.filter(db.upcast(), def.krate(db));`
`464`		`- Self { attrs: Attrs(attrs), owner: def }`
	`465`	`+ Attrs(attrs)`
`465`	`466`	`}`
`466`	`467`
`467`	`468`	`pub fn source_map(&self, db: &dyn DefDatabase) -> AttrSourceMap {`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ use crate::{`
`21`	`21`	/// Syntactical attributes, without filtering of `cfg_attr`s.
`22`	`22`	`#[derive(Default, Debug, Clone, PartialEq, Eq)]`
`23`	`23`	`pub struct RawAttrs {`
	`24`	`+ // FIXME: Make this a ThinArc`
`24`	`25`	`entries: Option<Arc<[Attr]>>,`
`25`	`26`	`}`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ macro_rules! impl_has_attrs {`
`41`	`41`	`impl HasAttrs for $def {`
`42`	`42`	`fn attrs(self, db: &dyn HirDatabase) -> AttrsWithOwner {`
`43`	`43`	`let def = AttrDefId::$def_id(self.into());`
`44`		`- db.attrs(def)`
	`44`	`+ db.attrs_with_owner(def)`
`45`	`45`	`}`
`46`	`46`	`fn docs(self, db: &dyn HirDatabase) -> Option<Documentation> {`
`47`	`47`	`let def = AttrDefId::$def_id(self.into());`