update Miri

[RalfJung]

Fixes #66862

r? @ghost

[RalfJung]

Submodule-only, fix-toolstate

@bors r+ p=1
Cc @oli-obk

[bors]

📌 Commit 209299c96e0e29476c93ed605cf619e374034951 has been approved by RalfJung

[bors]

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

[bors]

⌛ Testing commit 209299c96e0e29476c93ed605cf619e374034951 with merge cbbc6fc3308eba896b3563418ef9f8cab25947e5...

[RalfJung]

Conflicting PRs have landed.

@bors r- retry

[RalfJung]

@bors r+

[bors]

📌 Commit d9b7ba494362f2133cd6583722538b791b3c7eab has been approved by RalfJung

[rust-highfive]

The job x86_64-gnu-tools of your PR failed (pretty log, 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.

2019-12-02T18:56:00.4739634Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-12-02T18:56:00.4754793Z ##[command]git config gc.auto 0
2019-12-02T18:56:00.4757183Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-12-02T18:56:00.4759924Z ##[command]git config --get-all http.proxy
2019-12-02T18:56:00.4763065Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66925/merge:refs/remotes/pull/66925/merge
---
2019-12-02T20:27:38.2707006Z error: The server responded with 404 Not Found for "https://forge.rust-lang.org/rustc-bug-fix-procedure.html"
2019-12-02T20:27:38.2707833Z 
2019-12-02T20:27:38.2708285Z     ┌── compiler-team.md:40:3 ───
2019-12-02T20:27:38.2708626Z     │
2019-12-02T20:27:38.2709001Z  40 │   [aim to give warnings first][procedure]).
2019-12-02T20:27:38.2709658Z     │
2019-12-02T20:27:38.2709875Z 
2019-12-02T20:27:38.2710257Z error: The server responded with 404 Not Found for "https://forge.rust-lang.org/platform-support.html"
2019-12-02T20:27:38.2710416Z 
2019-12-02T20:27:38.2710416Z 
2019-12-02T20:27:38.2710755Z      ┌── tests/intro.md:116:8 ───
2019-12-02T20:27:38.2711259Z      │
2019-12-02T20:27:38.2711858Z  116 │ Rust's [platform tiers]).
2019-12-02T20:27:38.2712567Z      │
2019-12-02T20:27:38.2712723Z 
2019-12-02T20:27:38.2713184Z error: The server responded with 404 Not Found for "https://doc.rust-lang.org/nightly/nightly-rustc/rustc/middle/expr_use_visitor/struct.ExprUseVisitor.html"
2019-12-02T20:27:38.2713376Z 
---
2019-12-02T20:57:21.4702865Z 
2019-12-02T20:57:21.4703093Z If you do intend to update 'miri', please check the error messages above and
2019-12-02T20:57:21.4703137Z commit another update.
2019-12-02T20:57:21.4703160Z 
2019-12-02T20:57:21.4704132Z If you do NOT intend to update 'miri', please ensure you did not accidentally
2019-12-02T20:57:21.4708307Z change the submodule at 'src/tools/miri'. You may ask your reviewer for the
2019-12-02T20:57:21.4708370Z proper steps.
2019-12-02T20:57:21.4722712Z   local time: Mon Dec  2 20:57:21 UTC 2019
2019-12-02T20:57:21.5225690Z   network time: Mon, 02 Dec 2019 20:57:21 GMT
2019-12-02T20:57:21.5231052Z == end clock drift check ==
2019-12-02T20:57:22.6936004Z 
2019-12-02T20:57:22.6936004Z 
2019-12-02T20:57:22.7042209Z ##[error]Bash exited with code '3'.
2019-12-02T20:57:22.7073099Z ##[section]Starting: Checkout
2019-12-02T20:57:22.7075303Z ==============================================================================
2019-12-02T20:57:22.7075354Z Task         : Get sources
2019-12-02T20:57:22.7075398Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 d9b7ba494362f2133cd6583722538b791b3c7eab with merge 28fcd1038cb3b3ad60f2b961410e40d76f910b09...

[RalfJung]

Looks like something landed that broke Miri (agian...)

2019-12-02T20:57:19.8288172Z error[E0308]: try expression alternatives have incompatible types
2019-12-02T20:57:19.8289330Z --> src/tools/miri/src/shims/mod.rs:52:17
2019-12-02T20:57:19.8289702Z |
2019-12-02T20:57:19.8290135Z 52 | Ok(Some(this.load_mir(instance.def, None)?))
2019-12-02T20:57:19.8290620Z | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `&rustc::mir::Body<'_>`, found struct `rustc::mir::ReadOnlyBodyCache`
2019-12-02T20:57:19.8290800Z
2019-12-02T20:57:19.9292737Z error[E0308]: try expression alternatives have incompatible types
2019-12-02T20:57:19.9293073Z --> src/tools/miri/src/shims/foreign_items.rs:144:32
2019-12-02T20:57:19.9293295Z |
2019-12-02T20:57:19.9293549Z 144 | return Ok(Some(this.load_mir(start_panic_instance.def, None)?));
2019-12-02T20:57:19.9295202Z | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `&rustc::mir::Body<'_>`, found struct `rustc::mir::ReadOnlyBodyCache`
2019-12-02T20:57:19.9295256Z
2019-12-02T20:57:19.9370379Z error[E0308]: try expression alternatives have incompatible types
2019-12-02T20:57:19.9370643Z --> src/tools/miri/src/shims/foreign_items.rs:151:32
2019-12-02T20:57:19.9370844Z |
2019-12-02T20:57:19.9371125Z 151 | return Ok(Some(this.load_mir(panic_impl_instance.def, None)?));
2019-12-02T20:57:19.9371471Z | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `&rustc::mir::Body<'_>`, found struct `rustc::mir::ReadOnlyBodyCache`
2019-12-02T20:57:19.9371528Z
2019-12-02T20:57:21.0463739Z error[E0308]: mismatched types
2019-12-02T20:57:21.0464067Z --> src/tools/miri/src/helpers.rs:142:13
2019-12-02T20:57:21.0464484Z |
2019-12-02T20:57:21.0464717Z 142 | mir,
2019-12-02T20:57:21.0464943Z | ^^^
2019-12-02T20:57:21.0465179Z | |
2019-12-02T20:57:21.0465513Z | expected `&rustc::mir::Body<'_>`, found struct `rustc::mir::ReadOnlyBodyCache`
2019-12-02T20:57:21.0465772Z | help: consider borrowing here: `&mir`

@bors r- retry

[RalfJung]

@pietroalbini bors seems very confused with its tags? This is the second time recently that I did @bors r- and the tag remains "S-waiting-on-bors". GH also seems confused

added S-waiting-on-author S-waiting-on-bors and removed S-waiting-on-bors S-waiting-on-author

Not sure how it could even remove a tag that wasn't there... or add one that already was there...

[RalfJung]

Hm, doing it a second time seems to work? Or a fix landed in the mean time.

[RalfJung]

@bors r+

[bors]

📌 Commit 48689f00145ef50dedfbc7e9e676c1e48da59ed9 has been approved by RalfJung

[bors]

⌛ Testing commit 48689f00145ef50dedfbc7e9e676c1e48da59ed9 with merge 74cb058cb5c86e7d7729d020c3d01d6e461b01ea...

[RalfJung]

#66148 changed a Miri test output.

@bors r- retry

[RalfJung]

@bors r+

[bors]

📌 Commit 6b7f634 has been approved by RalfJung

[bors]

⌛ Testing commit 6b7f634 with merge 2f04472...

[bors]

☀️ Test successful - checks-azure
Approved by: RalfJung
Pushing 2f04472 to master...

[rust-highfive]

📣 Toolstate changed by #66925!

Tested on commit 2f04472.
Direct link to PR: #66925

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