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 #58537

Merged
merged 12 commits into from
Feb 20, 2019
Merged

[beta] Rollup backports #58537

merged 12 commits into from
Feb 20, 2019

Conversation

pietroalbini
Copy link
Member

@pietroalbini pietroalbini commented Feb 17, 2019

Cherry-picked:

Rolled up:

r? @ghost

@pietroalbini
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Feb 17, 2019

📌 Commit 110b7618ba4e6ad8ef6837e8ccabbbcc2eeb7b5a 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 Feb 17, 2019
@ehuss
Copy link
Contributor

ehuss commented Feb 17, 2019

@pietroalbini would it be possible to include #58522?

@pietroalbini
Copy link
Member Author

@bors r-

@pietroalbini would it be possible to include #58522?

Sure!

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 17, 2019
nnethercote and others added 11 commits February 17, 2019 17:17
Currently it just unconditionally allocates it in the arena.

For a "Clean Check" build of the the `packed-simd` benchmark, this
change reduces both the `max-rss` and `faults` counts by 59%; it
slightly (~3%) increases the instruction counts but the `wall-time` is
unchanged.

For the same builds of a few other benchmarks, `max-rss` and `faults`
drop by 1--5%, but instruction counts and `wall-time` changes are in the
noise.

Fixes rust-lang#57432, fixes rust-lang#57829.
This commit fixes a bug introduced by rust-lang#55937 which started checking user
type annotations for associated type patterns. Where lowering a
associated constant expression would previously return a
`PatternKind::Constant`, it now returns a `PatternKind::AscribeUserType`
with a `PatternKind::Constant` inside, this commit unwraps that to
access the constant pattern inside and behaves as before.
In particular, the table entries (associated with type-variables
created during the probe) must persist as long as the candidates
assembled during the probe. If you make a nested probe without
creating a nested `ProbeContext`, the table entries are popped at the
end of the nested probe, while the type-variables would leak out via
the assembled candidates attached to `self` (the outer
`ProbeContext`). This causes an ICE (*if you are lucky*)!
These aren't fixed by this PR, but were broken in a few older attempts
at it. Make sure they don't regress.
@pietroalbini
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Feb 17, 2019

📌 Commit bbe9e21 has been approved by pietroalbini

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 17, 2019
@bors
Copy link
Contributor

bors commented Feb 17, 2019

⌛ Testing commit bbe9e21 with merge 1456495...

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

Cherry-picked:

* #58207: Make `intern_lazy_const` actually intern its argument.
* #58161: Lower constant patterns with ascribed types.
* #57908: resolve: Fix span arithmetics in the import conflict error
* #57835: typeck: remove leaky nested probe during trait object method resolution
* #57885: Avoid committing to autoderef in object method probing
* #57646: Fixes text becoming invisible when element targetted

Rolled up:

* #58522: [BETA] Update cargo

r? @ghost
@bors
Copy link
Contributor

bors commented Feb 17, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job dist-i686-linux 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.
 94 82.1M   94 77.6M    0     0  2461k      0  0:00:34  0:00:32  0:00:02 2427k
 97 82.1M   97 80.0M    0     0  2462k      0  0:00:34  0:00:33  0:00:01 2473k
100 82.1M  100 82.1M    0     0  2461k      0  0:00:34  0:00:34 --:--:-- 2586k
[00:08:54] + cd gcc-4.8.5
[00:08:54] + sed -i 's|ftp://gcc\.gnu\.org/|http://gcc.gnu.org/|g' ./contrib/download_prerequisites
[00:08:54] --2019-02-17 17:21:06--  http://gcc.gnu.org/pub/gcc/infrastructure/mpfr-2.4.2.tar.bz2
[00:08:54] Resolving gcc.gnu.org... 209.132.180.131
[00:08:54] Connecting to gcc.gnu.org|209.132.180.131|:80... connected.
[00:08:54] HTTP request sent, awaiting response... 200 OK
---
[00:48:57]  ---> 6442fd0c5fd9
[00:48:57] Step 25/41 : RUN ./build-clang.sh
[00:48:57]  ---> Running in 72ad830a7da2
[00:48:57] + source shared.sh
[00:48:57] + LLVM=032b00a5404865765cda7db3039f39d54964d8b0
[00:48:57] + LLD=3e4aa4e8671523321af51449e0569f455ef3ad43
[00:48:57] + CLANG=a6b9739069763243020f4ea6fe586bc135fde1f9
[00:48:57] + mkdir clang
[00:48:57] + cd clang
[00:48:57] + tar xzf - --strip-components=1
[00:48:57] + curl -L https://github.com/llvm-mirror/llvm/archive/032b00a5404865765cda7db3039f39d54964d8b0.tar.gz
[00:48:57]                                  Dload  Upload   Total   Spent    Left  Speed
[00:48:58] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
---
100 9505k    0 9505k    0     0  4495k      0 --:--:--  0:00:02 --:--:-- 5739k
100 14.4M    0 14.4M    0     0  4762k      0 --:--:--  0:00:03 --:--:-- 5530k
100 17.1M    0 17.1M    0     0  5030k      0 --:--:--  0:00:03 --:--:-- 5808k
[00:49:14] + mkdir -p tools/lld
[00:49:14] + tar zxf - --strip-components=1 -C tools/lld
[00:49:14] + curl -L https://github.com/llvm-mirror/lld/archive/3e4aa4e8671523321af51449e0569f455ef3ad43.tar.gz
[00:49:14]                                  Dload  Upload   Total   Spent    Left  Speed
[00:49:14] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100   157    0   157    0     0    616      0 --:--:-- --:--:-- --:--:--   625
---
[00:49:15] + cd clang-build
[00:49:15] + INC=/rustroot/include
[00:49:15] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/include-fixed
[00:49:15] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/include-fixed:/usr/include
[00:49:15] + hide_output cmake .. -DCMAKE_C_COMPILER=/rustroot/bin/gcc -DCMAKE_CXX_COMPILER=/rustroot/bin/g++ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/rustroot -DLLVM_TARGETS_TO_BUILD=X86 -DC_INCLUDE_DIRS=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/include-fixed:/usr/include
[00:49:45] Sun Feb 17 18:01:57 UTC 2019 - building ...
[00:49:55] + hide_output make -j10
[00:49:55] + set +x
[00:50:25] Sun Feb 17 18:02:38 UTC 2019 - building ...
---
[02:01:50]  ---> 536527626913
[02:01:50] Step 32/41 : RUN ./build-perl.sh
[02:01:50]  ---> Running in 1b374a23f991
[02:01:51] + source shared.sh
[02:01:51] + curl https://www.cpan.org/src/5.0/perl-5.28.0.tar.gz
[02:01:51]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
[02:01:51]                                  Dload  Upload   Total   Spent    Left  Speed
[02:01:52] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
---
[02:58:50]    Compiling rustc_traits v0.0.0 (/checkout/src/librustc_traits)
[02:58:54]    Compiling rustc_lint v0.0.0 (/checkout/src/librustc_lint)
[02:58:56]    Compiling rustc_allocator v0.0.0 (/checkout/src/librustc_allocator)
[02:58:59] [RUSTC-TIMING] rustc_mir test:false 353.064
The job exceeded the maximum time limit for jobs, and has been terminated.

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 bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 17, 2019
@bors
Copy link
Contributor

bors commented Feb 19, 2019

📌 Commit bbe9e21 has been approved by pietroalbini

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 19, 2019
@kennytm
Copy link
Member

kennytm commented Feb 19, 2019

@bors p=267

@bors
Copy link
Contributor

bors commented Feb 19, 2019

⌛ Testing commit bbe9e21 with merge 7dfb87496900988535015ce554a3890857359428...

@bors
Copy link
Contributor

bors commented Feb 19, 2019

💔 Test failed - checks-travis

@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.
Attempting to download s3://rust-lang-ci-sccache2/docker/6378c0a5660496a4aad56006ddce7095ee03ca4f53c3f837f8f57f62854a1fb459fe3bb8e3d83a258726042c8e0f5da3d3fe5dd0ae8704187dffe61267bfb333
[00:11:25] Attempting with retry: curl -f -L -C - -o /tmp/rustci_docker_cache https://s3-us-west-1.amazonaws.com/rust-lang-ci-sccache2/docker/6378c0a5660496a4aad56006ddce7095ee03ca4f53c3f837f8f57f62854a1fb459fe3bb8e3d83a258726042c8e0f5da3d3fe5dd0ae8704187dffe61267bfb333
[00:11:25]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
[00:11:25]                                  Dload  Upload   Total   Spent    Left  Speed
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

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 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 Feb 19, 2019
@kennytm
Copy link
Member

kennytm commented Feb 19, 2019

@bors retry

@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 Feb 19, 2019
@bors
Copy link
Contributor

bors commented Feb 19, 2019

⌛ Testing commit bbe9e21 with merge 642cc3c831d46bcec74982acce4b9b68500236f1...

@bors
Copy link
Contributor

bors commented Feb 20, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job dist-i686-linux 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.
$ pip install --user awscli; export PATH=$PATH:$HOME/.local/bin:$HOME/Library/Python/2.7/bin/
/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/__init__.py:83: RequestsDependencyWarning: Old version of cryptography ([1, 2, 3]) may cause slowdown.
  warnings.warn(warning, RequestsDependencyWarning)
Collecting awscli
  Downloading https://files.pythonhosted.org/packages/c2/fb/db83d39c7577dd6719963f86afaa9bf886ba4ae6a1429b66d457da24720a/awscli-1.16.108-py2.py3-none-any.whl (1.4MB)
  Downloading https://files.pythonhosted.org/packages/d7/de/5737f602e22073ecbded7a0c590707085e154e32b68d86545dcc31004c02/s3transfer-0.2.0-py2.py3-none-any.whl (69kB)
Collecting docutils>=0.10 (from awscli)
  Downloading https://files.pythonhosted.org/packages/50/09/c53398e0005b11f7ffb27b7aa720c617aba53be4fb4f4f3f06b9b5c60f28/docutils-0.14-py2-none-any.whl (543kB)
Collecting botocore==1.12.98 (from awscli)
---
 99 82.1M   99 81.4M    0     0   253k      0  0:05:31  0:05:28  0:00:03  322k
 99 82.1M   99 81.8M    0     0   254k      0  0:05:31  0:05:29  0:00:02  325k
100 82.1M  100 82.1M    0     0   254k      0  0:05:30  0:05:30 --:--:--  356k
[00:16:46] + cd gcc-4.8.5
[00:16:46] + sed -i 's|ftp://gcc\.gnu\.org/|http://gcc.gnu.org/|g' ./contrib/download_prerequisites
[00:16:46] --2019-02-19 22:38:20--  http://gcc.gnu.org/pub/gcc/infrastructure/mpfr-2.4.2.tar.bz2
[00:16:46] Resolving gcc.gnu.org... 209.132.180.131
[00:16:46] Connecting to gcc.gnu.org|209.132.180.131|:80... connected.
[00:16:46] HTTP request sent, awaiting response... 200 OK
---
[00:52:46]  ---> d56b0f4c8480
[00:52:46] Step 25/41 : RUN ./build-clang.sh
[00:52:46]  ---> Running in 68bcecf47eca
[00:52:46] + source shared.sh
[00:52:46] + LLVM=032b00a5404865765cda7db3039f39d54964d8b0
[00:52:46] + LLD=3e4aa4e8671523321af51449e0569f455ef3ad43
[00:52:46] + CLANG=a6b9739069763243020f4ea6fe586bc135fde1f9
[00:52:46] + mkdir clang
[00:52:46] + cd clang
[00:52:46] + curl -L https://github.com/llvm-mirror/llvm/archive/032b00a5404865765cda7db3039f39d54964d8b0.tar.gz
[00:52:46] + tar xzf - --strip-components=1
[00:52:47]                                  Dload  Upload   Total   Spent    Left  Speed
[00:52:47] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
---
100 10.5M    0 10.5M    0     0  4361k      0 --:--:--  0:00:02 --:--:-- 5374k
100 15.7M    0 15.7M    0     0  4659k      0 --:--:--  0:00:03 --:--:-- 5382k
100 17.1M    0 17.1M    0     0  4858k      0 --:--:--  0:00:03 --:--:-- 5579k
[00:52:59] + mkdir -p tools/lld
[00:52:59] + curl -L https://github.com/llvm-mirror/lld/archive/3e4aa4e8671523321af51449e0569f455ef3ad43.tar.gz
[00:52:59] + tar zxf - --strip-components=1 -C tools/lld
[00:52:59]                                  Dload  Upload   Total   Spent    Left  Speed
[00:52:59] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100   157    0   157    0     0    820      0 --:--:-- --:--:-- --:--:--   835
100   157    0   157    0     0    820      0 --:--:-- --:--:-- --:--:--   835
[00:52:59] 
100 1346k    0 1346k    0     0  2222k      0 --:--:-- --:--:-- --:--:-- 2222k
[00:52:59] + mkdir clang-build
[00:52:59] + cd clang-build
[00:52:59] + INC=/rustroot/include
[00:52:59] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/include-fixed
[00:52:59] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/include-fixed:/usr/include
[00:52:59] + hide_output cmake .. -DCMAKE_C_COMPILER=/rustroot/bin/gcc -DCMAKE_CXX_COMPILER=/rustroot/bin/g++ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/rustroot -DLLVM_TARGETS_TO_BUILD=X86 -DC_INCLUDE_DIRS=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/4.8.5/include-fixed:/usr/include
[00:53:29] Tue Feb 19 23:15:04 UTC 2019 - building ...
[00:53:34] + hide_output make -j10
[00:53:34] + set +x
[00:54:04] Tue Feb 19 23:15:39 UTC 2019 - building ...
---
[01:59:14]  ---> 8db16806acc0
[01:59:14] Step 32/41 : RUN ./build-perl.sh
[01:59:14]  ---> Running in 0aeb4f55099c
[01:59:14] + source shared.sh
[01:59:14] + curl https://www.cpan.org/src/5.0/perl-5.28.0.tar.gz
[01:59:15]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
[01:59:15]                                  Dload  Upload   Total   Spent    Left  Speed
[01:59:16] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
---
[02:58:26] warning: clang-8: warning: argument unused during compilation: '-static-libstdc++' [-Wunused-command-line-argument]
[02:58:26] warning: clang-8: warning: argument unused during compilation: '-static-libstdc++' [-Wunused-command-line-argument]
[02:58:26] warning: clang-8: warning: argument unused during compilation: '-static-libstdc++' [-Wunused-command-line-argument]
[02:58:26] [RUSTC-TIMING] rustc_llvm test:false 0.178
The job exceeded the maximum time limit for jobs, and has been terminated.

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 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 Feb 20, 2019
@kennytm
Copy link
Member

kennytm commented Feb 20, 2019

@bors retry

@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 Feb 20, 2019
@bors
Copy link
Contributor

bors commented Feb 20, 2019

⌛ Testing commit bbe9e21 with merge 1f84156...

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

Cherry-picked:

* #58207: Make `intern_lazy_const` actually intern its argument.
* #58161: Lower constant patterns with ascribed types.
* #57908: resolve: Fix span arithmetics in the import conflict error
* #57835: typeck: remove leaky nested probe during trait object method resolution
* #57885: Avoid committing to autoderef in object method probing
* #57646: Fixes text becoming invisible when element targetted

Rolled up:

* #58522: [BETA] Update cargo

r? @ghost
@bors
Copy link
Contributor

bors commented Feb 20, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: pietroalbini
Pushing 1f84156 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 20, 2019
@bors bors merged commit bbe9e21 into rust-lang:beta Feb 20, 2019
@pietroalbini pietroalbini deleted the beta-backports branch February 20, 2019 10:31
@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.