Store hir_id_to_def_id in OwnerInfo.

2021-11-21 19:04:47 +01:00 · 2021-11-21 19:04:47 +01:00 · 80132c3ce4
commit 80132c3ce4
parent 17dfae79bb
5 changed files with 31 additions and 19 deletions
--- a/compiler/rustc_middle/src/hir/map/mod.rs
+++ b/compiler/rustc_middle/src/hir/map/mod.rs
@ -204,8 +204,11 @@ impl<'hir> Map<'hir> {
        if hir_id.local_id == ItemLocalId::new(0) {
            Some(hir_id.owner)
        } else {
-            // FIXME(#85914) is this access safe for incr. comp.?
-            self.tcx.untracked_resolutions.definitions.opt_hir_id_to_local_def_id(hir_id)
+            self.tcx
+                .hir_owner_nodes(hir_id.owner)?
+                .local_id_to_def_id
+                .get(&hir_id.local_id)
+                .copied()
        }
    }