Restore HIR crate hashing

Author: Daniel-B-Smith

compiler/rustc_ast_lowering/src/lib.rs

@@ -45,6 +45,7 @@ use rustc_attr_parsing::{AttributeParser, OmitDoc, Recovery, ShouldEmit};
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxIndexSet;
 use rustc_data_structures::sorted_map::SortedMap;
+use rustc_data_structures::stable_hasher::{StableHash, StableHasher};
 use rustc_data_structures::steal::Steal;
 use rustc_data_structures::tagged_ptr::TaggedRef;
 use rustc_errors::{DiagArgFromDisplay, DiagCtxtHandle};
@@ -560,11 +561,8 @@ pub fn lower_to_hir(tcx: TyCtxt<'_>, (): ()) -> mid_hir::Crate<'_> {
     }
 
     // Don't hash unless necessary, because it's expensive.
-    let opt_hir_hash = if tcx.needs_crate_hash() && !tcx.needs_metadata() {
-        Some(compute_hir_hash(tcx, &owners))
-    } else {
-        None
-    };
+    let opt_hir_hash =
+        if tcx.needs_crate_hash() { Some(compute_hir_hash(tcx, &owners)) } else { None };
 
     let delayed_resolver = Steal::new((resolver, krate));
     mid_hir::Crate::new(owners, delayed_ids, delayed_resolver, opt_hir_hash)

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -3,7 +3,7 @@ use std::mem;
 use std::sync::Arc;
 
 use rustc_data_structures::fingerprint::Fingerprint;
-use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
+use rustc_data_structures::stable_hasher::{StableHash, StableHasher};
 use rustc_data_structures::svh::Svh;
 use rustc_hir::attrs::Deprecation;
 use rustc_hir::def::{CtorKind, DefKind};
@@ -807,10 +807,10 @@ pub(super) fn crate_hash(tcx: TyCtxt<'_>) -> Svh {
 
     let crate_hash: Fingerprint = tcx.with_stable_hashing_context(|mut hcx| {
         let mut stable_hasher = StableHasher::new();
-        hir_body_hash.hash_stable(&mut hcx, &mut stable_hasher);
-        upstream_crates.hash_stable(&mut hcx, &mut stable_hasher);
-        //source_file_names.hash_stable(&mut hcx, &mut stable_hasher);
-        //debugger_visualizers.hash_stable(&mut hcx, &mut stable_hasher);
+        hir_body_hash.stable_hash(&mut hcx, &mut stable_hasher);
+        upstream_crates.stable_hash(&mut hcx, &mut stable_hasher);
+        //source_file_names.stable_hash(&mut hcx, &mut stable_hasher);
+        //debugger_visualizers.stable_hash(&mut hcx, &mut stable_hasher);
         if tcx.sess.opts.incremental.is_some() {
             let definitions = tcx.untracked().definitions.freeze();
             let mut owner_spans: Vec<_> = tcx
@@ -824,17 +824,17 @@ pub(super) fn crate_hash(tcx: TyCtxt<'_>) -> Svh {
                 })
                 .collect();
             owner_spans.sort_unstable_by_key(|bn| bn.0);
-            owner_spans.hash_stable(&mut hcx, &mut stable_hasher);
+            owner_spans.stable_hash(&mut hcx, &mut stable_hasher);
         }
-        tcx.sess.opts.dep_tracking_hash(true).hash_stable(&mut hcx, &mut stable_hasher);
-        tcx.stable_crate_id(LOCAL_CRATE).hash_stable(&mut hcx, &mut stable_hasher);
+        tcx.sess.opts.dep_tracking_hash(true).stable_hash(&mut hcx, &mut stable_hasher);
+        tcx.stable_crate_id(LOCAL_CRATE).stable_hash(&mut hcx, &mut stable_hasher);
         // Hash visibility information since it does not appear in HIR.
         // FIXME: Figure out how to remove `visibilities_for_hashing` by hashing visibilities on
         // the fly in the resolver, storing only their accumulated hash in `ResolverGlobalCtxt`,
         // and combining it with other hashes here.
-        //resolutions.visibilities_for_hashing.hash_stable(&mut hcx, &mut stable_hasher);
+        //resolutions.visibilities_for_hashing.stable_hash(&mut hcx, &mut stable_hasher);
         /*with_metavar_spans(|mspans| {
-            mspans.freeze_and_get_read_spans().hash_stable(&mut hcx, &mut stable_hasher);
+            mspans.freeze_and_get_read_spans().stable_hash(&mut hcx, &mut stable_hasher);
         });*/
         stable_hasher.finish()
     });

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -11,7 +11,7 @@ use std::sync::Arc;
 use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
 use rustc_data_structures::memmap::{Mmap, MmapMut};
 use rustc_data_structures::owned_slice::slice_owned;
-use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
+use rustc_data_structures::stable_hasher::{StableHash, StableHasher};
 use rustc_data_structures::sync::{par_for_each_in, par_join};
 use rustc_data_structures::temp_dir::MaybeTempDir;
 use rustc_data_structures::thousands::usize_with_underscores;
@@ -96,7 +96,7 @@ macro_rules! context_encoder_methods {
     ($($name:ident($ty:ty);)*) => {
         #[inline]
         $(fn $name(&mut self, value: $ty) {
-            //value.hash_stable(&mut self.hcx, &mut self.stable_hasher);
+            //value.stable_hash(&mut self.hcx, &mut self.stable_hasher);
             self.opaque.$name(value)
         })*
     }
@@ -129,7 +129,7 @@ impl<'a> ContextEncoder<'a> {
 
     #[inline]
     pub(super) fn write_m_with<const N: usize>(&mut self, b: &[u8; N], m: usize) {
-        //(b[..m]).hash_stable(&mut self.hcx, &mut self.stable_hasher);
+        //(b[..m]).stable_hash(&mut self.hcx, &mut self.stable_hasher);
         self.opaque.write_with(|dest| {
             *dest = *b;
             m
@@ -775,7 +775,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
             /*tcx.sess
             .opts
             .dep_tracking_hash(true)
-            .hash_stable(&mut self.encoder.hcx, &mut self.encoder.stable_hasher)*/
+            .stable_hash(&mut self.encoder.hcx, &mut self.encoder.stable_hasher)*/
             let new_hash = Svh::new(self.encoder.opaque.hash());
 
             /*eprintln!("crate: {:?}", tcx.crate_name(LOCAL_CRATE));
@@ -2667,7 +2667,7 @@ fn with_encode_metadata_header(
 ) {
     tcx.with_stable_hashing_context(|mut hcx| {
         let mut stable_hasher = StableHasher::new();
-        tcx.sess.opts.dep_tracking_hash(true).hash_stable(&mut hcx, &mut stable_hasher);
+        tcx.sess.opts.dep_tracking_hash(true).stable_hash(&mut hcx, &mut stable_hasher);
         let mut encoder = opaque::FileEncoder::new(path, hcx, &mut stable_hasher)
             .unwrap_or_else(|err| tcx.dcx().emit_fatal(FailCreateFileEncoder { err }));
         encoder.emit_raw_bytes(METADATA_HEADER);

compiler/rustc_metadata/src/rmeta/table.rs

@@ -1,7 +1,7 @@
 use rustc_hir::def::CtorOf;
 use rustc_index::Idx;
 
-use crate::rmeta::decoder::{MetaBlob, Metadata};
+use crate::rmeta::decoder::MetaBlob;
 use crate::rmeta::encoder::ContextEncoder;
 use crate::rmeta::*;
 

compiler/rustc_middle/src/hir/mod.rs

@@ -12,14 +12,14 @@ use rustc_ast::{self as ast};
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxIndexSet;
 use rustc_data_structures::sorted_map::SortedMap;
-use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
+use rustc_data_structures::stable_hasher::{StableHash, StableHashCtxt, StableHasher};
 use rustc_data_structures::steal::Steal;
 use rustc_data_structures::sync::{DynSend, DynSync, try_par_for_each_in};
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::{DefId, LocalDefId, LocalModDefId};
 use rustc_hir::*;
 use rustc_index::IndexVec;
-use rustc_macros::{Decodable, Encodable, HashStable};
+use rustc_macros::{Decodable, Encodable, StableHash};
 use rustc_span::{ErrorGuaranteed, ExpnId, Span};
 
 use crate::query::Providers;
@@ -76,12 +76,12 @@ impl<'hir> Crate<'hir> {
     }
 }
 
-/*impl StableHash for Crate<'_> {
+impl StableHash for Crate<'_> {
     fn stable_hash<Hcx: StableHashCtxt>(&self, hcx: &mut Hcx, hasher: &mut StableHasher) {
         let Crate { opt_hir_hash, .. } = self;
         opt_hir_hash.unwrap().stable_hash(hcx, hasher)
     }
-}*/
+}
 
 /// Gather the LocalDefId for each item-like within a module, including items contained within
 /// bodies. The Ids are in visitor order. This is used to partition a pass between modules.

compiler/rustc_middle/src/queries.rs

@@ -208,7 +208,6 @@ rustc_queries! {
     query hir_crate(key: ()) -> &'tcx Crate<'tcx> {
         arena_cache
         eval_always
-        no_hash
         desc { "getting the crate HIR" }
     }