Eliminate the last user of the hir_crate query

Author: oli-obk

compiler/rustc_middle/src/hir/map.rs

@@ -6,11 +6,10 @@ use rustc_data_structures::svh::Svh;
 use rustc_data_structures::sync::{DynSend, DynSync, par_for_each_in, try_par_for_each_in};
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::{CRATE_DEF_ID, DefId, LOCAL_CRATE, LocalDefId, LocalModDefId};
-use rustc_hir::definitions::{DefKey, DefPath, DefPathHash};
+use rustc_hir::definitions::{DefKey, DefPath, DefPathHash, Definitions};
 use rustc_hir::intravisit::Visitor;
 use rustc_hir::*;
 use rustc_hir_pretty as pprust_hir;
-use rustc_index::IndexSlice;
 use rustc_span::def_id::StableCrateId;
 use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol, kw, sym, with_metavar_spans};
 
@@ -1130,13 +1129,13 @@ impl<'tcx> pprust_hir::PpAnn for TyCtxt<'tcx> {
 
 /// Compute the hash for the HIR of the full crate.
 /// This hash will then be part of the crate_hash which is stored in the metadata.
-fn compute_hir_hash(
-    tcx: TyCtxt<'_>,
-    owners: &IndexSlice<LocalDefId, MaybeOwner<'_>>,
-) -> Fingerprint {
-    let mut hir_body_nodes: Vec<_> = owners
-        .iter_enumerated()
-        .filter_map(|(def_id, info)| {
+fn compute_hir_hash(tcx: TyCtxt<'_>, definitions: &Definitions) -> Fingerprint {
+    let mut hir_body_nodes: Vec<_> = definitions
+        .def_path_table()
+        .def_keys()
+        .filter_map(|local_def_index| {
+            let def_id = LocalDefId { local_def_index };
+            let info = tcx.hir_owner(def_id);
             let info = info.as_owner()?;
             let def_path_hash = tcx.hir_def_path_hash(def_id);
             Some((def_path_hash, info))
@@ -1152,8 +1151,8 @@ fn compute_hir_hash(
 }
 
 pub(super) fn crate_hash(tcx: TyCtxt<'_>, _: LocalCrate) -> Svh {
-    let krate = tcx.hir_crate(());
-    let hir_body_hash = compute_hir_hash(tcx, &krate.owners);
+    let definitions = tcx.untracked().definitions.freeze();
+    let hir_body_hash = compute_hir_hash(tcx, definitions);
 
     let upstream_crates = upstream_crates(tcx);
 
@@ -1196,7 +1195,6 @@ pub(super) fn crate_hash(tcx: TyCtxt<'_>, _: LocalCrate) -> Svh {
         source_file_names.hash_stable(&mut hcx, &mut stable_hasher);
         debugger_visualizers.hash_stable(&mut hcx, &mut stable_hasher);
         if tcx.sess.opts.incremental.is_some() {
-            let definitions = tcx.untracked().definitions.freeze();
             let mut owner_spans: Vec<_> = definitions
                 .def_path_table()
                 .def_keys()