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

update miri #59555

Merged
merged 3 commits into from
Apr 4, 2019
Merged

update miri #59555

merged 3 commits into from
Apr 4, 2019

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Mar 30, 2019

r? @oli-obk

Fixes #59477

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

kennytm commented Mar 31, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Mar 31, 2019

📌 Commit 0ac161a517be127b12a11328eb08bae4cdf47155 has been approved by kennytm

@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 Mar 31, 2019
@kennytm kennytm self-assigned this Mar 31, 2019
@RalfJung
Copy link
Member Author

@bors p=1 tool fix

@bors
Copy link
Contributor

bors commented Mar 31, 2019

⌛ Testing commit 0ac161a517be127b12a11328eb08bae4cdf47155 with merge 149c599010807415b22365341daccccfd17d7462...

@oli-obk
Copy link
Contributor

oli-obk commented Mar 31, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Mar 31, 2019

💡 This pull request was already approved, no need to approve it again.

  • This pull request is currently being tested. If there's no response from the continuous integration service, you may use retry to trigger a build again.

@bors
Copy link
Contributor

bors commented Mar 31, 2019

📌 Commit 0ac161a517be127b12a11328eb08bae4cdf47155 has been approved by oli-obk

@bors
Copy link
Contributor

bors commented Mar 31, 2019

⌛ Testing commit 0ac161a517be127b12a11328eb08bae4cdf47155 with merge 0c12094ef5493f3cc94dfe0ab77013e32d97af36...

@oli-obk
Copy link
Contributor

oli-obk commented Mar 31, 2019

oh oops, old github page that didn't reload

@kennytm kennytm removed their assignment Mar 31, 2019
@bors
Copy link
Contributor

bors commented Mar 31, 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 Mar 31, 2019
@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.
[00:02:55]       Memory: 8 GB
[00:02:55]       Boot ROM Version: VMW71.00V.7581552.B64.1801142334
[00:02:55]       Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
[00:02:55]       SMC Version (system): 2.8f0
[00:02:55]       Serial Number (system): VMnfZUOSYAVd
[00:02:55] 
[00:02:55] hw.ncpu: 4
[00:02:55] hw.byteorder: 1234
[00:02:55] hw.memsize: 8589934592
---
[01:21:46] [RUSTC-TIMING] miri test:false 48.415
[01:21:52] [RUSTC-TIMING] cargo_miri test:false 5.421
[01:21:53] [RUSTC-TIMING] miri test:false 6.830
[01:21:53]     Finished release [optimized] target(s) in 1m 11s
[01:21:53] duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
[01:21:53] the following dependencies are duplicated although they have the same features enabled:
[01:21:53] the following dependencies are duplicated although they have the same features enabled:
[01:21:53]   parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)
[01:21:53]     `miri` ("/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libparking_lot_core-307f981d52c7dc33.rlib")
[01:21:53]     `cargo` ("/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libparking_lot_core-c4581a9e11c9cf36.rlib")
[01:21:53]   parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)
[01:21:53]     `miri` ("/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libparking_lot-b6aa07150686efcf.rlib")
[01:21:53]     `cargo` ("/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/libparking_lot-f8d432f17a0258a9.rlib")
[01:21:53]   rustc-workspace-hack 1.0.0 (path+file:///Users/travis/build/rust-lang/rust/src/tools/rustc-workspace-hack)
[01:21:53]     `miri` ("/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/librustc_workspace_hack-dd86f1f5fcac4965.rlib")
[01:21:53]     `cargo` ("/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/librustc_workspace_hack-3ac1deb2455741a2.rlib")
[01:21:53] the following dependencies have different features:
[01:21:53]   rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)
[01:21:53]     `miri` additionally enabled features {} at "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/librand-bb9ec2d01a61cf1d.rlib"
[01:21:53]     `cargo` additionally enabled features {"i128_support"} at "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/librand-ff2bb5dd6d03d558.rlib"
[01:21:53] 
[01:21:53] to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
[01:21:53] thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:170:13
[01:21:53] travis_fold:end:stage2-miri

[01:21:53] travis_time:end:stage2-miri:start=1554029079322022000,finish=1554029150999016000,duration=71676994000

---
travis_fold:start:after_failure.2
travis_time:start:02a79c14
$ 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:05fce5a8
$ 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:05fce5a8:start=1554029156923222000,finish=1554029156957274000,duration=34052000
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0aa2be6c
$ 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:154e3e04
travis_time:start:154e3e04
$ 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:1d760024
$ dmesg | grep -i kill
$ dmesg | grep -i kill
Unable to obtain kernel buffer: Operation not permitted
usage: sudo dmesg
travis_fold:end:after_failure.6

Done. Your build exited with 1.

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)

@kennytm
Copy link
Member

kennytm commented Mar 31, 2019

@bors r-

[01:21:53] the following dependencies have different features:
[01:21:53]   rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)
[01:21:53]     `miri` additionally enabled features {} at "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/librand-bb9ec2d01a61cf1d.rlib"
[01:21:53]     `cargo` additionally enabled features {"i128_support"} at "/Users/travis/build/rust-lang/rust/build/x86_64-apple-darwin/stage2-tools/x86_64-apple-darwin/release/deps/librand-ff2bb5dd6d03d558.rlib"
[01:21:53] 
[01:21:53] to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
[01:21:53] thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:170:13

@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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 31, 2019
@RalfJung
Copy link
Member Author

@rust-lang/infra rand already is in src/tools/rustc-workspace-hack/Cargo.toml but with a different version... what should I do?

@kennytm
Copy link
Member

kennytm commented Mar 31, 2019

@RalfJung If i128_support is only used by cargo, I think it's better to change the rand version 0.6.1

@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:198bcf60:start=1554042014877194559,finish=1554042091803063881,duration=76925869322
$ 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
Setting environment variables from .travis.yml
---
####################################################################      94.8%
######################################################################## 100.0%
[00:01:10] extracting /checkout/obj/build/cache/2019-03-20/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:10]     Updating crates.io index
[00:01:24] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:24] Build completed unsuccessfully in 0:00:28
[00:01:24] make: *** [prepare] Error 1
[00:01:24] Makefile:69: recipe for target 'prepare' failed
[00:01:25] Command failed. Attempt 2/5:
[00:01:25] Command failed. Attempt 2/5:
[00:01:26] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:26] Build completed unsuccessfully in 0:00:00
[00:01:26] make: *** [prepare] Error 1
[00:01:26] Makefile:69: recipe for target 'prepare' failed
[00:01:28] Command failed. Attempt 3/5:
[00:01:28] Command failed. Attempt 3/5:
[00:01:28] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:28] Build completed unsuccessfully in 0:00:00
[00:01:28] make: *** [prepare] Error 1
[00:01:28] Makefile:69: recipe for target 'prepare' failed
[00:01:31] Command failed. Attempt 4/5:
[00:01:31] Command failed. Attempt 4/5:
[00:01:31] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:31] Build completed unsuccessfully in 0:00:00
[00:01:31] make: *** [prepare] Error 1
[00:01:31] Makefile:69: recipe for target 'prepare' failed
[00:01:35] Command failed. Attempt 5/5:
[00:01:35] Command failed. Attempt 5/5:
[00:01:36] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:36] Build completed unsuccessfully in 0:00:00
[00:01:36] make: *** [prepare] Error 1
[00:01:36] Makefile:69: recipe for target 'prepare' failed
[00:01:36] The command has failed after 5 attempts.
---
travis_time:end:08351067:start=1554042201740233171,finish=1554042201747486085,duration=7252914
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1c743bd0
$ 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:0621e011
travis_time:start:0621e011
$ 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:0277ef5a
$ 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)

@RalfJung
Copy link
Member Author

You mean like this? But that seems to fail on CI, even though it works locally.

@RalfJung
Copy link
Member Author

RalfJung commented Apr 2, 2019

@mati865 that just shows which subcommand to run? It also does not make a difference.

@kennytm Not sure what to verify? See this PR's diff for the change I did, that includes all lockfile updates I am seeing.

@mati865
Copy link
Contributor

mati865 commented Apr 2, 2019

@RalfJung it updates the lockfile, builds bootstrap and then shows help. No idea why it didn't work for you.

@RalfJung
Copy link
Member Author

RalfJung commented Apr 2, 2019

Well clearly my local toolchain thinks there is nothing to update about that lockfile.

I just don't understand why.

@RalfJung
Copy link
Member Author

RalfJung commented Apr 2, 2019

@kennytm can you just push whatever your toolchain does to the lockfile to my branch?

Cc @alexcrichton for Cargo behaving strangely: no lockfile update on my system, but lockfile needs updating on CI.

@oli-obk
Copy link
Contributor

oli-obk commented Apr 3, 2019

@RalfJung you probably need to rebase in that case.

@RalfJung
Copy link
Member Author

RalfJung commented Apr 3, 2019

Good call! Now I have a diff more like @kennytm's

@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 3, 2019
@RalfJung
Copy link
Member Author

RalfJung commented Apr 4, 2019

Travis looks happy.

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Apr 4, 2019

📌 Commit c75a5a2 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 Apr 4, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 4, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 4, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 4, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 4, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 4, 2019
bors added a commit that referenced this pull request Apr 4, 2019
Rollup of 8 pull requests

Successful merges:

 - #59470 (Document std::fs::File close behavior ignoring errors)
 - #59555 (update miri)
 - #59556 (update stdsimd)
 - #59596 (Forward formatter settings to bounds of `Range<T>` in `fmt::Debug` impl)
 - #59639 (Never return uninhabited values at all)
 - #59671 (Make some of lexer's API private)
 - #59685 (Add description for -Os and -Oz in rustc.1)
 - #59686 (Temporarily disable stack probing for gnux32.)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Apr 4, 2019

⌛ Testing commit c75a5a2 with merge 52980d0...

@bors bors merged commit c75a5a2 into rust-lang:master Apr 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants