Skip to content

Rollup of 6 pull requests - #61880

Closed
Centril wants to merge 15 commits into
rust-lang:masterfrom
Centril:rollup-w6oyq7f
Closed

Rollup of 6 pull requests#61880
Centril wants to merge 15 commits into
rust-lang:masterfrom
Centril:rollup-w6oyq7f

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

petrhosekand others added 15 commits June 10, 2019 19:50
Some -L and -l flags may be needed even when building librustc_llvm,
for example when using static libc++ on Linux we may need to manually
specify the library search path and -ldl -lpthread as additional link
dependencies. We pass LLVM linker flags from config to librustc_llvm
build to make sure these cases are handled.
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
…crichton
Pass LLVM linker flags to librustc_llvm build
Some -L and -l flags may be needed even when building librustc_llvm,
for example when using static libc++ on Linux we may need to manually
specify the library search path and -ldl -lpthread as additional link
dependencies. We pass LLVM linker flags from config to librustc_llvm
build to make sure these cases are handled.
…=oli-obk
prepare for Intptrcast model
rust-lang#61668 done right (I hope so). r? @RalfJung@oli-obk
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
Copy Markdown
ContributorAuthor

@bors r+ p=6 rollup=never

@bors

bors commented Jun 16, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 1815e43 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 16, 2019
@bors

bors commented Jun 16, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1815e43 with merge 2c90aa43052f13a80f27965e9fb2a879fe8ec821...

@bors

bors commented Jun 16, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-travis

@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-tools 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.
[01:48:12] error: tests/compile-fail/null_pointer_deref.rs:2: expected error not found: invalid use of NULL pointer
[01:48:12] [01:48:12] error: 1 unexpected errors found, 1 expected errors not found
[01:48:12] status: exit code: 1
[01:48:12] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/compile-fail/null_pointer_deref.rs" "-L" "/tmp/compiletestSyF7iA" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestSyF7iA/null_pointer_deref.stage-id" "-Dwarnings" "-Dunused" "--edition" "2018" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "-L" "/tmp/compiletestSyF7iA/null_pointer_deref.stage-id.aux" "-A" "unused"
[01:48:12] Error {
[01:48:12] line_num: 2,
[01:48:12] kind: Some(
[01:48:12] Error,
[01:48:12] Error,
[01:48:12] ),
[01:48:12] msg: "2:27: 2:44: Miri evaluation error: a memory access tried to interpret some bytes as a pointer [E0080]",
[01:48:12] ]
[01:48:12] [01:48:12] not found errors (from test file): [
[01:48:12] Error {
---
[01:48:13] error: tests/compile-fail/null_pointer_write.rs:2: expected error not found: invalid use of NULL pointer
[01:48:13] [01:48:13] error: 1 unexpected errors found, 1 expected errors not found
[01:48:13] status: exit code: 1
[01:48:13] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/compile-fail/null_pointer_write.rs" "-L" "/tmp/compiletestSyF7iA" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestSyF7iA/null_pointer_write.stage-id" "-Dwarnings" "-Dunused" "--edition" "2018" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "-L" "/tmp/compiletestSyF7iA/null_pointer_write.stage-id.aux" "-A" "unused"
[01:48:13] Error {
[01:48:13] line_num: 2,
[01:48:13] kind: Some(
[01:48:13] Error,
[01:48:13] Error,
[01:48:13] ),
[01:48:13] msg: "2:14: 2:42: Miri evaluation error: a memory access tried to interpret some bytes as a pointer [E0080]",
[01:48:13] ]
[01:48:13] [01:48:13] not found errors (from test file): [
[01:48:13] Error {
---
[01:48:19] This PR updated 'src/tools/miri', verifying if status is 'test-pass'...
[01:48:19] [01:48:19] ⚠️ We detected that this PR updated 'miri', but its tests failed.
[01:48:19] [01:48:19] If you do intend to update 'miri', please check the error messages above and
[01:48:19] commit another update.
[01:48:19] [01:48:19] If you do NOT intend to update 'miri', please ensure you did not accidentally
[01:48:19] change the submodule at 'src/tools/miri'. You may ask your reviewer for the
[01:48:19] proper steps.
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 3.
travis_time:start:11b829c6
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sun Jun 16 04:00:14 UTC 2019
---
travis_time:end:0569cf4f:start=1560657616534001509,finish=1560657616541343882,duration=7342373
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:09528306
$ 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:22530e10
travis_time:start:22530e10
$ 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:21afa058
$ 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)

@borsbors 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 16, 2019
@CentrilCentril closed this Jun 16, 2019
@Centril
Centril deleted the rollup-w6oyq7f branch June 16, 2019 04:04
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@Centril@bors@rust-highfive@petrhosek@pvdrz@Keruspe@RalfJung@sinkuu