bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #83064 - cjgillot:fhash, r=jackh726

Browse source 
Tweaks to stable hashing
This commit is contained in:
bors 2021-03-13 20:21:40 +00:00
commit acca818928
6 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,6 +35,7 @@ impl StableHasher {
StableHasher { state: SipHasher128::new_with_keys(0, 0) } StableHasher { state: SipHasher128::new_with_keys(0, 0) }
} }
#[inline]
pub fn finish<W: StableHasherResult>(self) -> W { pub fn finish<W: StableHasherResult>(self) -> W {
W::finish(self) W::finish(self)
} }

2
compiler/rustc_macros/src/hash_stable.rs
View file

@ -74,6 +74,7 @@ pub fn hash_stable_generic_derive(mut s: synstructure::Structure<'_>) -> proc_ma
s.bound_impl( s.bound_impl(
quote!(::rustc_data_structures::stable_hasher::HashStable<__CTX>), quote!(::rustc_data_structures::stable_hasher::HashStable<__CTX>),
quote! { quote! {
#[inline]
fn hash_stable( fn hash_stable(
&self, &self,
__hcx: &mut __CTX, __hcx: &mut __CTX,
@ -119,6 +120,7 @@ pub fn hash_stable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::To
> >
), ),
quote! { quote! {
#[inline]
fn hash_stable( fn hash_stable(
&self, &self,
__hcx: &mut ::rustc_middle::ich::StableHashingContext<'__ctx>, __hcx: &mut ::rustc_middle::ich::StableHashingContext<'__ctx>,

7
compiler/rustc_middle/src/ich/hcx.rs
View file

@ -250,13 +250,6 @@ impl<'a> rustc_span::HashStableContext for StableHashingContext<'a> {
&CACHE &CACHE
} }
fn byte_pos_to_line_and_col(
&mut self,
byte: BytePos,
) -> Option<(Lrc<SourceFile>, usize, BytePos)> {
self.source_map().byte_pos_to_line_and_col(byte)
}
fn span_data_to_lines_and_cols( fn span_data_to_lines_and_cols(
&mut self, &mut self,
span: &SpanData, span: &SpanData,

6
compiler/rustc_span/src/hygiene.rs
View file

@ -1362,12 +1362,6 @@ fn update_disambiguator(expn_id: ExpnId) {
fn hash_spans(&self) -> bool { fn hash_spans(&self) -> bool {
true true
} }
fn byte_pos_to_line_and_col(
&mut self,
byte: BytePos,
) -> Option<(Lrc<SourceFile>, usize, BytePos)> {
self.caching_source_map.byte_pos_to_line_and_col(byte)
}
fn span_data_to_lines_and_cols( fn span_data_to_lines_and_cols(
&mut self, &mut self,
span: &crate::SpanData, span: &crate::SpanData,

9
compiler/rustc_span/src/lib.rs
View file

@ -1874,10 +1874,6 @@ pub trait HashStableContext {
fn expn_id_cache() -> &'static LocalKey<ExpnIdCache>; fn expn_id_cache() -> &'static LocalKey<ExpnIdCache>;
fn hash_crate_num(&mut self, _: CrateNum, hasher: &mut StableHasher); fn hash_crate_num(&mut self, _: CrateNum, hasher: &mut StableHasher);
fn hash_spans(&self) -> bool; fn hash_spans(&self) -> bool;
fn byte_pos_to_line_and_col(
&mut self,
byte: BytePos,
) -> Option<(Lrc<SourceFile>, usize, BytePos)>;
fn span_data_to_lines_and_cols( fn span_data_to_lines_and_cols(
&mut self, &mut self,
span: &SpanData, span: &SpanData,
@ -1906,9 +1902,10 @@ where
return; return;
} }
self.ctxt().hash_stable(ctx, hasher);
if self.is_dummy() { if self.is_dummy() {
Hash::hash(&TAG_INVALID_SPAN, hasher); Hash::hash(&TAG_INVALID_SPAN, hasher);
self.ctxt().hash_stable(ctx, hasher);
return; return;
} }
@ -1921,7 +1918,6 @@ where
Some(pos) => pos, Some(pos) => pos,
None => { None => {
Hash::hash(&TAG_INVALID_SPAN, hasher); Hash::hash(&TAG_INVALID_SPAN, hasher);
span.ctxt.hash_stable(ctx, hasher);
return; return;
} }
}; };
@ -1948,7 +1944,6 @@ where
let len = (span.hi - span.lo).0; let len = (span.hi - span.lo).0;
Hash::hash(&col_line, hasher); Hash::hash(&col_line, hasher);
Hash::hash(&len, hasher); Hash::hash(&len, hasher);
span.ctxt.hash_stable(ctx, hasher);
} }
} }

13
library/core/src/hash/mod.rs
View file

@ -548,10 +548,12 @@ mod impls {
($(($ty:ident, $meth:ident),)*) => {$( ($(($ty:ident, $meth:ident),)*) => {$(
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl Hash for $ty { impl Hash for $ty {
#[inline]
fn hash<H: Hasher>(&self, state: &mut H) { fn hash<H: Hasher>(&self, state: &mut H) {
state.$meth(*self) state.$meth(*self)
} }
#[inline]
fn hash_slice<H: Hasher>(data: &[$ty], state: &mut H) { fn hash_slice<H: Hasher>(data: &[$ty], state: &mut H) {
let newlen = data.len() * mem::size_of::<$ty>(); let newlen = data.len() * mem::size_of::<$ty>();
let ptr = data.as_ptr() as *const u8; let ptr = data.as_ptr() as *const u8;
@ -582,6 +584,7 @@ mod impls {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl Hash for bool { impl Hash for bool {
#[inline]
fn hash<H: Hasher>(&self, state: &mut H) { fn hash<H: Hasher>(&self, state: &mut H) {
state.write_u8(*self as u8) state.write_u8(*self as u8)
} }
@ -589,6 +592,7 @@ mod impls {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl Hash for char { impl Hash for char {
#[inline]
fn hash<H: Hasher>(&self, state: &mut H) { fn hash<H: Hasher>(&self, state: &mut H) {
state.write_u32(*self as u32) state.write_u32(*self as u32)
} }
@ -596,6 +600,7 @@ mod impls {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl Hash for str { impl Hash for str {
#[inline]
fn hash<H: Hasher>(&self, state: &mut H) { fn hash<H: Hasher>(&self, state: &mut H) {
state.write(self.as_bytes()); state.write(self.as_bytes());
state.write_u8(0xff) state.write_u8(0xff)
@ -604,6 +609,7 @@ mod impls {
#[stable(feature = "never_hash", since = "1.29.0")] #[stable(feature = "never_hash", since = "1.29.0")]
impl Hash for ! { impl Hash for ! {
#[inline]
fn hash<H: Hasher>(&self, _: &mut H) { fn hash<H: Hasher>(&self, _: &mut H) {
*self *self
} }
@ -613,6 +619,7 @@ mod impls {
() => ( () => (
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl Hash for () { impl Hash for () {
#[inline]
fn hash<H: Hasher>(&self, _state: &mut H) {} fn hash<H: Hasher>(&self, _state: &mut H) {}
} }
); );
@ -621,6 +628,7 @@ mod impls {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<$($name: Hash),+> Hash for ($($name,)+) where last_type!($($name,)+): ?Sized { impl<$($name: Hash),+> Hash for ($($name,)+) where last_type!($($name,)+): ?Sized {
#[allow(non_snake_case)] #[allow(non_snake_case)]
#[inline]
fn hash<S: Hasher>(&self, state: &mut S) { fn hash<S: Hasher>(&self, state: &mut S) {
let ($(ref $name,)+) = *self; let ($(ref $name,)+) = *self;
$($name.hash(state);)+ $($name.hash(state);)+
@ -650,6 +658,7 @@ mod impls {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: Hash> Hash for [T] { impl<T: Hash> Hash for [T] {
#[inline]
fn hash<H: Hasher>(&self, state: &mut H) { fn hash<H: Hasher>(&self, state: &mut H) {
self.len().hash(state); self.len().hash(state);
Hash::hash_slice(self, state) Hash::hash_slice(self, state)
@ -658,6 +667,7 @@ mod impls {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: ?Sized + Hash> Hash for &T { impl<T: ?Sized + Hash> Hash for &T {
#[inline]
fn hash<H: Hasher>(&self, state: &mut H) { fn hash<H: Hasher>(&self, state: &mut H) {
(**self).hash(state); (**self).hash(state);
} }
@ -665,6 +675,7 @@ mod impls {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: ?Sized + Hash> Hash for &mut T { impl<T: ?Sized + Hash> Hash for &mut T {
#[inline]
fn hash<H: Hasher>(&self, state: &mut H) { fn hash<H: Hasher>(&self, state: &mut H) {
(**self).hash(state); (**self).hash(state);
} }
@ -672,6 +683,7 @@ mod impls {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: ?Sized> Hash for *const T { impl<T: ?Sized> Hash for *const T {
#[inline]
fn hash<H: Hasher>(&self, state: &mut H) { fn hash<H: Hasher>(&self, state: &mut H) {
#[cfg(not(bootstrap))] #[cfg(not(bootstrap))]
{ {
@ -701,6 +713,7 @@ mod impls {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: ?Sized> Hash for *mut T { impl<T: ?Sized> Hash for *mut T {
#[inline]
fn hash<H: Hasher>(&self, state: &mut H) { fn hash<H: Hasher>(&self, state: &mut H) {
#[cfg(not(bootstrap))] #[cfg(not(bootstrap))]
{ {