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 #69636

Merged
merged 2 commits into from
Mar 4, 2020
Merged

update miri #69636

merged 2 commits into from
Mar 4, 2020

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Mar 2, 2020

Let's make that toolstate green again. :D

This bumps serde in the lockfile, so r? @oli-obk

Fixes #69462

@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 2, 2020
@rust-highfive

This comment has been minimized.

@RalfJung

This comment has been minimized.

@Aaron1011
Copy link
Member

Aaron1011 commented Mar 2, 2020

@RalfJung: It looks like bootstrap is passing cargo-miri the path of xargo rather than xargo-check:

cargo.env("XARGO", builder.out.join("bin").join("xargo"));

This causes us to end up using xargo instead of xargo-check, resulting in codegen being run for panic_unwind.

Since cargo-miri now only invokes xargo-check (never xargo), we should probably rename this environment variable to XARGO_CHECK, and set it to the path of xargo-check in bootstrap.

@Aaron1011
Copy link
Member

@RalfJung: I've opened rust-lang/miri#1201. Once it's merged, you should be able to update src/bootstrap/test.rs to set XARGO_CHECK to the proper path.

@RalfJung
Copy link
Member Author

RalfJung commented Mar 2, 2020

@Aaron1011 great catch! That's most likely it. Thanks :)

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Mar 3, 2020

📌 Commit 3ab227f5f0e61938a2ebfb1f5d1d600785a5e04d has been approved by nikomatsakis

@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 3, 2020
@RalfJung
Copy link
Member Author

RalfJung commented Mar 3, 2020

@bors p=1

@bors
Copy link
Contributor

bors commented Mar 4, 2020

⌛ Testing commit 3ab227f5f0e61938a2ebfb1f5d1d600785a5e04d with merge d2b5382efc49474dee6795da63c8548f08982a46...

@rust-highfive

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Mar 4, 2020

💔 Test failed - checks-azure

@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 4, 2020
@RalfJung
Copy link
Member Author

RalfJung commented Mar 4, 2020

This is some kind of cargo feature issue:

2020-03-04T04:08:54.5742630Z 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:
2020-03-04T04:08:54.5743350Z 
2020-03-04T04:08:54.5743800Z the following dependencies are duplicated although they have the same features enabled:
2020-03-04T04:08:54.5744250Z the following dependencies have different features:
2020-03-04T04:08:54.5745550Z   proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)
2020-03-04T04:08:54.5746790Z     `rustfmt` additionally enabled features {"default"} at "/Users/runner/runners/2.165.0/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libproc_macro2-58288f9f59724080.rlib"
2020-03-04T04:08:54.5748230Z     `cargo` additionally enabled features {} at "/Users/runner/runners/2.165.0/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libproc_macro2-ad9101f6f50fce55.rlib"
2020-03-04T04:08:54.5749280Z   quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)
2020-03-04T04:08:54.5750460Z     `rustfmt` additionally enabled features {"default"} at "/Users/runner/runners/2.165.0/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libquote-d6c8c62334473aa9.rlib"
2020-03-04T04:08:54.5751860Z     `cargo` additionally enabled features {} at "/Users/runner/runners/2.165.0/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libquote-571fc6c253801dac.rlib"
2020-03-04T04:08:54.5752910Z   syn 0.15.35 (registry+https://github.com/rust-lang/crates.io-index)
2020-03-04T04:08:54.5754070Z     `rustfmt` additionally enabled features {"visit"} at "/Users/runner/runners/2.165.0/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libsyn-7a2f4a52e285b5df.rlib"
2020-03-04T04:08:54.5756090Z     `cargo` additionally enabled features {} at "/Users/runner/runners/2.165.0/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libsyn-61f655d09c570865.rlib"

These days, is there a better way to debug those than random guessing?

@RalfJung
Copy link
Member Author

RalfJung commented Mar 4, 2020

I think what's happening is that fewer things use the old syn now, and that changes the features it gets, and they are not consistently the same features everywhere... what a pain.

I will just downgrade serde_json in miri so that I don't have to touch the lockfile here, and hope that someone with a better clue for rustc dependencies resolves this eventually.^^

@RalfJung
Copy link
Member Author

RalfJung commented Mar 4, 2020

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 4, 2020

📌 Commit faf3a5e has been approved by nikomatsakis

@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 4, 2020
@bors
Copy link
Contributor

bors commented Mar 4, 2020

⌛ Testing commit faf3a5e with merge 2b0cfa5...

@bors
Copy link
Contributor

bors commented Mar 4, 2020

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing 2b0cfa5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 4, 2020
@bors bors merged commit 2b0cfa5 into rust-lang:master Mar 4, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #69636!

Tested on commit 2b0cfa5.
Direct link to PR: #69636

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 4, 2020
Tested on commit rust-lang/rust@2b0cfa5.
Direct link to PR: <rust-lang/rust#69636>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @eddyb @RalfJung).
@RalfJung RalfJung deleted the miri branch March 5, 2020 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

miri no longer builds after rust-lang/rust#69440
6 participants