Skip to content
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

do not overwrite child def-id in place but rather remove/insert #52546

Merged
merged 1 commit into from
Jul 28, 2018

Conversation

nikomatsakis
Copy link
Contributor

@nikomatsakis nikomatsakis commented Jul 19, 2018

When inserting a node N into the tree of impls, we sometimes find than an existing node C should be replaced with N. We used to overwrite C in place with the new def-id N -- but since the lists of def-ids are separated by simplified type, that could lead to N being inserted in the wrong place. This meant we might miss conflicts. We are now not trying to be so smart -- we remove C and then add N later.

Fixes #52050

r? @aturon -- do you still remember this code at all? :)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 19, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-5.0 of your PR failed on Travis (raw log). 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.
[00:51:48] ....................................................................................................
[00:51:52] ....................................................................................................
[00:51:54] ....................................................................................................
[00:51:57] .......................................i............................................................
[00:52:00] .......F............................................................................................
[00:52:06] ....................................................................................................
[00:52:08] ......................................................................................
[00:52:08] failures:
[00:52:08] 
[00:52:08] 
[00:52:08] ---- [compile-fail] compile-fail/specialization/issue-52050.rs stdout ----
[00:52:08] 
[00:52:08] error: /checkout/src/test/compile-fail/specialization/issue-52050.rs:38: unexpected error: '38:1: 38:30: conflicting implementations of trait `IntoPyDictPointer` for type `()`: [E0119]'
[00:52:08] error: /checkout/src/test/compile-fail/specialization/issue-52050.rs:32: expected error not found: conflicting implementations
[00:52:08] 
[00:52:08] error: 1 unexpected errors found, 1 expected errors not found
[00:52:08] status: exit code: 1
[00:52:08] status: exit code: 1
[00 'main' panicked at 'Some tests failed', tools/compiletest/src/main.rs:498:22
[00:52:08] 
[00:52:08] 
[00:52:08] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/compile-fail" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "compile-fail" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-5.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options " "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "5.0.0\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[00:52:08] 
[00:52:08] 
[00:52:08] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[00:52:08] Build completed unsuccessfully in 0:09:18
[00:52:08] Build completed unsuccessfully in 0:09:18
[00:52:08] Makefile:58: recipe for target 'check' failed
[00:52:08] make: *** [check] Error 1

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:232876b0
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:2373d156:start=1532024555954942966,finish=1532024555963555883,duration=8612917
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:014dac4d
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:1a626fb6
travis_time:start:1a626fb6
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.

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. (Feature Requests)

When inserting a node N into the tree of impls, we sometimes find than
an existing node C should be replaced with N. We used to overwrite C
in place with the new def-id N -- but since the lists of def-ids are
separated by simplified type, that could lead to N being inserted in
the wrong place. This meant we might miss conflicts. We are now not
trying to be so smart -- we remove C and then add N later.
@nikomatsakis
Copy link
Contributor Author

r? @eddyb

@pnkfelix
Copy link
Member

r? @pnkfelix

@rust-highfive rust-highfive assigned pnkfelix and unassigned eddyb Jul 26, 2018
Copy link
Member

@pnkfelix pnkfelix left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not make this a ui/ test?

@pnkfelix
Copy link
Member

Ah compile-fail is fine, we’ll eventually move them all over to ui/

@pnkfelix
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 27, 2018

📌 Commit 4fd5aed has been approved by pnkfelix

@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 Jul 27, 2018
@bors
Copy link
Contributor

bors commented Jul 28, 2018

⌛ Testing commit 4fd5aed with merge c1b6bd2517d3d92e42c5ee0da82ff06c12c10db2...

@bors
Copy link
Contributor

bors commented Jul 28, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 28, 2018
@rust-highfive

This comment has been minimized.

@kennytm
Copy link
Member

kennytm commented Jul 28, 2018

@bors retry travis-ci/travis-ci#4924

@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 Jul 28, 2018
@bors
Copy link
Contributor

bors commented Jul 28, 2018

⌛ Testing commit 4fd5aed with merge 67ca66eebb8c5e8de50576bcf207d5e5bffa7fe5...

@bors
Copy link
Contributor

bors commented Jul 28, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 28, 2018
@rust-highfive

This comment has been minimized.

@kennytm
Copy link
Member

kennytm commented Jul 28, 2018

@bors retry travis-ci/travis-ci#4924

@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 Jul 28, 2018
@bors
Copy link
Contributor

bors commented Jul 28, 2018

⌛ Testing commit 4fd5aed with merge 17a666c322cf3f479daf4e1af3c2ed9aca707ea7...

@bors
Copy link
Contributor

bors commented Jul 28, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 28, 2018
@rust-highfive

This comment has been minimized.

@kennytm
Copy link
Member

kennytm commented Jul 28, 2018

@bors retry travis-ci/travis-ci#4924

@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 Jul 28, 2018
@bors
Copy link
Contributor

bors commented Jul 28, 2018

⌛ Testing commit 4fd5aed with merge 67cd5ad53c24c613df36b49f0d3dbf3925090535...

@bors
Copy link
Contributor

bors commented Jul 28, 2018

💔 Test failed - status-travis

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 28, 2018
@rust-highfive

This comment has been minimized.

@kennytm
Copy link
Member

kennytm commented Jul 28, 2018

@bors retry #40474

This PR is being cursed or something.

[00:02:26]  Downloading unicode-segmentation v1.2.1
[00:02:57] warning: spurious network error (2 tries remaining): [28] Timeout was reached (Operation too slow. Less than 10 bytes/sec transferred the last 30 seconds)
[00:03:27] warning: spurious network error (1 tries remaining): [28] Timeout was reached (Operation too slow. Less than 10 bytes/sec transferred the last 30 seconds)
[00:03:57] error: unable to get packages from source
[00:03:57] 
[00:03:57] Caused by:
[00:03:57]   [28] Timeout was reached (Operation too slow. Less than 10 bytes/sec transferred the last 30 seconds)

@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 Jul 28, 2018
@bors
Copy link
Contributor

bors commented Jul 28, 2018

⌛ Testing commit 4fd5aed with merge 4234adf...

bors added a commit that referenced this pull request Jul 28, 2018
do not overwrite child def-id in place but rather remove/insert

When inserting a node N into the tree of impls, we sometimes find than an existing node C should be replaced with N. We used to overwrite C in place with the new def-id N -- but since the lists of def-ids are separated by simplified type, that could lead to N being inserted in the wrong place. This meant we might miss conflicts. We are now not trying to be so smart -- we remove C and then add N later.

Fixes #52050

r? @aturon -- do you still remember this code at all? :)
@bors
Copy link
Contributor

bors commented Jul 28, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: pnkfelix
Pushing 4234adf to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

7 participants