bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Avoid sorting in hash map stable hashing

Browse source
This commit is contained in:
Jakub Beránek 2021-12-12 20:24:56 +01:00
parent 58457bbfd3
commit a5f5f6b689
No known key found for this signature in database
GPG key ID: DBC553E540C2F619
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
compiler/rustc_data_structures/src/stable_hasher.rs
View file

@ -42,6 +42,7 @@ impl StableHasher {
} }
impl StableHasherResult for u128 { impl StableHasherResult for u128 {
#[inline]
fn finish(hasher: StableHasher) -> Self { fn finish(hasher: StableHasher) -> Self {
let (_0, _1) = hasher.finalize(); let (_0, _1) = hasher.finalize();
u128::from(_0) | (u128::from(_1) << 64) u128::from(_0) | (u128::from(_1) << 64)
@ -49,6 +50,7 @@ impl StableHasherResult for u128 {
} }
impl StableHasherResult for u64 { impl StableHasherResult for u64 {
#[inline]
fn finish(hasher: StableHasher) -> Self { fn finish(hasher: StableHasher) -> Self {
hasher.finalize().0 hasher.finalize().0
} }
@ -559,8 +561,16 @@ pub fn hash_stable_hashmap<HCX, K, V, R, SK, F>(
SK: HashStable<HCX> + Ord, SK: HashStable<HCX> + Ord,
F: Fn(&K, &HCX) -> SK, F: Fn(&K, &HCX) -> SK,
{ {
let mut entries: SmallVec<[_; 3]> = let hash = map
map.iter().map(|(k, v)| (to_stable_hash_key(k, hcx), v)).collect(); .iter()
entries.sort_unstable_by(|&(ref sk1, _), &(ref sk2, _)| sk1.cmp(sk2)); .map(|(key, value)| {
entries.hash_stable(hcx, hasher); let key = to_stable_hash_key(key, hcx);
let mut hasher = StableHasher::new();
key.hash_stable(hcx, &mut hasher);
value.hash_stable(hcx, &mut hasher);
hasher.finish::<u128>()
})
.reduce(|accum, value| accum.wrapping_mul(value));
map.len().hash_stable(hcx, hasher);
hash.hash_stable(hcx, hasher);
} }