OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix 32 vs 64 bit platform instability in StableHasher.

Browse Source
This commit is contained in:
Michael Woerister 2017-10-25 16:49:55 +02:00
parent b2478052f8
commit 89909c76a3
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/librustc_data_structures/stable_hasher.rs
View File

@ -132,8 +132,11 @@ impl<W> Hasher for StableHasher<W> {
#[inline] #[inline]
fn write_usize(&mut self, i: usize) { fn write_usize(&mut self, i: usize) {
self.state.write_usize(i.to_le()); // Always treat usize as u64 so we get the same results on 32 and 64 bit
self.bytes_hashed += ::std::mem::size_of::<usize>() as u64; // platforms. This is important for symbol hashes when cross compiling,
// for example.
self.state.write_u64((i as u64).to_le());
self.bytes_hashed += 8;
} }
#[inline] #[inline]
@ -168,8 +171,11 @@ impl<W> Hasher for StableHasher<W> {
#[inline] #[inline]
fn write_isize(&mut self, i: isize) { fn write_isize(&mut self, i: isize) {
self.state.write_isize(i.to_le()); // Always treat isize as i64 so we get the same results on 32 and 64 bit
self.bytes_hashed += ::std::mem::size_of::<isize>() as u64; // platforms. This is important for symbol hashes when cross compiling,
// for example.
self.state.write_i64((i as i64).to_le());
self.bytes_hashed += 8;
} }
} }