Return hir_attr_map query

Author: aerooneqq

compiler/rustc_middle/src/hir/map.rs

@@ -18,7 +18,7 @@ use rustc_hir_pretty as pprust_hir;
 use rustc_span::def_id::StableCrateId;
 use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol, kw, with_metavar_spans};
 
-use crate::hir::{ModuleItems, nested_filter};
+use crate::hir::{MaybeOwner, ModuleItems, nested_filter};
 use crate::middle::debugger_visualizer::DebuggerVisualizerFile;
 use crate::query::{IntoQueryKey, LocalCrate};
 use crate::ty::TyCtxt;
@@ -115,10 +115,6 @@ impl<'tcx> TyCtxt<'tcx> {
         self.owner(id.def_id).as_owner().map(|o| &o.delayed_lints)
     }
 
-    pub fn hir_attr_map(self, id: OwnerId) -> &'tcx AttributeMap<'tcx> {
-        self.owner(id.def_id).as_owner().map_or(AttributeMap::EMPTY, |o| &o.attrs)
-    }
-
     pub fn in_scope_traits_map(
         self,
         id: OwnerId,

compiler/rustc_middle/src/hir/mod.rs

@@ -434,6 +434,8 @@ pub fn provide(providers: &mut Providers) {
     providers.hir_crate_items = map::hir_crate_items;
     providers.crate_hash = map::crate_hash;
     providers.hir_module_items = map::hir_module_items;
+    providers.hir_attr_map =
+        |tcx, id| tcx.owner(id.def_id).as_owner().map_or(AttributeMap::EMPTY, |o| &o.attrs);
     // Serves as an entry point for getting `MaybeOwner`. As owner can either be in
     // `owners` of `hir_crate` or it can be delayed AST owner (i.e., delegations)
     // we need to firstly check in `hir_crate` and then delayed AST owners.

compiler/rustc_middle/src/queries.rs

@@ -251,6 +251,15 @@ rustc_queries! {
         desc { "getting HIR parent of `{}`", tcx.def_path_str(key) }
     }
 
+    /// Gives access to the HIR attributes inside the HIR owner `key`.
+    ///
+    /// This can be conveniently accessed by `tcx.hir_*` methods.
+    /// Avoid calling this query directly.
+    query hir_attr_map(key: hir::OwnerId) -> &'tcx hir::AttributeMap<'tcx> {
+        desc { "getting HIR owner attributes in `{}`", tcx.def_path_str(key) }
+        feedable
+    }
+
     /// Returns the *default* of the const pararameter given by `DefId`.
     ///
     /// E.g., given `struct Ty<const N: usize = 3>;` this returns `3` for `N`.