From b0047c18cbcae77e28d37a5b0a3937914218d908 Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Sun, 31 Jul 2022 15:49:50 +0200
Subject: [PATCH] Stop forcing the hashing of bodies in types and expressions.
---
.../rustc_query_system/src/ich/impls_hir.rs | 22 +++++++------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/compiler/rustc_query_system/src/ich/impls_hir.rs b/compiler/rustc_query_system/src/ich/impls_hir.rs
index 3390ed9eb42..6a43487aea8 100644
--- a/compiler/rustc_query_system/src/ich/impls_hir.rs
+++ b/compiler/rustc_query_system/src/ich/impls_hir.rs
@@ -21,22 +21,16 @@ impl<'ctx> rustc_hir::HashStableContext for StableHashingContext<'ctx> {
}
fn hash_hir_expr(&mut self, expr: &hir::Expr<'_>, hasher: &mut StableHasher) {
- self.while_hashing_hir_bodies(true, |hcx| {
- let hir::Expr { hir_id, ref span, ref kind } = *expr;
-
- hir_id.hash_stable(hcx, hasher);
- span.hash_stable(hcx, hasher);
- kind.hash_stable(hcx, hasher);
- })
+ let hir::Expr { hir_id, ref span, ref kind } = *expr;
+ hir_id.hash_stable(self, hasher);
+ span.hash_stable(self, hasher);
+ kind.hash_stable(self, hasher);
}
fn hash_hir_ty(&mut self, ty: &hir::Ty<'_>, hasher: &mut StableHasher) {
- self.while_hashing_hir_bodies(true, |hcx| {
- let hir::Ty { hir_id, ref kind, ref span } = *ty;
-
- hir_id.hash_stable(hcx, hasher);
- kind.hash_stable(hcx, hasher);
- span.hash_stable(hcx, hasher);
- })
+ let hir::Ty { hir_id, ref kind, ref span } = *ty;
+ hir_id.hash_stable(self, hasher);
+ kind.hash_stable(self, hasher);
+ span.hash_stable(self, hasher);
}
}