remove some HIR hashing

Author: Daniel-B-Smith

compiler/rustc_ast_lowering/src/lib.rs

@@ -41,11 +41,11 @@ use std::sync::Arc;
 use rustc_ast::node_id::NodeMap;
 use rustc_ast::visit::Visitor;
 use rustc_ast::{self as ast, *};
-use rustc_attr_parsing::{AttributeParser, EmitAttribute, Late, OmitDoc};
-use rustc_data_structures::fingerprint::Fingerprint;
+use rustc_attr_parsing::{AttributeParser, EmitAttribute, Late, OmitDoc};        
+//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::{HashStable, StableHasher};
 use rustc_data_structures::steal::Steal;
 use rustc_data_structures::tagged_ptr::TaggedRef;
 use rustc_errors::{DiagArgFromDisplay, DiagCtxtHandle};
@@ -57,7 +57,7 @@ use rustc_hir::{
     self as hir, AngleBrackets, ConstArg, GenericArg, HirId, ItemLocalMap, LifetimeSource,
     LifetimeSyntax, ParamName, Target, TraitCandidate, find_attr,
 };
-use rustc_index::{Idx, IndexSlice, IndexVec};
+use rustc_index::{Idx, IndexVec};
 use rustc_macros::extension;
 use rustc_middle::hir::{self as mid_hir};
 use rustc_middle::span_bug;
@@ -507,7 +507,7 @@ fn index_crate<'a, 'b>(
 
 /// 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(
+/*fn compute_hir_hash(
     tcx: TyCtxt<'_>,
     owners: &IndexSlice<LocalDefId, hir::MaybeOwner<'_>>,
 ) -> Fingerprint {
@@ -526,7 +526,7 @@ fn compute_hir_hash(
         hir_body_nodes.hash_stable(&mut hcx, &mut stable_hasher);
         stable_hasher.finish()
     })
-}
+}*/
 
 pub fn lower_to_hir(tcx: TyCtxt<'_>, (): ()) -> mid_hir::Crate<'_> {
     // Queries that borrow `resolver_for_lowering`.
@@ -562,11 +562,11 @@ 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() { Some(compute_hir_hash(tcx, &owners)) } else { None };
+    //    let opt_hir_hash =
+    //      if tcx.needs_crate_hash() { Some(tcx.crate_hash(LOCAL_CRATE)) } else { None };
 
     let delayed_resolver = Steal::new((resolver, krate));
-    mid_hir::Crate::new(owners, delayed_ids, delayed_resolver, opt_hir_hash)
+    mid_hir::Crate::new(owners, delayed_ids, delayed_resolver, None)
 }
 
 /// Lowers an AST owner corresponding to `def_id`, now only delegations are lowered this way.

compiler/rustc_data_structures/src/svh.rs

@@ -23,7 +23,7 @@ use crate::fingerprint::Fingerprint;
     HashStable_NoContext
 )]
 pub struct Svh {
-    hash: Fingerprint,
+    pub hash: Fingerprint,
 }
 
 impl Svh {

compiler/rustc_metadata/src/rmeta/mod.rs

@@ -1,7 +1,6 @@
 use std::marker::PhantomData;
 use std::num::NonZero;
 
-use rustc_session::config::mitigation_coverage::DeniedPartialMitigation;
 use decoder::LazyDecoder;
 pub(crate) use decoder::{CrateMetadata, CrateNumMap, MetadataBlob, TargetModifiers};
 use def_path_hash_map::DefPathHashMapRef;
@@ -36,6 +35,7 @@ use rustc_middle::mir::ConstValue;
 use rustc_middle::ty::fast_reject::SimplifiedType;
 use rustc_middle::ty::{self, Ty, TyCtxt};
 use rustc_middle::util::Providers;
+use rustc_session::config::mitigation_coverage::DeniedPartialMitigation;
 use rustc_session::config::{SymbolManglingVersion, TargetModifier};
 use rustc_session::cstore::{CrateDepKind, ForeignModule, LinkagePreference, NativeLib};
 use rustc_span::edition::Edition;

compiler/rustc_middle/src/hir/map.rs

@@ -4,7 +4,7 @@
 
 use rustc_abi::ExternAbi;
 use rustc_ast::visit::{VisitorResult, walk_list};
-use rustc_data_structures::sync::{DynSend, DynSync, par_for_each_in, try_par_for_each_in, spawn};
+use rustc_data_structures::sync::{DynSend, DynSync, par_for_each_in, spawn, try_par_for_each_in};
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::{DefId, LocalDefId, LocalModDefId};
 use rustc_hir::definitions::{DefKey, DefPath, DefPathHash};

compiler/rustc_middle/src/hir/mod.rs

@@ -8,19 +8,21 @@ pub mod place;
 
 use std::sync::Arc;
 
+//use rustc_hir::def_id::LOCAL_CRATE;
 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::steal::Steal;
+use rustc_data_structures::svh::Svh;
 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_span::{ErrorGuaranteed, ExpnId, HashStableContext, Span};
+use rustc_span::{ErrorGuaranteed, ExpnId, Span};
 
 use crate::query::Providers;
 use crate::ty::{ResolverAstLowering, TyCtxt};
@@ -31,8 +33,8 @@ use crate::ty::{ResolverAstLowering, TyCtxt};
 /// For more details, see the [rustc dev guide].
 ///
 /// [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/hir.html
-#[derive(Debug)]
 pub struct Crate<'hir> {
+    //    tcx: TyCtxt<'hir>,
     // This field is private by intention, access it through `owner` method.
     owners: IndexVec<LocalDefId, MaybeOwner<'hir>>,
     // Ids of delayed AST owners which are lowered through `lower_delayed_owner` query.
@@ -41,17 +43,27 @@ pub struct Crate<'hir> {
     // and then stolen and dropped in `force_delayed_owners_lowering`.
     pub delayed_resolver: Steal<(ResolverAstLowering<'hir>, Arc<ast::Crate>)>,
     // Only present when incr. comp. is enabled.
-    pub opt_hir_hash: Option<Fingerprint>,
+    pub opt_hash: Option<Svh>,
+}
+
+impl std::fmt::Debug for Crate<'_> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Crate")
+            .field("owners", &self.owners)
+            .field("delayed_ids", &self.delayed_ids)
+            .field("delayed_resolver", &self.delayed_resolver)
+            .finish()
+    }
 }
 
 impl<'hir> Crate<'hir> {
     pub fn new(
         owners: IndexVec<LocalDefId, MaybeOwner<'hir>>,
         delayed_ids: FxIndexSet<LocalDefId>,
         delayed_resolver: Steal<(ResolverAstLowering<'hir>, Arc<ast::Crate>)>,
-        opt_hir_hash: Option<Fingerprint>,
+        opt_hash: Option<Svh>,
     ) -> Crate<'hir> {
-        Crate { owners, delayed_ids, delayed_resolver, opt_hir_hash }
+        Crate { owners, delayed_ids, delayed_resolver, opt_hash }
     }
 
     /// Serves as an entry point for getting `MaybeOwner`. As owner can either be in
@@ -76,12 +88,11 @@ impl<'hir> Crate<'hir> {
     }
 }
 
-impl<Hcx: HashStableContext> HashStable<Hcx> for Crate<'_> {
+/*impl<Hcx: HashStableContext> HashStable<Hcx> for Crate<'_> {
     fn hash_stable(&self, hcx: &mut Hcx, hasher: &mut StableHasher) {
-        let Crate { opt_hir_hash, .. } = self;
-        opt_hir_hash.unwrap().hash_stable(hcx, hasher)
+        self.tcx.crate_hash(LOCAL_CRATE).hash_stable(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,6 +208,7 @@ rustc_queries! {
     query hir_crate(key: ()) -> &'tcx Crate<'tcx> {
         arena_cache
         eval_always
+        no_hash
         desc { "getting the crate HIR" }
     }
 

compiler/rustc_query_impl/src/query_impl.rs

@@ -1,3 +1,4 @@
+//use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_middle::queries::TaggedQueryKey;
 use rustc_middle::query::erase::{self, Erased};
 use rustc_middle::query::{AsLocalQueryKey, QueryMode, QueryVTable};
@@ -189,6 +190,7 @@ macro_rules! define_queries {
                         hash_value_fn: Some(|hcx, erased_value: &erase::Erased<Value<'tcx>>| {
                             let value = erase::restore_val(*erased_value);
                             rustc_middle::dep_graph::hash_result(hcx, &value)
+                            //Fingerprint::new(0, 0)
                         }),
 
                         format_value: |erased_value: &erase::Erased<Value<'tcx>>| {