rustc: More fixes for arch-independent hashing #36866

alexcrichton · 2016-09-30T18:23:04Z

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)

alexcrichton · 2016-09-30T18:23:11Z

r? @eddyb

rust-highfive · 2016-09-30T18:23:16Z

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

eddyb · 2016-09-30T18:49:46Z

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 TypeIdHasher).

alexcrichton · 2016-09-30T19:08:00Z

@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 TypeIdHasher

eddyb · 2016-09-30T19:21:38Z

@alexcrichton Looks great! r=me with updated PR description.

alexcrichton · 2016-09-30T19:28:09Z

@bors: r=eddyb p=1

(higher priority for fixing a regression)

bors · 2016-09-30T19:28:10Z

📌 Commit d690f1e has been approved by eddyb

TimNN · 2016-09-30T21:00:23Z

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 librustc_trans/back/symbol_names.rs panics while building rustc:

Building stage1 std artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
   Compiling core v0.0.0 (file:///home/logic/build/rust/src/libcore)
error: internal compiler error: /home/logic/build/rust/src/librustc_trans/back/symbol_names.rs:127: can't do that here

note: the compiler unexpectedly panicked. this is a bug.

note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports

note: run with `RUST_BACKTRACE=1` for a backtrace

thread 'rustc' panicked at 'Box<Any>', /home/logic/build/rust/src/librustc_errors/lib.rs:656
stack backtrace:
   1:     0x7f100ef05a19 - std::sys::backtrace::tracing::imp::write::hb24583f57c381d48
                        at /home/logic/build/rust/src/libstd/sys/unix/backtrace/tracing/gcc_s.rs:42
   2:     0x7f100ef11d5f - std::panicking::default_hook::{{closure}}::h053e41d48a9d8bdd
                        at /home/logic/build/rust/src/libstd/panicking.rs:247
   3:     0x7f100ef10685 - std::panicking::default_hook::h6c2ff9328b5b71ea
                        at /home/logic/build/rust/src/libstd/panicking.rs:257
   4:     0x7f100ef10cd8 - std::panicking::rust_panic_with_hook::h3a147a19a402009b
                        at /home/logic/build/rust/src/libstd/panicking.rs:451
   5:     0x7f100791d42a - std::panicking::begin_panic::he38469cae18dfcf9
                        at /home/logic/build/rust/src/libstd/panicking.rs:413
   6:     0x7f100792056d - rustc_errors::Handler::bug::hd1eb3a6f9a8caec3
                        at /home/logic/build/rust/src/librustc_errors/lib.rs:656
   7:     0x7f100bea045c - rustc::session::opt_span_bug_fmt::{{closure}}::hc3e364c89c445f7d
                        at /home/logic/build/rust/src/librustc/session/mod.rs:719
   8:     0x7f100be834f9 - rustc::session::opt_span_bug_fmt::hf5158fed8c586ce6
                        at /home/logic/build/rust/src/librustc/ty/context.rs:968
                        at /home/logic/build/rust/src/librustc/ty/context.rs:957
                        at /home/logic/build/rust/src/libstd/thread/local.rs:245
                        at /home/logic/build/rust/src/librustc/ty/context.rs:953
                        at /home/logic/build/rust/src/librustc/ty/context.rs:968
                        at /home/logic/build/rust/src/librustc/session/mod.rs:715
   9:     0x7f100be831e2 - rustc::session::bug_fmt::hde66aa3463c27ccf
                        at /home/logic/build/rust/src/librustc/session/mod.rs:699
  10:     0x7f100d9d0ebf - <rustc_trans::back::symbol_names::Sha256Hasher<'a> as core::hash::Hasher>::write_usize::hac13ff130c0d0f07
                        at /home/logic/build/rust/src/librustc_trans/back/symbol_names.rs:127
  11:     0x7f100d9b3b88 - core::hash::impls::<impl core::hash::Hash for usize>::hash::h3b89fd9180b6d7d3
                        at /home/logic/build/rust/src/libcore/hash/mod.rs:298
  12:     0x7f100d9bf9c1 - rustc::hir::map::definitions::DefPath::deterministic_hash_to::h45cd42ef5632da97
                        at /home/logic/build/rust/src/libcore/hash/mod.rs:382
                        at /home/logic/build/rust/src/libcollections/vec.rs:1295
                        at /home/logic/build/rust/src/librustc/hir/map/definitions.rs:141
  13:     0x7f100d9d10b4 - rustc_trans::back::symbol_names::get_symbol_hash::h903c41caef7f887f
                        at /home/logic/build/rust/src/librustc_trans/back/symbol_names.rs:163
                        at /home/logic/build/rust/src/librustc/util/common.rs:82
                        at /home/logic/build/rust/src/librustc_trans/back/symbol_names.rs:156
  14:     0x7f100d948831 - rustc_trans::back::symbol_names::<impl rustc_trans::monomorphize::Instance<'tcx>>::symbol_name::h37f8eac78e887770
                        at /home/logic/build/rust/src/librustc_trans/back/symbol_names.rs:272
  15:     0x7f100da13289 - rustc_trans::trans_item::TransItem::compute_symbol_name::he7a5a7ea40f995ea
                        at /home/logic/build/rust/src/librustc_trans/trans_item.rs:232
  16:     0x7f100d900ae9 - rustc_trans::base::collect_and_partition_translation_items::h43464d1f035609b2
                        at /home/logic/build/rust/src/librustc_trans/symbol_map.rs:38
                        at /home/logic/build/rust/src/libcore/ops.rs:2644
                        at /home/logic/build/rust/src/libcore/option.rs:383
                        at /home/logic/build/rust/src/libcore/iter/mod.rs:896
                        at /home/logic/build/rust/src/libcollections/vec.rs:1452
                        at /home/logic/build/rust/src/libcore/iter/iterator.rs:1200
                        at /home/logic/build/rust/src/librustc_trans/symbol_map.rs:37
                        at /home/logic/build/rust/src/librustc_trans/base.rs:1870
  17:     0x7f100d8fb281 - rustc_trans::base::trans_crate::hafc3c22a3636de6e
                        at /home/logic/build/rust/src/librustc_trans/base.rs:1633
  18:     0x7f100f2ae22e - rustc_driver::driver::phase_4_translate_to_llvm::h7ef578b7f6d743ab
                        at /home/logic/build/rust/src/librustc_driver/driver.rs:1034
                        at /home/logic/build/rust/src/librustc/util/common.rs:38
                        at /home/logic/build/rust/src/librustc_driver/driver.rs:1032
  19:     0x7f100f2bb8e8 - rustc_driver::driver::compile_input::{{closure}}::ha9905cb0c86acf73
                        at /home/logic/build/rust/src/librustc_driver/driver.rs:206
  20:     0x7f100f2b718a - rustc_driver::driver::phase_3_run_analysis_passes::{{closure}}::hfa236a7f6e8e4d7e
                        at /home/logic/build/rust/src/librustc_driver/driver.rs:988
  21:     0x7f100f2ac051 - rustc_driver::driver::phase_3_run_analysis_passes::h3fc292c6a6d36760
                        at /home/logic/build/rust/src/librustc/ty/context.rs:941
                        at /home/logic/build/rust/src/libstd/thread/local.rs:245
                        at /home/logic/build/rust/src/librustc/ty/context.rs:938
                        at /home/logic/build/rust/src/librustc/ty/context.rs:925
                        at /home/logic/build/rust/src/libstd/thread/local.rs:245
                        at /home/logic/build/rust/src/librustc/ty/context.rs:922
                        at /home/logic/build/rust/src/librustc/ty/context.rs:717
                        at /home/logic/build/rust/src/librustc_driver/driver.rs:857
  22:     0x7f100f29e504 - rustc_driver::driver::compile_input::h33bc6555b8b491ce
                        at /home/logic/build/rust/src/librustc_driver/driver.rs:172
  23:     0x7f100f1c3882 - rustc_driver::run_compiler::h0222bbb96666f1c6
                        at /home/logic/build/rust/src/librustc_driver/lib.rs:224
  24:     0x7f100f1b4c81 - std::panicking::try::do_call::h18ba198b82f0b751
                        at /home/logic/build/rust/src/librustc_driver/lib.rs:1145
                        at /home/logic/build/rust/src/librustc_driver/lib.rs:137
                        at /home/logic/build/rust/src/librustc_driver/lib.rs:1079
                        at /home/logic/build/rust/src/libstd/panic.rs:255
                        at /home/logic/build/rust/src/libstd/panicking.rs:356
  25:     0x7f100ef18267 - __rust_maybe_catch_panic
                        at /home/logic/build/rust/src/libpanic_unwind/lib.rs:91
  26:     0x7f100f1bea68 - <F as alloc::boxed::FnBox<A>>::call_box::h81f7688a0dfccda8
                        at /home/logic/build/rust/src/libstd/panicking.rs:332
                        at /home/logic/build/rust/src/libstd/panic.rs:311
                        at /home/logic/build/rust/src/libstd/thread/mod.rs:277
                        at /home/logic/build/rust/src/liballoc/boxed.rs:591
  27:     0x7f100eee3f53 - std::sys::thread::Thread::new::thread_start::hc35e66ca5755f7c6
                        at /home/logic/build/rust/src/liballoc/boxed.rs:601
                        at /home/logic/build/rust/src/libstd/sys/common/thread.rs:21
                        at /home/logic/build/rust/src/libstd/sys/unix/thread.rs:71
  28:     0x7f10070bc6f9 - start_thread
  29:     0x7f100ebb6b5c - clone
  30:                0x0 - <unknown>

error: Could not compile `core`.

To learn more, run the command again with --verbose.


command did not execute successfully: "/home/logic/build/rust-out/dev-build/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "-j" "8" "--target" "x86_64-unknown-linux-gnu" "--release" "--features" " jemalloc backtrace" "--manifest-path" "/home/logic/build/rust/src/rustc/std_shim/Cargo.toml"
expected success, got: exit code: 101


logic@sys:~/build/rust-out/dev-build$

alexcrichton · 2016-09-30T21:02:10Z

@TimNN yeah I found that the rabbit hole went pretty deep if we tried to avoid usize and isize. I concluded that all locations would get as u64 anyway so I figured we'd just go ahead and do it in the hasher itself.

TimNN · 2016-09-30T21:03:14Z

@alexcrichton: That panic is with your patch applied!

TimNN · 2016-09-30T21:04:05Z

It's hashing something before creating the TypeIdHasher (and thus without your wrapper applied).

eddyb · 2016-09-30T21:09:46Z

Oh yeah: https://github.com/rust-lang/rust/blob/master/src/librustc_trans/back/symbol_names.rs#L160.
Could maybe change that to go through TypeIdHasher and/or do the casting thing in Sha256Hasher.

TimNN · 2016-09-30T21:13:41Z

Doing it only in Sha256Hasher would probably be bad for the type_id intrinsic (since it constructs it's own TypeIdHasher with a SipHasher).

eddyb · 2016-09-30T21:15:02Z

@TimNN I meant on top of the current PR.

TimNN · 2016-09-30T21:17:42Z

@eddyb: Ah, then I misunderstood that part of your comment 😄

bors · 2016-09-30T21:27:55Z

⌛ Testing commit d690f1e with merge fc02ed5...

alexcrichton · 2016-09-30T21:28:50Z

@bors: r-

(pending @TimNN's discovery)

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 · 2016-09-30T22:19:12Z

@bors: r=eddyb force clean

bors · 2016-09-30T22:19:17Z

📌 Commit faae99d has been approved by eddyb

bors · 2016-09-30T22:43:52Z

⌛ Testing commit faae99d with merge bba3fca...

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)

bors · 2016-10-01T02:00:34Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: eddyb
Pushing bba3fca to master...

brson · 2016-10-19T01:40:35Z

Accepting for backport since it fixes some nasty problems.

rust-highfive assigned nikomatsakis Sep 30, 2016

rust-highfive assigned eddyb and unassigned nikomatsakis Sep 30, 2016

This was referenced Sep 30, 2016

TypeIdHasher: hash usize as u64 #36795

Merged

Regression in cross-compiling from 64 -> 32 bit #36793

Closed

alexcrichton added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 30, 2016

alexcrichton force-pushed the fix-hash-again branch from 64cd93c to 61a0ae0 Compare September 30, 2016 19:07

alexcrichton force-pushed the fix-hash-again branch from 61a0ae0 to d690f1e Compare September 30, 2016 19:27

alexcrichton force-pushed the fix-hash-again branch from d690f1e to faae99d Compare September 30, 2016 22:19

bors merged commit faae99d into rust-lang:master Oct 1, 2016

TimNN mentioned this pull request Oct 1, 2016

arm-linux-gnueabihf builds broken in recent nightlies #36883

Closed

andreastt mentioned this pull request Oct 3, 2016

Fix 32-bit Windows compile error mozilla/geckodriver#246

Closed

brson added I-nominated T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 5, 2016

alexcrichton deleted the fix-hash-again branch October 6, 2016 18:06

This was referenced Oct 18, 2016

Build failure in i686 beta nix-rust/nix#435

Closed

Linking errors on beta/i686/travis-ci #37258

Closed

brson added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 19, 2016

brson removed I-nominated T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 19, 2016

brson mentioned this pull request Oct 19, 2016

[beta] backports #37266

Merged

alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 19, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rustc: More fixes for arch-independent hashing #36866

rustc: More fixes for arch-independent hashing #36866

alexcrichton commented Sep 30, 2016 •

edited

Loading

alexcrichton commented Sep 30, 2016

rust-highfive commented Sep 30, 2016

eddyb commented Sep 30, 2016

alexcrichton commented Sep 30, 2016

eddyb commented Sep 30, 2016

alexcrichton commented Sep 30, 2016

bors commented Sep 30, 2016

TimNN commented Sep 30, 2016

alexcrichton commented Sep 30, 2016

TimNN commented Sep 30, 2016

TimNN commented Sep 30, 2016

eddyb commented Sep 30, 2016

TimNN commented Sep 30, 2016

eddyb commented Sep 30, 2016

TimNN commented Sep 30, 2016

bors commented Sep 30, 2016

alexcrichton commented Sep 30, 2016

alexcrichton commented Sep 30, 2016

bors commented Sep 30, 2016

bors commented Sep 30, 2016

bors commented Oct 1, 2016

brson commented Oct 19, 2016

rustc: More fixes for arch-independent hashing #36866

rustc: More fixes for arch-independent hashing #36866

Conversation

alexcrichton commented Sep 30, 2016 • edited Loading

alexcrichton commented Sep 30, 2016

rust-highfive commented Sep 30, 2016

eddyb commented Sep 30, 2016

alexcrichton commented Sep 30, 2016

eddyb commented Sep 30, 2016

alexcrichton commented Sep 30, 2016

bors commented Sep 30, 2016

TimNN commented Sep 30, 2016

alexcrichton commented Sep 30, 2016

TimNN commented Sep 30, 2016

TimNN commented Sep 30, 2016

eddyb commented Sep 30, 2016

TimNN commented Sep 30, 2016

eddyb commented Sep 30, 2016

TimNN commented Sep 30, 2016

bors commented Sep 30, 2016

alexcrichton commented Sep 30, 2016

alexcrichton commented Sep 30, 2016

bors commented Sep 30, 2016

bors commented Sep 30, 2016

bors commented Oct 1, 2016

brson commented Oct 19, 2016

alexcrichton commented Sep 30, 2016 •

edited

Loading