Skip to content

[incremental] Hash Allocations #49752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2018
Merged

Conversation

sinkuu
Copy link
Contributor

@sinkuu sinkuu commented Apr 7, 2018

HashSet::insert returns true if the value did not exist, which is the timing we want to hash the Allocation.

Fixes #49595

cc @oli-obk

@rust-highfive
Copy link
Contributor

r? @petrochenkov

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 7, 2018
@sinkuu sinkuu force-pushed the fix_incrcmp_str_lit branch from 8a71c1c to 59f5b98 Compare April 7, 2018 03:46
@sinkuu sinkuu force-pushed the fix_incrcmp_str_lit branch from 59f5b98 to 3832e8b Compare April 7, 2018 03:48
@TimNN
Copy link
Contributor

TimNN commented Apr 7, 2018

Your PR failed on Travis. Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
Resolving deltas: 100% (613027/613027), completed with 4879 local objects.
---
[00:00:42] configure: rust.quiet-tests     := True
---
[00:38:23] ..........................................................................i.........................
[00:38:28] .................i..................................................................................
---
[00:39:01] ..............................................................................................i.....
[00:39:08] ....................................................................i...............................
---
[00:39:58] .............................................i......................................................
---
[00:43:30] .............................i......................................................................
[00:43:43] ..............................................................i.....................................
[00:43:58] ...............................................i....................................................
[00:44:16] ....................................................................................................
[00:44:36] ....................................................................................................
[00:44:56] ....................................................................................................
[00:45:19] ...i...............................................................................................i
[00:45:49] ..............................................................................................test [run-pass] run-pass/mir_heavy_promoted.rs has been running for over 60 seconds
[00:45:52] ......
[00:46:20] ....................................................................................................
[00:46:52] ...............................................................ii...................................
[00:47:39] ..........................i....................................................i.ii................test [run-pass] run-pass/saturating-float-casts.rs has been running for over 60 seconds
[00:47:39] .
[00:48:17] .......................................................................................iiiiiii......
---
[00:50:26] ...................i............................................................ii.iii..............
[00:50:32] ....................................................................................................
[00:50:40] .........i..............................i...........................................................
[00:50:47] ....................................................................................................
[00:50:53] .....................i..............................................................................
[00:51:01] ....................................................................................................
[00:51:11] ....................................................................................................
[00:51:20] ....................................................................................................
[00:51:31] ....................................................................................................
[00:51:44] ....................................................................................................
[00:51:52] ..............i.....................................................................................
[00:52:01] ..................i..ii.............................................................................
[00:52:10] ....................................................................................................
[00:52:20] ....................................................................................................
[00:52:29] .....................................................................................i..............
[00:52:39] ...............................i....................................................................
---
[00:53:14] ...........................i........................................................................
[00:53:16] ....................................................................i...............................
[00:53:17] ................i.......................................................
---
[00:53:31] ...........i........................
---
[00:53:58] i...i..ii....i.............ii.........iii......i..i...i...ii..i..i..ii.....
---
[00:54:01] i.......i......................i.......
---
" "--cfg" "cfail1" "-C" "incremental=/checkout/obj/build/x86_64-unknown-linux-gnu/test/incremental/issue-49595/issue_49595.inc" "-Z" "incremental-verify-ich" "-Z" "incremental-queries" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/incremental/issue-49595/issue_49595.stage2-x86_64-unknown-linux-gnu" "-Crpath" "-O" "-Zmiri" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-Z" "query-dep-graph" "--test" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/incremental/issue-49595/issue_49595.stage2-x86_64-unknown-linux-gnu.aux"
---
[00:54:23] {"message":"couldn't read \"/checkout/src/test/incremental/issue-49595/auxiliary/lit_a.rs\": No such file or directory (os error 2)","code":null,"level":"error","spans":[{"file_name":"/checkout/src/test/incremental/issue-49595/issue_49595.rs","byte_start":1098,"byte_end":1101,"line_start":35,"line_end":35,"column_start":5,"column_end":8,"is_primary":true,"text":[{"text":"mod lit;","highlight_start":5,"highlight_end":8}],"label":null,"suggested_replacement":null,"expansion":null}],"children":[],"rendered":"error: couldn't read \"/checkout/src/test/incremental/issue-49595/auxiliary/lit_a.rs\": No such file or directory (os error 2)\n  --> /checkout/src/test/incremental/issue-49595/issue_49595.rs:35:5\n   |\nLL | mod lit;\n   |     ^^^\n\n"}
[00:54:23] {"mes/fs/cgroup
none            5.0M     0  5.0M   0% /run/lock
none            7.4G     0  7.4G   0% /run/shm
none            100M     0  100M   0% /run/user
none            768M     0  768M   0% /var/ramfs
/incremental/bootstrap-232achgbjnpqy
116988 ./obj/build/bootstrap/debug/incremental/bootstrap-232achgbjnpqy/s-ezvu36yn15-1kuaa7p-23cdd79jjy90a
112708 ./obj/build/x86_64-unknown-linux-gnu/test/mir-opt
108032 ./obj/build/x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends
105924 ./obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu
105920 ./obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release
102728 ./obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/incremental/core-31lccp6wy7orz
102724 ./obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/incremental/core-31lccp6wy7orz/s-ezvv0jti6x-3mnr5o-15kl0r4v6uqov
101980 ./obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/deps
96720 ./obj/build/bootstrap/debug/incremental/bootstrap-1vuwt8xpr9ahn
96716 ./obj/build/bootstrap/debug/incremental/bootstrap-1vuwt8xpr9ahn/s-ezvv2pl4ik-886qdi-3tcotgar6c2ca
---
7d $HOME/Library/Logs/DiagnosticReports -type f -name '*.crash' -not -name '*.stage2-*.crash' -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash' -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \; -exec head -750 {} \; -exec echo travis_fold":"end:crashlog \; || true
find: `/home/travis/Library/Logs/DiagnosticReports': No such file or directory
travis_time:end:01add300:start=1523076188033322228,finish=1523076188039672499,duration=6350271
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:00a26408
$ dmesg | grep -i kill
[   10.139608] init: failsafe main process (1093) killed by TERM signal

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN.

@oli-obk
Copy link
Contributor

oli-obk commented Apr 7, 2018

Ugh... I keep screwing up those HashSet::insert calls. Thanks

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 7, 2018

📌 Commit 3832e8b has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 7, 2018
@oli-obk oli-obk added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 7, 2018
@petrochenkov petrochenkov assigned oli-obk and unassigned petrochenkov Apr 7, 2018
@bors
Copy link
Collaborator

bors commented Apr 8, 2018

⌛ Testing commit 3832e8b with merge beab37c...

bors added a commit that referenced this pull request Apr 8, 2018
[incremental] Hash `Allocation`s

`HashSet::insert` returns `true` if the value did not exist, which is the timing we want to hash the `Allocation`.

Fixes #49595

cc @oli-obk
@bors
Copy link
Collaborator

bors commented Apr 8, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing beab37c to master...

@matklad
Copy link
Member

matklad commented Apr 11, 2018

This affects beta and I think stable as well.

Let's perhaps backport it?

It's very hard to debug certain tests because of this 😆

@Mark-Simulacrum Mark-Simulacrum added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 11, 2018
@kennytm kennytm removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 14, 2018
bors added a commit that referenced this pull request Apr 14, 2018
…enkov

[beta] [incremental] Hash `Allocation`s

backport of #49752

cc @matklad @sinkuu
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants