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.

Sign up for GitHub

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

Jump to bottom

update miri #61743

Merged
merged 1 commit into from
Jun 13, 2019
Merged

update miri #61743

merged 1 commit into from
Jun 13, 2019

Conversation

RalfJung
Copy link
Member

Fixes #61662

r? @oli-obk

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 11, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Jun 12, 2019

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Jun 12, 2019

📌 Commit e82e338999a69fdf283a7b1d4d4029e0a099ca1a has been approved by oli-obk

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

bors commented Jun 12, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout miri (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self miri --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@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 Jun 12, 2019
@RalfJung
Copy link
Member Author

Rebased.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Jun 12, 2019

📌 Commit 16b810a91118db2c9eefd7d6933ecd9ef82ec04e has been approved by oli-obk

@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 Jun 12, 2019
@lnicola lnicola mentioned this pull request Jun 12, 2019
Merged
@bors
Copy link
Contributor

bors commented Jun 12, 2019

⌛ Testing commit 16b810a91118db2c9eefd7d6933ecd9ef82ec04e with merge 5f41ba2181010a3a62b2d115a1af4a89327ee6ed...

@mati865
Copy link
Contributor

mati865 commented Jun 12, 2019

@oli-obk @RalfJung
This PR will fail with something like:

Dependencies not on the whitelist:
 * fuchsia-cprng
 * rand_os
 * rdrand

See #61597 which updates Cargo.lock and contains necessary changes.

@RalfJung
Copy link
Member Author

Dang. Okay then let's let that land first.

@bors r- retry

@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 Jun 12, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-distcheck 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:05:30]    Vendoring difference v2.0.0 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/difference-2.0.0) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/difference
[00:05:30]    Vendoring digest v0.7.6 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/digest-0.7.6) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/digest
[00:05:30]    Vendoring directories v2.0.1 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/directories-2.0.1) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/directories
[00:05:30]    Vendoring dirs v1.0.4 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/dirs-1.0.4) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/dirs
[00:05:30]    Vendoring dirs-sys v0.3.3 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/dirs-sys-0.3.3) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/dirs-sys
[00:05:30]    Vendoring either v1.5.0 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/either-1.5.0) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/either
[00:05:30]    Vendoring elasticlunr-rs v2.3.4 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/elasticlunr-rs-2.3.4) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/elasticlunr-rs
[00:05:30]    Vendoring ena v0.11.0 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/ena-0.11.0) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/ena-0.11.0
[00:05:30]    Vendoring ena v0.13.0 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/ena-0.13.0) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/ena
---
[00:05:30]    Vendoring fortanix-sgx-abi v0.3.2 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/fortanix-sgx-abi-0.3.2) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/fortanix-sgx-abi
[00:05:30]    Vendoring fs2 v0.4.3 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/fs2-0.4.3) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/fs2
[00:05:30]    Vendoring fs_extra v1.1.0 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/fs_extra-1.1.0) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/fs_extra
[00:05:30]    Vendoring fst v0.3.0 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/fst-0.3.0) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/fst
[00:05:30]    Vendoring fuchsia-cprng v0.1.1 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/fuchsia-cprng-0.1.1) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/fuchsia-cprng
[00:05:30]    Vendoring fuchsia-zircon-sys v0.3.3 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/fuchsia-zircon-sys-0.3.3) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/fuchsia-zircon-sys
[00:05:30]    Vendoring futf v0.1.4 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/futf-0.1.4) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/futf
[00:05:30]    Vendoring futures v0.1.21 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/futures-0.1.21) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/futures
[00:05:30]    Vendoring fwdansi v1.0.1 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/fwdansi-1.0.1) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/fwdansi
---
[00:05:32]    Vendoring rand_pcg v0.1.1 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand_pcg-0.1.1) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/rand_pcg
[00:05:32]    Vendoring rand_xorshift v0.1.0 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rand_xorshift-0.1.0) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/rand_xorshift
[00:05:32]    Vendoring rayon v1.0.1 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rayon-1.0.1) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/rayon
[00:05:32]    Vendoring rayon-core v1.4.0 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rayon-core-1.4.0) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/rayon-core
[00:05:32]    Vendoring rdrand v0.4.0 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/rdrand-0.4.0) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/rdrand
[00:05:32]    Vendoring redox_termios v0.1.1 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/redox_termios-0.1.1) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/redox_termios
[00:05:32]    Vendoring redox_users v0.2.0 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/redox_users-0.2.0) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/redox_users-0.2.0
[00:05:32]    Vendoring redox_users v0.3.0 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/redox_users-0.3.0) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/redox_users
[00:05:32]    Vendoring regex v0.2.11 (/cargo/registry/src/git.luolix.top-1ecc6299db9ec823/regex-0.2.11) to /checkout/obj/build/tmp/dist/rustc-1.37.0-dev-src/vendor/regex-0.2.11
---
[00:15:36] * wrapping_iter_arith              lib      stable       1.14.0  
[00:15:36] * wrapping_neg                     lib      stable       1.10.0  
[00:15:36] * wrapping_next_power_of_two       lib      unstable     None    
[00:15:36] * wrapping_ref                     lib      stable       1.14.0  
[00:15:38] invalid license ISC in /checkout/obj/build/tmp/distcheck/src/../vendor/rdrand/Cargo.toml
[00:15:38] invalid license LICENSE in /checkout/obj/build/tmp/distcheck/src/../vendor/fuchsia-cprng/Cargo.toml
[00:15:38] some tidy checks failed
[00:15:38] 
[00:15:38] 
[00:15:38] command did not execute successfully: "/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/obj/build/tmp/distcheck/src" "/checkout/obj/build/tmp/distcheck/build/x86_64-unknown-linux-gnu/stage0/bin/cargo"
[00:15:38] 
[00:15:38] 
[00:15:38] failed to run: /checkout/obj/build/tmp/distcheck/build/bootstrap/debug/bootstrap test
[00:15:38] Build completed unsuccessfully in 0:02:29
[00:15:38] Build completed unsuccessfully in 0:02:29
[00:15:38] Makefile:48: recipe for target 'check' failed
[00:15:38] make: *** [check] Error 1
[00:15:38] 
[00:15:38] command did not execute successfully: "make" "check"
[00:15:38] expected success, got: exit code: 2
[00:15:38] 
---
travis_time:end:17667858:start=1560336663801376684,finish=1560336663808004593,duration=6627909
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:028846e0
$ 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:05420a60
travis_time:start:05420a60
$ 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:01ae70df
$ 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)

@rust-highfive
Copy link
Collaborator

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. 
travis_time:end:09752ce4:start=1560373149209283791,finish=1560373150057726687,duration=848442896
$ 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:41:28] This PR updated 'src/tools/miri', verifying if status is 'test-pass'...
[01:41:28] 
[01:41:28] ⚠️ We detected that this PR updated 'miri', but its tests failed.
[01:41:28] 
[01:41:28] If you do intend to update 'miri', please check the error messages above and
[01:41:28] commit another update.
[01:41:28] 
[01:41:28] If you do NOT intend to update 'miri', please ensure you did not accidentally
[01:41:28] change the submodule at 'src/tools/miri'. You may ask your reviewer for the
[01:41:28] proper steps.
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 3.
travis_time:start:02a2db40
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Jun 12 22:40:48 UTC 2019
---
travis_time:end:009943f5:start=1560379250254729541,finish=1560379250259709260,duration=4979719
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:274684d4
$ 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:003d45b3
travis_time:start:003d45b3
$ 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:0c6f7b18
$ 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)

@lnicola
Copy link
Member

lnicola commented Jun 13, 2019

#61597 was merged, you can probably rebase now.

@RalfJung
Copy link
Member Author

Thanks for the ping! First I need to fix Miri for #61722 though...

@bors
Copy link
Contributor

bors commented Jun 13, 2019

☔ The latest upstream changes (presumably #61597) made this pull request unmergeable. Please resolve the merge conflicts.

@RalfJung
Copy link
Member Author

Fixed Miri upstream and rebased.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Jun 13, 2019

📌 Commit 4e8626e has been approved by oli-obk

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

bors commented Jun 13, 2019

⌛ Testing commit 4e8626e with merge 96636f3...

bors added a commit that referenced this pull request Jun 13, 2019
@bors
Auto merge of #61743 - RalfJung:miri, r=oli-obk
96636f3 
update miri

Fixes #61662

r? @oli-obk
@bors
Copy link
Contributor

bors commented Jun 13, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 96636f3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 13, 2019
@bors bors merged commit 4e8626e into rust-lang:master Jun 13, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #61743!

Tested on commit 96636f3.
Direct link to PR: #61743

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 13, 2019
@rust-highfive
📣 Toolstate changed by rust-lang/rust#61743!
a108556 
Tested on commit rust-lang/rust@96636f3.
Direct link to PR: <rust-lang/rust#61743>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

miri no longer builds after rust-lang/rust#61625
6 participants
@RalfJung @rust-highfive @oli-obk @bors @mati865 @lnicola