Fix tests/incremental. Required making the arg TokenStream part of the key.

Author: futile

compiler/rustc_expand/src/expand.rs

@@ -15,7 +15,9 @@ use rustc_ast::{
     NodeId, PatKind, StmtKind, TyKind, DUMMY_NODE_ID,
 };
 use rustc_ast_pretty::pprust;
+use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::flat_map_in_place::FlatMapInPlace;
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::PResult;
 use rustc_feature::Features;
@@ -396,14 +398,32 @@ pub struct MacroExpander<'a, 'b> {
     monotonic: bool, // cf. `cx.monotonic_expander()`
 }
 
+#[tracing::instrument(level = "debug", skip(tcx))]
 pub fn expand_legacy_bang<'tcx>(
     tcx: TyCtxt<'tcx>,
-    key: (LocalExpnId, LocalExpnId),
+    key: (LocalExpnId, LocalExpnId, Fingerprint),
 ) -> Result<(&'tcx TokenStream, usize), (Span, ErrorGuaranteed)> {
-    let (invoc_id, current_expansion) = dbg!(key);
-    dbg!(invoc_id.to_expn_id().expn_hash(), current_expansion.to_expn_id().expn_hash());
+    use tracing::debug;
+
+    let (invoc_id, current_expansion, arg_fingerprint) = key;
+
     let map = tcx.macro_map.borrow();
     let (arg, span, expander) = map.get(&invoc_id).as_ref().unwrap();
+    debug!(?arg);
+
+    // this (i.e., debug-printing `span`) somehow made the test pass??
+    // tracing::debug!(?span);
+
+    let arg_hash: Fingerprint = tcx.with_stable_hashing_context(|mut hcx| {
+        let mut hasher = StableHasher::new();
+        arg.flattened().hash_stable(&mut hcx, &mut hasher);
+        hasher.finish()
+    });
+
+    // sanity-check, to make sure we're not running for (maybe) old arguments
+    // that were loaded from the cache. this would certainly be a bug.
+    assert_eq!(arg_fingerprint, arg_hash);
+
     expander
         .expand(&tcx.sess, *span, arg.clone(), current_expansion)
         .map(|(tts, i)| (tcx.arena.alloc(tts) as &TokenStream, i))

compiler/rustc_middle/src/query/keys.rs

@@ -1,5 +1,6 @@
 //! Defines the set of legal keys that can be used in queries.
 
+use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_hir::def_id::{CrateNum, DefId, LocalDefId, LocalModDefId, ModDefId, LOCAL_CRATE};
 use rustc_hir::hir_id::{HirId, OwnerId};
 use rustc_query_system::query::{DefIdCache, DefaultCache, SingleCache, VecCache};
@@ -592,7 +593,7 @@ impl<'tcx> Key for (ValidityRequirement, ty::ParamEnvAnd<'tcx, Ty<'tcx>>) {
     }
 }
 
-impl Key for (LocalExpnId, LocalExpnId) {
+impl Key for (LocalExpnId, LocalExpnId, Fingerprint) {
     type Cache<V> = DefaultCache<Self, V>;
 
     fn default_span(&self, _: TyCtxt<'_>) -> Span {

compiler/rustc_middle/src/query/mod.rs

@@ -110,7 +110,7 @@ rustc_queries! {
         desc { "triggering a delayed bug for testing incremental" }
     }
 
-    query expand_legacy_bang(key: (LocalExpnId, LocalExpnId)) -> Result<(&'tcx TokenStream, usize), (Span, ErrorGuaranteed)> {
+    query expand_legacy_bang(key: (LocalExpnId, LocalExpnId, Fingerprint)) -> Result<(&'tcx TokenStream, usize), (Span, ErrorGuaranteed)> {
         no_hash
         // eval_always
         cache_on_disk_if { true }

compiler/rustc_resolve/src/macros.rs

@@ -9,7 +9,9 @@ use rustc_ast::tokenstream::TokenStream;
 use rustc_ast::{self as ast, attr, Crate, Inline, ItemKind, ModKind, NodeId};
 use rustc_ast_pretty::pprust;
 use rustc_attr::StabilityLevel;
+use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::intern::Interned;
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::{Applicability, StashKey};
 use rustc_expand::base::{
@@ -539,13 +541,26 @@ impl<'a, 'tcx> ResolverExpand for Resolver<'a, 'tcx> {
         invoc_id: LocalExpnId,
         current_expansion: LocalExpnId,
     ) -> Result<(TokenStream, usize), (Span, ErrorGuaranteed)> {
-        dbg!((
-            "resolver",
-            invoc_id.to_expn_id().expn_hash(),
-            current_expansion.to_expn_id().expn_hash()
-        ));
+        use tracing::debug;
+
+        debug!(
+            invoc_id_hash = ?invoc_id.to_expn_id().expn_hash(),
+            current_expansion_hash = ?current_expansion.to_expn_id().expn_hash()
+        );
+
+        let map = self.tcx().macro_map.borrow();
+        let (arg, _span, _expander) = map.get(&invoc_id).as_ref().unwrap();
+
+        debug!(?arg);
+
+        let arg_hash: Fingerprint = self.tcx.with_stable_hashing_context(|mut hcx| {
+            let mut hasher = StableHasher::new();
+            arg.flattened().hash_stable(&mut hcx, &mut hasher);
+            hasher.finish()
+        });
+
         self.tcx()
-            .expand_legacy_bang((invoc_id, current_expansion))
+            .expand_legacy_bang((invoc_id, current_expansion, arg_hash))
             .map(|(tts, i)| (tts.clone(), i))
     }
 }