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

[beta] Rollup backports #62065

Merged
merged 13 commits into from
Jun 26, 2019
Merged

[beta] Rollup backports #62065

merged 13 commits into from
Jun 26, 2019

Conversation

pietroalbini
Copy link
Member

@pietroalbini pietroalbini commented Jun 22, 2019

Rolled up:

Cherry picked:

r? @ghost

@pietroalbini
Copy link
Member Author

@bors r+ p=20

@bors
Copy link
Contributor

bors commented Jun 22, 2019

📌 Commit 8a153c4d05ea2463de9419707391866b356021b1 has been approved by pietroalbini

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 22, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.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.
travis_time:end:00a53ce1:start=1561237324609047038,finish=1561237414417229609,duration=89808182571
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
[01:13:53] .................................................................................................... 300/5568
[01:13:57] .................................................................................................... 400/5568
[01:14:00] ................................................................................................i... 500/5568
[01:14:03] .................................................................................................... 600/5568
[01:14:07] .......................................................................................F............ 700/5568
[01:14:17] ..............................................................................i...............i..... 900/5568
[01:14:21] .................................................................................................... 1000/5568
[01:14:24] ...........iiiii.................................................................................... 1100/5568
[01:14:27] .................................................................................................... 1200/5568
---
[01:17:07] 8 
[01:17:07] - error: this expression will panic at runtime
[01:17:07] -   --> $DIR/array-literal-index-oob.rs:2:5
[01:17:07] -    |
[01:17:07] - LL |     &{[1, 2, 3][4]};
[01:17:07] -    |     ^^^^^^^^^^^^^^^ index out of bounds: the len is 3 but the index is 4
[01:17:07] 15 error: reaching this expression at runtime will panic or abort
[01:17:07] 16   --> $DIR/array-literal-index-oob.rs:2:7
[01:17:07] 17    |
[01:17:07] 
---
[01:17:07] 25 
[01:17:07] 
[01:17:07] 
[01:17:07] The actual stderr differed from the expected stderr.
[01:17:07] Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/array-literal-index-oob/array-literal-index-oob.stderr
[01:17:07] To update references, rerun the tests and pass the `--bless` flag
[01:17:07] To only update this specific test, also pass `--test-args consts/array-literal-index-oob.rs`
[01:17:07] error: 1 errors occurred comparing output.
[01:17:07] status: exit code: 1
[01:17:07] status: exit code: 1
[01:17:07] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/consts/array-literal-index-oob.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/array-literal-index-oob" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/consts/array-literal-index-oob/auxiliary" "-A" "unused"
[01:17:07] ------------------------------------------
[01:17:07] 
[01:17:07] ------------------------------------------
[01:17:07] stderr:
[01:17:07] stderr:
[01:17:07] ------------------------------------------
[01:17:07] error: index out of bounds: the len is 3 but the index is 4
[01:17:07]   --> /checkout/src/test/ui/consts/array-literal-index-oob.rs:2:7
[01:17:07]    |
[01:17:07] LL |     &{[1, 2, 3][4]};
[01:17:07]    |
[01:17:07]    = note: #[deny(const_err)] on by default
[01:17:07] 
[01:17:07] error: reaching this expression at runtime will panic or abort
[01:17:07] error: reaching this expression at runtime will panic or abort
[01:17:07]   --> /checkout/src/test/ui/consts/array-literal-index-oob.rs:2:7
[01:17:07]    |
[01:17:07] LL |     &{[1, 2, 3][4]};
[01:17:07]    |     --^^^^^^^^^^^^-
[01:17:07]    |       index out of bounds: the len is 3 but the index is 4
[01:17:07] 
[01:17:07] error: aborting due to 2 previous errors
[01:17:07] 
---
[01:17:07] thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:512:22
[01:17:07] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[01:17:07] 
[01:17:07] 
[01:17:07] 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/ui" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "ui" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-6.0/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--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" "6.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"
[01:17:07] 
[01:17:07] 
[01:17:07] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:17:07] Build completed unsuccessfully in 0:04:39
[01:17:07] Build completed unsuccessfully in 0:04:39
[01:17:07] make: *** [check] Error 1
[01:17:07] Makefile:48: recipe for target 'check' failed
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:00432f38
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sat Jun 22 22:20:51 UTC 2019
---
travis_time:end:0c9290b8:start=1561242052725631478,finish=1561242052730397658,duration=4766180
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:01283998
$ 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 --batch -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:1d864c6a
travis_time:start:1d864c6a
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:13b6f6ef
$ dmesg | grep -i kill

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)

@bors
Copy link
Contributor

bors commented Jun 22, 2019

⌛ Testing commit 8a153c4d05ea2463de9419707391866b356021b1 with merge 719d1030f59d2caf3f18d52db9f08eef385aece5...

@bors
Copy link
Contributor

bors commented Jun 23, 2019

💔 Test failed - checks-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 Jun 23, 2019
@rust-highfive
Copy link
Collaborator

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:06:05]   libx32gcc1 libx32gomp1 libx32itm1 libx32quadmath0 libx32stdc++6 libx32ubsan0
[00:06:05]   pinentry-curses python-apt-common python3-apt python3-dbus python3-gi
[00:06:05]   python3-software-properties
[00:06:05] Suggested packages:
[00:06:05]   dbus-user-session libpam-systemd pinentry-gnome3 tor scdaemon isoquery
[00:06:05]   gmp-doc libgmp10-doc libmpfr-doc pinentry-doc python3-apt-dbg python-apt-doc
[00:06:05] Recommended packages:
[00:06:05]   gnupg dbus nodejs-doc unattended-upgrades
[00:06:05] The following NEW packages will be installed:
[00:06:05]   dirmngr gcc-7-multilib gcc-multilib gir1.2-glib-2.0 gpg gpg-agent gpgconf
---
[00:06:18] Setting up python3-dbus (1.2.6-1) ...
[00:06:18] Setting up libx32cilkrts5 (7.4.0-1ubuntu1~18.04.1) ...
[00:06:18] Setting up nodejs (8.10.0~dfsg-2ubuntu0.4) ...
[00:06:18] update-alternatives: using /usr/bin/nodejs to provide /usr/bin/js (js) in auto mode
[00:06:18] update-alternatives: warning: skip creation of /usr/share/man/man1/js.1.gz because associated file /usr/share/man/man1/nodejs.1.gz (of link group js) doesn't exist
[00:06:18] Setting up libx32ubsan0 (7.4.0-1ubuntu1~18.04.1) ...
[00:06:18] Setting up gpgconf (2.2.4-1ubuntu1.2) ...
[00:06:18] Setting up lib32asan4 (7.4.0-1ubuntu1~18.04.1) ...
[00:06:18] Setting up lib32mpx2 (8.3.0-6ubuntu1~18.04.1) ...
---
[00:06:23]  ---> 22a00d2f4549
[00:06:23] Step 6/40 : RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486
[00:06:23]  ---> Running in 559644afb348
[00:06:23] Warning: apt-key output should not be parsed (stdout is not a terminal)
[00:06:23] Executing: /tmp/apt-key-gpghome.WqBgu0AS6P/gpg.1.sh --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486
[00:06:24] gpg: Total number processed: 1
[00:06:24] gpg:               imported: 1
[00:06:24] Removing intermediate container 559644afb348
[00:06:24]  ---> 75cdcc0f15b1

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)

@pietroalbini
Copy link
Member Author

Added #61896.
r? @eddyb for the last cherry-pick

@Mark-Simulacrum
Copy link
Member

note: @eddyb should not review 3b0d97aa35d, which I just pushed, but rather 5684f19

let path_segs = match res {
Res::Local(_) | Res::Upvar(..) => Vec::new(),
Res::Local(_) | Res::Upvar(..) | Res::SelfCtor(_) => vec![],
Copy link
Member

Choose a reason for hiding this comment

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

This is good, FWIW, Local | Upvar became just Local in between the beta and master branches.

Copy link
Member

@eddyb eddyb left a comment

Choose a reason for hiding this comment

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

Backport of #61896 LGTM.

@Mark-Simulacrum
Copy link
Member

This is waiting on decisions on #62055 and #61754.

@Zoxc
Copy link
Contributor

Zoxc commented Jun 25, 2019

I would drop the backport of #59752 and as it will land on beta soon anyway and there might be issues with it (see #62088). Not really sure why this was nominated in the first place.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.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.
travis_time:end:0a71704a:start=1561502802656066164,finish=1561502892898002966,duration=90241936802
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---
travis_time:start:test_codegen
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:24:24] 
[01:24:24] running 143 tests
[01:24:26] i..iii.....iii..iiii.....i......................i..i.................i......i.........ii.i..i..i.ii. 100/143
[01:24:28] test result: ok. 113 passed; 0 failed; 30 ignored; 0 measured; 0 filtered out
[01:24:28] 
[01:24:28]  finished in 4.708
[01:24:28] travis_fold:end:test_codegen
---
travis_time:start:test_assembly
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:24:30] 
[01:24:30] running 9 tests
[01:24:30] iiiiiiiii
[01:24:30] 
[01:24:30]  finished in 0.155
[01:24:30] travis_fold:end:test_assembly

---
travis_time:start:test_debuginfo
Check compiletest suite=debuginfo mode=debuginfo-both (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:24:47] 
[01:24:47] running 122 tests
[01:25:13] .iiiii...i.....i..i...i..i.i.i..i.ii..i.i.....i..i....i..........iiii..........i...ii...i.......ii.i 100/122
[01:25:18] .i.i......iii.i.....ii
[01:25:18] 
[01:25:18]  finished in 31.713
[01:25:18] travis_fold:end:test_debuginfo

---
[01:37:48] ....iiiii........................................................................................... 100/2323
[01:38:00] .......................................................................ii........................... 200/2323
[01:38:14] ...........................................................................................i........ 300/2323
[01:38:31] .................................................................................................... 400/2323
[01:38:43] .......................i..i....................................F.................................... 500/2323
[01:39:09] .................................................................................................... 700/2323
[01:39:22] .................................................................................................... 800/2323
[01:39:35] .................................................................................................... 900/2323
[01:39:48] .................................................................................................... 1000/2323
---
[01:42:56] ---- mem.rs - mem::MaybeUninit (line 1073) stdout ----
[01:42:56] error: unused import: `align_of`
[01:42:56]  --> mem.rs:1074:38
[01:42:56]   |
[01:42:56] 4 | use std::mem::{MaybeUninit, size_of, align_of};
[01:42:56]   |
[01:42:56] note: lint level defined here
[01:42:56]  --> mem.rs:1071:9
[01:42:56]   |
---
[01:42:56] 
[01:42:56] error: test failed, to rerun pass '--doc'
[01:42:56] 
[01:42:56] 
[01:42:56] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "core" "--" "--quiet"
[01:42:56] 
[01:42:56] 
[01:42:56] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:42:56] Build completed unsuccessfully in 0:30:39
[01:42:56] Build completed unsuccessfully in 0:30:39
[01:42:56] Makefile:48: recipe for target 'check' failed
[01:42:56] make: *** [check] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:127aa424
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Jun 26 00:31:19 UTC 2019
---
travis_time:end:2b68f1f5:start=1561509081498620587,finish=1561509081565649293,duration=67028706
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0d1602c2
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:173484f0
$ dmesg | grep -i kill

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)

@ollie27
Copy link
Member

ollie27 commented Jun 26, 2019

The most recent travis failure is from #61199. The change from #61161 (comment) will need to be backported as well. It was part of #61199 but got lost in a rebase.

@pnkfelix
Copy link
Member

pnkfelix commented Jun 26, 2019

I would drop the backport of PR #59752 and as it will land on beta soon anyway and there might be issues with it (see #62088). Not really sure why this was nominated in the first place.

I beta-nominated PR #59752 due to this comment. but that comment is making an assertion about PR #59800, which you (@Zoxc) authored, so maybe I misunderstood the comment, or the comment itself was erroneous?

@pnkfelix
Copy link
Member

This is waiting on decisions on #62055 and #61754.

I unilaterally beta-accepted PR #61754

@pnkfelix
Copy link
Member

This is waiting on decisions on #62055 and #61754.

and I retracted the nomination of #62055.

ollie27 and others added 2 commits June 26, 2019 08:54
This reverts commit 8ed2292.

It caused doctests in this repository to no longer be tested including all of the core crate.
…caching-perf-3, r=pnkfelix

create a "provisional cache" to restore performance in the case of cycles

Introduce a "provisional cache" that caches the results of auto trait resolutions but keeps them from entering the *main* cache until everything is ready. This turned out a bit more complex than I hoped, but I don't see another short term fix -- happy to take suggestions! In the meantime, it's very clear we need to rework the trait solver. This resolves the extreme performance slowdown experienced in rust-lang#60846 -- I plan to add a perf.rust-lang.org regression test to track this.

Caveat: I've not run `x.py test` in full yet.

r? @pnkfelix
cc @arielb1

Fixes rust-lang#60846
@Mark-Simulacrum
Copy link
Member

@bors r+ p=1000

@bors
Copy link
Contributor

bors commented Jun 26, 2019

📌 Commit 4b3d9d4 has been approved by Mark-Simulacrum

@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 Jun 26, 2019
@bors
Copy link
Contributor

bors commented Jun 26, 2019

⌛ Testing commit 4b3d9d4 with merge 83167c4...

bors added a commit that referenced this pull request Jun 26, 2019
[beta] Rollup backports

Rolled up:

* [beta] Comment out dev key #61700

Cherry picked:

* Dont ICE on an attempt to use GAT without feature gate #61118
* Fix cfg(test) build for x86_64-fortanix-unknown-sgx #61503
* Handle index out of bound errors during const eval without panic #61598
* Hygienize macros in the standard library #61629
* Fix ICE involving mut references #61947
* rustc_typeck: correctly compute `Substs` for `Res::SelfCtor`. #61896
* Revert "Set test flag when rustdoc is running with --test option" #61199
* create a "provisional cache" to restore performance in the case of cycles #61754

r? @ghost
@bors
Copy link
Contributor

bors commented Jun 26, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: Mark-Simulacrum
Pushing 83167c4 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 26, 2019
@bors bors merged commit 4b3d9d4 into rust-lang:beta Jun 26, 2019
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.