Auto merge of #78415 - tgnottingham:expn_id_tag_hash, r=Aaron1011

rustc_span: avoid hashing ExpnId tag when using cached hash
This commit is contained in:
bors 2020-10-28 20:03:55 +00:00
commit 31ee872db5

View File

@ -1925,9 +1925,7 @@ fn hash_stable(&self, ctx: &mut CTX, hasher: &mut StableHasher) {
return;
}
TAG_NOT_ROOT.hash_stable(ctx, hasher);
let index = self.as_u32() as usize;
let res = CACHE.with(|cache| cache.borrow().get(index).copied().flatten());
if let Some(res) = res {
@ -1936,6 +1934,7 @@ fn hash_stable(&self, ctx: &mut CTX, hasher: &mut StableHasher) {
let new_len = index + 1;
let mut sub_hasher = StableHasher::new();
TAG_NOT_ROOT.hash_stable(ctx, &mut sub_hasher);
self.expn_data().hash_stable(ctx, &mut sub_hasher);
let sub_hash: Fingerprint = sub_hasher.finish();