rustc: More fixes for arch-independent hashing #36866
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @eddyb |
|
(rust_highfive has picked a reviewer for you, use r? to override) |
This was referenced Sep 30, 2016
alexcrichton
added
the
beta-nominated
|
The description is no longer accurate and this sadly doesn't fix the symbol case, which is in librustc_trans/back/symbol_names.rs. If the wrapper would be generic then it'd work for symbols as well (and could be required by |
alexcrichton
force-pushed
the
fix-hash-again
branch
from
64cd93c
to
61a0ae0
Compare
|
@eddyb hm I'm... not sure how it worked? I wonder if maybe I tested the wrong thing? In any case I've updated with a generic wrapper which is unconditionally used by |
|
@alexcrichton Looks great! r=me with updated PR description. |
alexcrichton
force-pushed
the
fix-hash-again
branch
from
61a0ae0
to
d690f1e
Compare
|
@bors: r=eddyb p=1 (higher priority for fixing a regression) |
|
📌 Commit d690f1e has been approved by |
|
Adding impl<'a> Hasher for Sha256Hasher<'a> {
fn write_usize(&mut self, i: usize) { bug!("can't do that here") }
fn write_isize(&mut self, i: isize) { bug!("can't do that here") }
}in |
|
@TimNN yeah I found that the rabbit hole went pretty deep if we tried to avoid |
|
@alexcrichton: That |
|
It's hashing something before creating the |
|
Oh yeah: https://github.com/rust-lang/rust/blob/master/src/librustc_trans/back/symbol_names.rs#L160. |
|
Doing it only in |
|
@TimNN I meant on top of the current PR. |
|
@eddyb: Ah, then I misunderstood that part of your comment 😄 |
|
⌛ Testing commit d690f1e with merge fc02ed5... |
In another attempt to fix rust-lang#36793 this commit attempts to head off any future problems by adding a custom `WidentUsizeHasher` which will widen any hashing of `isize` and `usize` to a `u64` as necessary. This obviates the need for a previous number of `as u64` annotations and will hopefully protect us against future problems here. Closes rust-lang#36793 (hopefully)
alexcrichton
force-pushed
the
fix-hash-again
branch
from
d690f1e
to
faae99d
Compare
|
@bors: r=eddyb force clean |
|
📌 Commit faae99d has been approved by |
bors
added a commit
that referenced
this pull request
Sep 30, 2016
rustc: More fixes for arch-independent hashing In another attempt to fix #36793 this commit attempts to head off any future problems by adding a custom `WidentUsizeHasher` which will widen any hashing of `isize` and `usize` to a `u64` as necessary. This obviates the need for a previous number of `as u64` annotations and will hopefully protect us against future problems here. Closes #36793 (hopefully)
brson
added
I-nominated
T-compiler
This was referenced Oct 18, 2016
brson
added
the
beta-accepted
|
Accepting for backport since it fixes some nasty problems. |
brson
removed
I-nominated
T-compiler
Merged
alexcrichton
removed
the
beta-nominated
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In another attempt to fix #36793 this commit attempts to head off any future
problems by adding a custom
WidentUsizeHasherwhich will widen any hashing ofisizeandusizeto au64as necessary. This obviates the need for aprevious number of
as u64annotations and will hopefully protect us againstfuture problems here.
Closes #36793 (hopefully)