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

Rollup of 8 pull requests #61841

Closed
wants to merge 19 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jun 14, 2019

Successful merges:

Failed merges:

r? @ghost

JohnTitor and others added 19 commits June 12, 2019 20:34
This commit extends the work in rust-lang#61698 to get the `DefId` of const
parameters from block that resolve to a const parameter (as well as
const parameters directly, as it was previously).
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Limit dylib symbols

This makes `windows-gnu` match the behavior of `windows-msvc`. It probably doesn't make sense to export these symbols on other platforms either.
…tsakis

Updates smallvec and new_debug_unreachable

The version `0.6.10` of smallvec has released that fixes an [ICE](rust-lang#61549).
This is re-submission of rust-lang#58773.
And this may let rust-lang#56440 re-start.
note some safety concerns of raw-ptr-to-ref casts
…expr-count-sequel, r=varkor

typeck: Fix ICE for blocks in repeat expr count.

Fixes rust-lang#61336 (again). This PR fixes an ICE that occured when a block expression resolving to a const generic was used for the count of an array repeat expression.

r? @varkor
in which we decline to lint single-use lifetimes in `derive`d impls

Resolves rust-lang#53738.

r? @eddyb
type_alias_enum_variants: fix rust-lang#61801; allow a path pattern to infer

Fix rust-lang#61801.

Given a type-relative path pattern referring to an enum variant through a type alias, allow inferring the generic argument applied in the expectation set by the scrutinee of a `match` expression.

Similar issues may exist for `let` statements but I don't know how to test for that since `PhantomData<T>` is necessary...)

The gist of the problem here was that `resolve_ty_and_res_ufcs` was called twice which is apparently no good... It is possible that this PR is papering over some deeper problem, but that is beyond my knowledge of the compiler.

r? @petrochenkov
cc @eddyb @alexreg
cc rust-lang#61682
cc rust-lang#49683
Fix rust-lldb wrapper scripts.

Currently the `rust-lldb` wrapper provided by Rust project is broken. The error messages it produces on launch are as follows:
```
warning: ignoring unknown option: --one-line-before-file=command script import "/Users/kon/.rustup/toolchains/nightly-2019-05-02-x86_64-apple-darwin/lib/rustlib/etc/lldb_rust_formatters.py"
warning: ignoring unknown option: --one-line-before-file=type summary add --no-value --python-function lldb_rust_formatters.print_val -x ".*" --category Rust
warning: ignoring unknown option: --one-line-before-file=type category enable Rust
(lldb) target create "target/debug/nagare"
Traceback (most recent call last):
  File "<string>", line 1, in <module>
  File "/Users/kon/.rustup/toolchains/nightly-2019-05-02-x86_64-apple-darwin/lib/rustlib/x86_64-apple-darwin/lib/python2.7/site-packages/lldb/__init__.py", line 1481, in <module>
    class SBAddress(object):
  File "/Users/kon/.rustup/toolchains/nightly-2019-05-02-x86_64-apple-darwin/lib/rustlib/x86_64-apple-darwin/lib/python2.7/site-packages/lldb/__init__.py", line 1647, in SBAddress
    __swig_getmethods__["module"] = GetModule
NameError: name '__swig_getmethods__' is not defined
Traceback (most recent call last):
  File "<string>", line 1, in <module>
NameError: name 'run_one_line' is not defined
Traceback (most recent call last):
  File "<string>", line 1, in <module>
NameError: name 'run_one_line' is not defined
Traceback (most recent call last):
  File "<string>", line 1, in <module>
NameError: name 'run_one_line' is not defined
...etc.
```

The errors stem from two regressions: one caused by an LLVM upgrade and one caused by unintended upgrade to SWIG 4.0 (SWIG is a wrapper generator that is used to generate Python bindings for LLVM and LLDB.)

(Edit: found the exact dates) The SWIG breakage happened because of a Homebrew version upgrade on `nightly-2019-05-01-x86_64-apple-darwin` and the LLVM breakage happened on `nightly-2019-01-27-x86_64-apple-darwin` (likely to have been caused by rust-lang#57675 ).

The fix is to update the LLVM parameter syntax and to "downgrade" to SWIG 3.0.x. SWIG 3.0.x is not going to be supported by Homebrew forever, but should be good for now, until LLDB upgrades to  support SWIG 4.0.0. Here's some more info about Homebrew support: Homebrew/homebrew-core#39929 & Homebrew/homebrew-core#40882 I'm going to send a bug & fix to LLDB about SWIG 4.0.0 to get the situation fixed in the future.

It would be good to also backport this to beta, since it's such a small change, and will fix an obvious regression.
rustbuild: include llvm-libunwind in dist tarball

Without this we cannot build with llvm-libunwind enabled from a release tarball.

Could it be backported in a beta rollup somehow so that this gets fixed before 1.36 is released?
@Centril
Copy link
Contributor Author

Centril commented Jun 14, 2019

@bors r+ p=8 rollup=never

@bors
Copy link
Contributor

bors commented Jun 14, 2019

📌 Commit e4a493f has been approved by Centril

@bors
Copy link
Contributor

bors commented Jun 14, 2019

🌲 The tree is currently closed for pull requests below priority 500, this pull request will be tested once the tree is reopened

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

kennytm commented Jun 14, 2019

@bors treeclosed-

@bors
Copy link
Contributor

bors commented Jun 14, 2019

⌛ Testing commit e4a493f with merge 56fd485befffa3f064bd4f20e924bd7c13fcd4de...

@bors
Copy link
Contributor

bors commented Jun 14, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job dist-x86_64-apple-alt 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.
wry
xmoto
zxing-cpp
==> Downloading https://homebrew.bintray.com/bottles/xz-5.2.4.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/e7/e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880?__gda__=exp=1560541442~hmac=92e94f5289b8f5bc49b3e33aac0b12a478e51d0a18abbefccaa3a1d6ab0b8205&response-content-disposition=attachment%3Bfilename%3D%22xz-5.2.4.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX18bsMMLPH0COtUx9oz-uaHyEwnE0YxnRIKqEZEgI3L27raf84dzYKuTrvV74VANfXFWsidnQmv8K-16Wsgne5Pa-v_4HfqtJHXCjXkcZX5fY0kHNDlfifL8ibjPyloW-k8uqKNq1juZhg&response-X-Checksum-Sha1=32dc0b28e61f32b40c20e2993418aa8cb6e746d5&response-X-Checksum-Sha2=e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880
🍺  /usr/local/Cellar/xz/5.2.4: 92 files, 1MB
==> `brew cleanup` has not been run in 30 days, running now...
Removing: /Users/travis/Library/Caches/Homebrew/boost-1.66.0.high_sierra.bottle.tar.gz... (84.6MB)
Removing: /Users/travis/Library/Caches/Homebrew/carthage-0.28.0.high_sierra.bottle.tar.gz... (8.3MB)
---
Pruned 0 symbolic links and 5 directories from /usr/local
==> Installing dependencies for swig@3: pcre
==> Installing swig@3 dependency: pcre
==> Downloading https://homebrew.bintray.com/bottles/pcre-8.43.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/03/0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861?__gda__=exp=1560541454~hmac=e21319d6c5041d311aa20b7af7916dcd4ef10c41c8f272f9ae12d199364191a4&response-content-disposition=attachment%3Bfilename%3D%22pcre-8.43.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX18y0QJYza8qitJTsakGqkI5a9Xk6mfOmjvjSC7am9nW9JylBketDRStkzpPp2-M4sCIml7STOGHIUXbYy2XtTjp19aepnvsFEc9aB1VzH38pMztqchjPrzZ6021kz9r8mQ88jiOd-VExA&response-X-Checksum-Sha1=c67d4b99bb245f0ea56b34118dd6325b06a7250c&response-X-Checksum-Sha2=0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861
🍺  /usr/local/Cellar/pcre/8.43: 204 files, 5.5MB
==> Installing swig@3
==> Downloading https://homebrew.bintray.com/bottles/swig@3-3.0.12.high_sierra.bottle.tar.gz
==> Downloading https://homebrew.bintray.com/bottles/swig@3-3.0.12.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/73/730bd728981cc1534664ef35d08d0b285e79756c286913d868af6afa43f60f4d?__gda__=exp=1560541457~hmac=5d355ee28f21872c5cf2c7df500de5381ee9e34d7c038bf5a74dbbf408051d22&response-content-disposition=attachment%3Bfilename%3D%22swig%403-3.0.12.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX19TT3T8s_rLtmK4whEWgnyI2mLiIZ0m7agqxVWk54emZBdANVBk8UKLXQz5Hl0bjRNXtTQh05NrKlhBqiFhYlTzgdbTNZ2yHYnQwDAn0QAS3Rgpd7dcq87MXfRJgn9FqTRxpbldpmyjvA&response-X-Checksum-Sha1=4dc415ab888a7792f289543bafff9d4ec27cebb3&response-X-Checksum-Sha2=730bd728981cc1534664ef35d08d0b285e79756c286913d868af6afa43f60f4d
==> Pouring swig@3-3.0.12.high_sierra.bottle.tar.gz
==> Caveats
swig@3 is keg-only, which means it was not symlinked into /usr/local,
because this is an alternate version of another formula.
If you need to have swig@3 first in your PATH run:
  echo 'export PATH="/usr/local/opt/swig@3/bin:$PATH"' >> ~/.bash_profile
==> Summary
🍺  /usr/local/Cellar/swig@3/3.0.12: 755 files, 5.5MB
==> Caveats
==> swig@3
swig@3 is keg-only, which means it was not symlinked into /usr/local,
because this is an alternate version of another formula.
If you need to have swig@3 first in your PATH run:
  echo 'export PATH="/usr/local/opt/swig@3/bin:$PATH"' >> ~/.bash_profile
travis_fold:end:install
travis_fold:start:before_script.1
travis_time:start:126d8332
$ echo "#### Disk usage before running script:"; df -h; du . | sort -nr | head -n100
---
[00:03:17]       Memory: 8 GB
[00:03:17]       Boot ROM Version: VMW71.00V.7581552.B64.1801142334
[00:03:17]       Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:03:17]       SMC Version (system): 2.8f0
[00:03:17]       Serial Number (system): VMneSsREoq0i
[00:03:17] 
[00:03:17] hw.ncpu: 4
[00:03:17] hw.byteorder: 1234
[00:03:17] hw.memsize: 8589934592
---
[00:33:53] -- Looking for __NR_process_vm_readv - not found
[00:33:53] -- Looking for compression_encode_buffer in compression
[00:33:53] -- Looking for compression_encode_buffer in compression - found
[00:33:53] -- Could NOT find Doxygen (missing: DOXYGEN_EXECUTABLE) 
[00:33:54] CMake Error at /usr/local/Cellar/cmake/3.10.2/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:137 (message):
[00:33:54]   Could NOT find SWIG (missing: SWIG_EXECUTABLE SWIG_DIR)
[00:33:54] Call Stack (most recent call first):
[00:33:54]   /usr/local/Cellar/cmake/3.10.2/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:378 (_FPHSA_FAILURE_MESSAGE)
[00:33:54]   /usr/local/Cellar/cmake/3.10.2/share/cmake/Modules/FindSWIG.cmake:63 (FIND_PACKAGE_HANDLE_STANDARD_ARGS)
[00:33:54]   /Users/travis/build/rust-lang/rust/src/llvm-project/lldb/scripts/CMakeLists.txt:18 (find_package)
[00:33:54] 
[00:33:54] -- Configuring incomplete, errors occurred!
[00:33:54] -- Configuring incomplete, errors occurred!
[00:33:54] See also "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/llvm/build/CMakeFiles/CMakeOutput.log".
[00:33:54] See also "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/llvm/build/CMakeFiles/CMakeError.log".
[00:33:54] command did not execute successfully, got: exit code: 1
[00:33:54] 
[00:33:54] 
[00:33:54] build script failed, must exit now', /Users/travis/.cargo/registry/src/github.com-1ecc6299db9ec823/cmake-0.1.38/src/lib.rs:813:5
[00:33:54]  finished in 45.144
[00:33:54] travis_fold:end:llvm

[00:33:54] travis_time:end:llvm:start=1560542766027635000,finish=1560542811170017000,duration=45142382000
---
travis_fold:start:after_failure.2
travis_time:start:04ccb0c0
$ ls -lat $HOME/Library/Logs/DiagnosticReports/
total 0
drwx------+ 15 travis  staff  510 Jan 25  2018 ..
drwx------   2 travis  staff   68 Dec  6  2017 .
travis_fold:end:after_failure.2
travis_fold:start:after_failure.3
travis_time:start:00dd70f6
$ find $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/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
travis_time:end:00dd70f6:start=1560542817596342000,finish=1560542817621856000,duration=25514000
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:031efab0
$ 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:006c348f
travis_time:start:006c348f
$ 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:0741b4ba
$ 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 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 14, 2019
@Centril Centril closed this Jun 14, 2019
@Centril Centril deleted the rollup-0ot369l branch June 14, 2019 20:15
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet