From 6ffd654683900a81adda24b3a86e4c30fee31214 Mon Sep 17 00:00:00 2001
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Date: Mon, 7 Mar 2022 13:31:49 +0000
Subject: [PATCH] Check that the cached stable hash is the right one if debug
 assertions are enabled

---
 compiler/rustc_data_structures/src/intern.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/compiler/rustc_data_structures/src/intern.rs b/compiler/rustc_data_structures/src/intern.rs
index 1b187cd306e..bd62f30372e 100644
--- a/compiler/rustc_data_structures/src/intern.rs
+++ b/compiler/rustc_data_structures/src/intern.rs
@@ -160,9 +160,7 @@ impl<T: Hash> Hash for InTy<T> {
 
 impl<T: HashStable<CTX>, CTX: InternedHashingContext> HashStable<CTX> for InTy<T> {
     fn hash_stable(&self, hcx: &mut CTX, hasher: &mut StableHasher) {
-        let stable_hash = self.stable_hash;
-
-        if stable_hash == Fingerprint::ZERO {
+        if self.stable_hash == Fingerprint::ZERO || cfg!(debug_assertions) {
             // No cached hash available. This can only mean that incremental is disabled.
             // We don't cache stable hashes in non-incremental mode, because they are used
             // so rarely that the performance actually suffers.
@@ -174,9 +172,15 @@ impl<T: HashStable<CTX>, CTX: InternedHashingContext> HashStable<CTX> for InTy<T
                 hcx.with_def_path_and_no_spans(|hcx| self.internee.hash_stable(hcx, &mut hasher));
                 hasher.finish()
             };
+            if cfg!(debug_assertions) && self.stable_hash != Fingerprint::ZERO {
+                assert_eq!(
+                    stable_hash, self.stable_hash,
+                    "cached stable hash does not match freshly computed stable hash"
+                );
+            }
             stable_hash.hash_stable(hcx, hasher);
         } else {
-            stable_hash.hash_stable(hcx, hasher);
+            self.stable_hash.hash_stable(hcx, hasher);
         }
     }
 }