update miri

[RalfJung]

r? @oli-obk

[rust-highfive]

⚠️Warning⚠️

• These commits modify submodules.

[oli-obk]

@bors r+ p=1

[bors]

📌 Commit d6030feacd9552908a74b2b01cfa538d1a688359 has been approved by oli-obk

[bors]

⌛ Testing commit d6030feacd9552908a74b2b01cfa538d1a688359 with merge d616b6afbcbcb3f74db3ccb306d4557470430669...

[bors]

💔 Test failed - status-appveyor

[kennytm]

@bors r-

Caused ICE in the test run-pass\heap_allocator.rs.

error: internal compiler error: src/librustc_mir/interpret/eval_context.rs:139: The type checker should prevent reading from a never-written local

[RalfJung]

That's odd... we have Windows CI as well on the Miri side and the tests are passing there. I don't really have any idea what might be causing a different behavior here.

[RalfJung]

This is a debug-only-r+ to hopefully get a better idea of what is going on in that Windows CI.

@bors r=oli-obk p=0

[bors]

📌 Commit 26b084e has been approved by oli-obk

[RalfJung]

@bors r-

[bors]

🔒 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.

[RalfJung]

@bors r=oli-obk

[bors]

📌 Commit 71338fc has been approved by oli-obk

[rust-highfive]

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:03154707:start=1556783337795593059,finish=1556783338504206137,duration=708613078
$ 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
---
[02:00:17] [02:00:17] The actual stderr differed from the expected stderr.
[02:00:17] Actual stderr saved to /tmp/compiletestn3yt81/hashmap.stderr
[02:00:17] To update references, run this command from build directory:
[02:00:17] tests/run-pass/update-references.sh '/tmp/compiletestn3yt81' 'hashmap.rs'
[02:00:17] error: 1 errors occurred comparing output.
[02:00:17] status: exit code: 1
[02:00:17] status: exit code: 1
[02:00:17] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/hashmap.rs" "-L" "/tmp/compiletestn3yt81" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestn3yt81/hashmap.stage-id" "-Dwarnings" "-Dunused" "--edition" "2018" "-Zmiri-seed=0000000000000000" "-L" "/tmp/compiletestn3yt81/hashmap.stage-id.aux" "-A" "unused"
[02:00:17] ------------------------------------------
[02:00:17] [02:00:17] ------------------------------------------
[02:00:17] stderr:
[02:00:17] stderr:
[02:00:17] ------------------------------------------
[02:00:17] {"message":"Miri evaluation error: tried to call a function with ABI RustIntrinsic using caller ABI PlatformIntrinsic","code":{"code":"E0080","explanation":"\nThis error indicates that the compiler was unable to sensibly evaluate an\nconstant expression that had to be evaluated. Attempting to divide by 0\nor causing integer overflow are two ways to induce this error. For example:\n\n```compile_fail,E0080\nenum Enum {\n X = (1 << 500),\n Y = (1 / 0)\n}\n```\n\nEnsure that the expressions given can be evaluated as the desired integer type.\nSee the FFI section of the Reference for more information about using a custom\ninteger type:\n\nhttps://doc.rust-lang.org/reference.html#ffi-attributes\n"},"level":"error","spans":[{"file_name":"/checkout/src/libcore/../stdsimd/crates/core_arch/src/x86/sse2.rs","byte_start":30505,"byte_end":30540,"line_start":820,"line_end":820,"column_start":27,"column_end":62,"is_primary":true,"text":[{"text":" transmute::<i8x16, _>(simd_eq(a.as_i8x16(), b.as_i8x16()))","highlight_start":27,"highlight_end":62}],"label":"Miri evaluation error: tried to call a function with ABI RustIntrinsic using caller ABI PlatformIntrinsic","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[{"message":"inside call to `std::arch::x86_64::_mm_cmpeq_epi8` at /cargo/registry/src/github.com-1ecc6299db9ec823/hashbrown-0.3.0/src/raw/sse2.rs:83:23","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"inside call to `hashbrown::raw::imp::Group::match_byte` at /cargo/registry/src/github.com-1ecc6299db9ec823/hashbrown-0.3.0/src/raw/mod.rs:853:28","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"inside call to `hashbrown::raw::RawTable::<(i32, i32)>::find::<[closure@DefId(8/1:34 ~ hashbrown[269a]::map[0]::{{impl}}[2]::insert[0]::{{closure}}[0]) 0:&i32]>` at /cargo/registry/src/github.com-1ecc6299db9ec823/hashbrown-0.3.0/src/map.rs:844:33","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"inside call to `hashbrown::map::HashMap::<i32, i32, std::collections::hash_map::RandomState>::insert` at /checkout/src/libstd/collections/hash/map.rs:823:9","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"inside call to `std::collections::HashMap::<i32, i32>::insert` at tests/run-pass/hashmap.rs:7:5","code":null,"level":"note","spans":[{"file_name":"tests/run-pass/hashmap.rs","byte_start":203,"byte_end":219,"line_start":7,"line_end":7,"column_start":5,"column_end":21,"is_primary":true,"text":[{"text":" map.insert(0, 0);","highlight_start":5,"highlight_end":21}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":null},{"message":"inside call to `test_map::<std::collections::hash_map::RandomState>` at tests/run-pass/hashmap.rs:33:9","code":null,"level":"note","spans":[{"file_name":"tests/run-pass/hashmap.rs","byte_start":1052,"byte_end":1065,"line_start":33,"line_end":33,"column_start":9,"column_end":22,"is_primary":true,"text":[{"text":" test_map(map);","highlight_start":9,"highlight_end":22}],"label":null,"suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":null},{"message":"inside call to `main` at /checkout/src/libstd/rt.rs:64:34","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"inside call to closure at /checkout/src/libstd/rt.rs:49:73","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"inside call to closure at /checkout/src/libstd/sys_common/backtrace.rs:136:5","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"inside call to `std::sys_common::backtrace::__rust_begin_short_backtrace::<[closure@DefId(1/1:1555 ~ std[238c]::rt[0]::lang_start_internal[0]::{{closure}}[0]::{{closure}}[0]) 0:&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe], i32>` at /checkout/src/libstd/rt.rs:49:13","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"inside call to closure at /checkout/src/libstd/panicking.rs:293:40","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"inside call to `std::panicking::try::do_call::<[closure@DefId(1/1:1554 ~ std[238c]::rt[0]::lang_start_internal[0]::{{closure}}[0]) 0:&&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe], i32>` at /checkout/src/libstd/panicking.rs:289:5","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"inside call to `std::panicking::try::<i32, [closure@DefId(1/1:1554 ~ std[238c]::rt[0]::lang_start_internal[0]::{{closure}}[0]) 0:&&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe]>` at /checkout/src/libstd/panic.rs:388:9","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"inside call to `std::panic::catch_unwind::<[closure@DefId(1/1:1554 ~ std[238c]::rt[0]::lang_start_internal[0]::{{closure}}[0]) 0:&&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe], i32>` at /checkout/src/libstd/rt.rs:48:25","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"inside call to `std::rt::lang_start_internal` at /checkout/src/libstd/rt.rs:64:5","code":null,"level":"note","spans":[],"children":[],"rendered":null},{"message":"inside call to `std::rt::lang_start::<()>`","code":null,"level":"note","spans":[],"children":[],"rendered":null}],"rendered":"error[E0080]: Miri evaluation error: tried to call a function with ABI RustIntrinsic using caller ABI PlatformIntrinsic\n --> /checkout/src/libcore/../stdsimd/crates/core_arch/src/x86/sse2.rs:820:27\n |\n820 | transmute::<i8x16, _>(simd_eq(a.as_i8x16(), b.as_i8x16()))\n | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Miri evaluation error: tried to call a function with ABI RustIntrinsic using caller ABI PlatformIntrinsic\n |\n = note: inside call to `std::arch::x86_64::_mm_cmpeq_epi8` at /cargo/registry/src/github.com-1ecc6299db9ec823/hashbrown-0.3.0/src/raw/sse2.rs:83:23\n = note: inside call to `hashbrown::raw::imp::Group::match_byte` at /cargo/registry/src/github.com-1ecc6299db9ec823/hashbrown-0.3.0/src/raw/mod.rs:853:28\n = note: inside call to `hashbrown::raw::RawTable::<(i32, i32)>::find::<[closure@DefId(8/1:34 ~ hashbrown[269a]::map[0]::{{impl}}[2]::insert[0]::{{closure}}[0]) 0:&i32]>` at /cargo/registry/src/github.com-1ecc6299db9ec823/hashbrown-0.3.0/src/map.rs:844:33\n = note: inside call to `hashbrown::map::HashMap::<i32, i32, std::collections::hash_map::RandomState>::insert` at /checkout/src/libstd/collections/hash/map.rs:823:9\nnote: inside call to `std::collections::HashMap::<i32, i32>::insert` at tests/run-pass/hashmap.rs:7:5\n --> tests/run-pass/hashmap.rs:7:5\n |\n7 | map.insert(0, 0);\n | ^^^^^^^^^^^^^^^^\nnote: inside call to `test_map::<std::collections::hash_map::RandomState>` at tests/run-pass/hashmap.rs:33:9\n --> tests/run-pass/hashmap.rs:33:9\n |\n33 | test_map(map);\n | ^^^^^^^^^^^^^\n = note: inside call to `main` at /checkout/src/libstd/rt.rs:64:34\n = note: inside call to closure at /checkout/src/libstd/rt.rs:49:73\n = note: inside call to closure at /checkout/src/libstd/sys_common/backtrace.rs:136:5\n = note: inside call to `std::sys_common::backtrace::__rust_begin_short_backtrace::<[closure@DefId(1/1:1555 ~ std[238c]::rt[0]::lang_start_internal[0]::{{closure}}[0]::{{closure}}[0]) 0:&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe], i32>` at /checkout/src/libstd/rt.rs:49:13\n = note: inside call to closure at /checkout/src/libstd/panicking.rs:293:40\n = note: inside call to `std::panicking::try::do_call::<[closure@DefId(1/1:1554 ~ std[238c]::rt[0]::lang_start_internal[0]::{{closure}}[0]) 0:&&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe], i32>` at /checkout/src/libstd/panicking.rs:289:5\n = note: inside call to `std::panicking::try::<i32, [closure@DefId(1/1:1554 ~ std[238c]::rt[0]::lang_start_internal[0]::{{closure}}[0]) 0:&&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe]>` at /checkout/src/libstd/panic.rs:388:9\n = note: inside call to `std::panic::catch_unwind::<[closure@DefId(1/1:1554 ~ std[238c]::rt[0]::lang_start_internal[0]::{{closure}}[0]) 0:&&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe], i32>` at /checkout/src/libstd/rt.rs:48:25\n = note: inside call to `std::rt::lang_start_internal` at /checkout/src/libstd/rt.rs:64:5\n = note: inside call to `std::rt::lang_start::<()>`\n\n"}
[02:00:17] {"message":"For more information about this error, try `rustc --explain E0080`.","code":null,"level":"","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0080`.\n"}
[02:00:17] [02:00:17] ------------------------------------------
[02:00:17] ---
[02:00:28] This PR updated 'src/tools/miri', verifying if status is 'test-pass'...
[02:00:28] [02:00:28] ⚠️ We detected that this PR updated 'miri', but its tests failed.
[02:00:28] [02:00:28] If you do intend to update 'miri', please check the error messages above and
[02:00:28] commit another update.
[02:00:28] [02:00:28] If you do NOT intend to update 'miri', please ensure you did not accidentally
[02:00:28] change the submodule at 'src/tools/miri'. You may ask your reviewer for the
[02:00:28] proper steps.
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 3.
travis_time:start:09ccc052
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Thu May 2 09:49:37 UTC 2019

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]

⌛ Testing commit 71338fc with merge 2e19f0c8575afdafc3e3846719a6fe4a0417cb24...

[RalfJung]

The local CI failure should be fixed by rebasing on top of #60156, which bors did.

[bors]

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

[bjorn3]

This hasnt been pushed to master yet, but #60379 is already testing.

[kennytm]

@bors ping

[bors]

😪 I'm awake I'm awake

[kennytm]

@bors retry

[bors]

⌛ Testing commit 71338fc with merge 08bfe16...

[bors]

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

[rust-highfive]

📣 Toolstate changed by #60173!

Tested on commit 08bfe16.
Direct link to PR: #60173

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