fix issue introduced that affected dep_graph by implementing traits

Author: ABouttefeux

compiler/rustc_middle/src/dep_graph/dep_node.rs

@@ -62,7 +62,7 @@ use crate::ty::TyCtxt;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_hir::def_id::{CrateNum, DefId, LocalDefId, CRATE_DEF_INDEX};
 use rustc_hir::definitions::DefPathHash;
-use rustc_hir::HirId;
+use rustc_hir::{HirId, HirOwner};
 use rustc_span::symbol::Symbol;
 use std::hash::Hash;
 
@@ -426,6 +426,25 @@ impl<'tcx> DepNodeParams<TyCtxt<'tcx>> for LocalDefId {
     }
 }
 
+impl<'tcx> DepNodeParams<TyCtxt<'tcx>> for HirOwner {
+    #[inline(always)]
+    fn can_reconstruct_query_key() -> bool {
+        LocalDefId::can_reconstruct_query_key()
+    }
+
+    fn to_fingerprint(&self, tcx: TyCtxt<'tcx>) -> Fingerprint {
+        self.def_id.to_fingerprint(tcx)
+    }
+
+    fn to_debug_str(&self, tcx: TyCtxt<'tcx>) -> String {
+        self.def_id.to_debug_str(tcx)
+    }
+
+    fn recover(tcx: TyCtxt<'tcx>, dep_node: &DepNode) -> Option<Self> {
+        LocalDefId::recover(tcx, dep_node).map(|def_id| HirOwner { def_id })
+    }
+}
+
 impl<'tcx> DepNodeParams<TyCtxt<'tcx>> for CrateNum {
     #[inline(always)]
     fn can_reconstruct_query_key() -> bool {

compiler/rustc_query_impl/src/profiling_support.rs

@@ -3,6 +3,7 @@ use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::profiling::SelfProfiler;
 use rustc_hir::def_id::{CrateNum, DefId, DefIndex, LocalDefId, CRATE_DEF_INDEX, LOCAL_CRATE};
 use rustc_hir::definitions::DefPathData;
+use rustc_hir::HirOwner;
 use rustc_middle::ty::{TyCtxt, WithOptConstParam};
 use rustc_query_system::query::{QueryCache, QueryCacheStore};
 use std::fmt::Debug;
@@ -165,6 +166,15 @@ impl SpecIntoSelfProfilingString for LocalDefId {
     }
 }
 
+impl SpecIntoSelfProfilingString for HirOwner {
+    fn spec_to_self_profile_string(
+        &self,
+        builder: &mut QueryKeyStringBuilder<'_, '_, '_>,
+    ) -> StringId {
+        self.def_id.spec_to_self_profile_string(builder)
+    }
+}
+
 impl<T: SpecIntoSelfProfilingString> SpecIntoSelfProfilingString for WithOptConstParam<T> {
     fn spec_to_self_profile_string(
         &self,