Auto merge of #147387 - azhogin:azhogin/hir_owner_parent_opt, r=<try>

hir_owner_parent optimized to inlined call for non-incremental build

Author: rust-bors[bot]

compiler/rustc_middle/src/hir/mod.rs

@@ -203,6 +203,26 @@ impl<'tcx> TyCtxt<'tcx> {
             }
         })
     }
+
+    #[inline]
+    pub fn hir_owner_parent(self, owner_id: OwnerId) -> HirId {
+        if self.dep_graph.is_fully_enabled() {
+            self.hir_owner_parent_q(owner_id)
+        } else {
+            self.opt_local_parent(owner_id.def_id).map_or(CRATE_HIR_ID, |parent_def_id| {
+                let parent_owner_id = self.local_def_id_to_hir_id(parent_def_id).owner;
+                HirId {
+                    owner: parent_owner_id,
+                    local_id: self.hir_crate(()).owners[parent_owner_id.def_id]
+                        .unwrap()
+                        .parenting
+                        .get(&owner_id.def_id)
+                        .copied()
+                        .unwrap_or(ItemLocalId::ZERO),
+                }
+            })
+        }
+    }
 }
 
 /// Hashes computed by [`TyCtxt::hash_owner_nodes`] if necessary.
@@ -224,7 +244,7 @@ pub fn provide(providers: &mut Providers) {
     };
     providers.opt_hir_owner_nodes =
         |tcx, id| tcx.hir_crate(()).owners.get(id)?.as_owner().map(|i| &i.nodes);
-    providers.hir_owner_parent = |tcx, owner_id| {
+    providers.hir_owner_parent_q = |tcx, owner_id| {
         tcx.opt_local_parent(owner_id.def_id).map_or(CRATE_HIR_ID, |parent_def_id| {
             let parent_owner_id = tcx.local_def_id_to_hir_id(parent_def_id).owner;
             HirId {

compiler/rustc_middle/src/query/mod.rs

@@ -255,7 +255,7 @@ rustc_queries! {
     ///
     /// This can be conveniently accessed by `tcx.hir_*` methods.
     /// Avoid calling this query directly.
-    query hir_owner_parent(key: hir::OwnerId) -> hir::HirId {
+    query hir_owner_parent_q(key: hir::OwnerId) -> hir::HirId {
         desc { |tcx| "getting HIR parent of `{}`", tcx.def_path_str(key) }
     }