Comment out a currently failing test

DO NOT SUBMIT!

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, IndexVec};
+use rustc_index::{Idx, IndexSlice, 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 index_crate<'a, 'b>(
         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,14 @@ 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(tcx.crate_hash(LOCAL_CRATE)) } else { None };
+    let opt_hir_hash = if tcx.needs_crate_hash() && !tcx.needs_metadata() {
+        Some(compute_hir_hash(tcx, &owners))
+    } else {
+        None
+    };
 
     let delayed_resolver = Steal::new((resolver, krate));
-    mid_hir::Crate::new(owners, delayed_ids, delayed_resolver, None)
+    mid_hir::Crate::new(owners, delayed_ids, delayed_resolver, opt_hir_hash)
 }
 
 /// 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 {
-    pub hash: Fingerprint,
+    hash: Fingerprint,
 }
 
 impl Svh {

compiler/rustc_metadata/src/fs.rs

@@ -54,7 +54,7 @@ pub fn encode_and_write_metadata(tcx: TyCtxt<'_>) -> EncodedMetadata {
         None
     };
 
-    if tcx.needs_metadata() || tcx.needs_crate_hash() {
+    if tcx.needs_metadata() {
         encode_metadata(tcx, &metadata_filename, metadata_stub_filename.as_deref());
     } else {
         // Always create a file at `metadata_filename`, even if we have nothing to write to it.

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

@@ -2,13 +2,17 @@ use std::any::Any;
 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::svh::Svh;
 use rustc_hir::attrs::Deprecation;
 use rustc_hir::def::{CtorKind, DefKind};
 use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, LOCAL_CRATE};
 use rustc_hir::definitions::{DefKey, DefPath, DefPathHash};
 use rustc_middle::arena::ArenaAllocatable;
 use rustc_middle::bug;
 use rustc_middle::metadata::{AmbigModChild, ModChild};
+use rustc_middle::middle::debugger_visualizer::DebuggerVisualizerFile;
 use rustc_middle::middle::exported_symbols::ExportedSymbol;
 use rustc_middle::middle::stability::DeprecationEntry;
 use rustc_middle::queries::ExternProviders;
@@ -20,7 +24,7 @@ use rustc_serialize::Decoder;
 use rustc_session::StableCrateId;
 use rustc_session::cstore::{CrateStore, ExternCrate};
 use rustc_span::hygiene::ExpnId;
-use rustc_span::{Span, Symbol, kw};
+use rustc_span::{Span, Symbol, kw, with_metavar_spans};
 
 use super::{Decodable, DecodeIterator};
 use crate::creader::{CStore, LoadedMacro};
@@ -752,17 +756,20 @@ fn provide_cstore_hooks(providers: &mut Providers) {
     };
 
     providers.queries.crate_hash = |tcx: TyCtxt<'_>, _: LocalCrate| {
-        *tcx.untracked()
-            .local_crate_hash
-            .get()
-            .expect("crate_hash(LOCAL_CRATE) called before metadata encoding")
+        if tcx.needs_metadata() {
+            *tcx.untracked()
+                .local_crate_hash
+                .get()
+                .expect("crate_hash(LOCAL_CRATE) called before metadata encoding")
+        } else {
+            crate_hash(tcx)
+        }
     };
 }
 
-/*pub(super) fn crate_hash(tcx: TyCtxt<'_>, cnum: rustc_hir::def_id::CrateNum) -> Svh {
-    let cstore = CStore::from_tcx(tcx);
-    let crate_data = cstore.get_crate_data(cnum);
-    crate_data.root.header.hash
+pub(super) fn crate_hash(tcx: TyCtxt<'_>) -> Svh {
+    let krate = tcx.hir_crate(());
+    let hir_body_hash = krate.opt_hir_hash.expect("HIR hash missing while computing crate hash");
 
     let upstream_crates = upstream_crates(tcx);
 
@@ -800,7 +807,7 @@ fn provide_cstore_hooks(providers: &mut Providers) {
 
     let crate_hash: Fingerprint = tcx.with_stable_hashing_context(|mut hcx| {
         let mut stable_hasher = StableHasher::new();
-        metadata_hash.hash_stable(&mut hcx, &mut stable_hasher);
+        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);
@@ -847,4 +854,4 @@ fn upstream_crates(tcx: TyCtxt<'_>) -> Vec<(StableCrateId, Svh)> {
         .collect();
     upstream_crates.sort_unstable_by_key(|&(stable_crate_id, _)| stable_crate_id);
     upstream_crates
-}*/
+}

compiler/rustc_middle/src/hir/mod.rs

@@ -8,21 +8,19 @@ 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, Span};
+use rustc_span::{ErrorGuaranteed, ExpnId, HashStableContext, Span};
 
 use crate::query::Providers;
 use crate::ty::{ResolverAstLowering, TyCtxt};
@@ -33,8 +31,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.
@@ -43,27 +41,17 @@ 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_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()
-    }
+    pub opt_hir_hash: Option<Fingerprint>,
 }
 
 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_hash: Option<Svh>,
+        opt_hir_hash: Option<Fingerprint>,
     ) -> Crate<'hir> {
-        Crate { owners, delayed_ids, delayed_resolver, opt_hash }
+        Crate { owners, delayed_ids, delayed_resolver, opt_hir_hash }
     }
 
     /// Serves as an entry point for getting `MaybeOwner`. As owner can either be in
@@ -88,11 +76,12 @@ 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) {
-        self.tcx.crate_hash(LOCAL_CRATE).hash_stable(hcx, hasher)
+        let Crate { opt_hir_hash, .. } = self;
+        opt_hir_hash.unwrap().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_query_impl/src/query_impl.rs

@@ -1,4 +1,3 @@
-//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};
@@ -190,7 +189,6 @@ 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>>| {