Miri subtree update #122246

RalfJung · 2024-03-09T17:56:59Z

@WaffleLapkin when this lands, setting MIRI_TEMP should not be needed any more on the dev desktops.

log when we change the active thread, and fix logging for concurrency Also avoid relying on the incorrect scope exit logging produced by tracing (Cc rust-lang/miri#2266)

Fix .\miri fmt on Windows This allows .\miri fmt to work on Windows. Closes rust-lang#3317. To reiterate, the problem with using `miri fmt` on Windows is that the CLI arguments to rustfmt are too long. Currently over 65,000 characters are used in the call to rustfmt, [which is incompatible with Windows](https://devblogs.microsoft.com/oldnewthing/20031210-00/?p=41553) as it is limited to (2^15 - 1) for all arguments plus all env vars. Two things are done do get around this limit: 1. Call out to cargo-fmt for the crates that exist. 2. Batch rustfmt calls by length Another alternative would be to just use rustfmt for everything and don't use cargo-fmt for the crates. I don't know how much you guys may care about `miri fmt` time to run. I don't know the diff as it did not work before on my computer. [I have another branch that solves this, but in a less permanent way](RossSmyth/miri/tree/windows-fmt). That was my initial attempt, and I learned that even with cargo-fmt and relative paths, the rustfmt call still has 27k characters. This is closer to the limit than I expected, so it would not be a permanent solution. So I went back to absolute paths & batching.

remove some flags that haven't had an effect in a while `@rust-lang/miri` any objections to this?

…armful, r=RalfJung disable diagnostic deduplication `@oli-obk` is there a better way to do this? Ideally we'd only set this when interpretation starts but the value in the compiler session seems to be immutable. I assume people will do `cargo check` before `cargo miri` so hopefully this won't lead to too much confusion. Fixes rust-lang/miri#3350

we properly rebuild the sysroot now when MIRI_LIB_SRC contents change Thanks to RalfJung/rustc-build-sysroot#16

Use cargo miri clean in build-all-targets.sh

Conjob → Cronjob Same as rust-lang/miri-test-libstd#44

reorder rustc crate imports a bit

give macOS even more time to sleep

Bumps [mio](https://github.com/tokio-rs/mio) from 0.8.10 to 0.8.11. - [Release notes](https://github.com/tokio-rs/mio/releases) - [Changelog](https://github.com/tokio-rs/mio/blob/master/CHANGELOG.md) - [Commits](tokio-rs/mio@v0.8.10...v0.8.11) --- updated-dependencies: - dependency-name: mio dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>

…encies/mio-0.8.11, r=RalfJung Bump mio from 0.8.10 to 0.8.11 in /test_dependencies Bumps [mio](https://github.com/tokio-rs/mio) from 0.8.10 to 0.8.11. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/tokio-rs/mio/blob/master/CHANGELOG.md">mio's changelog</a>.</em></p> <blockquote> <h1>0.8.11</h1> <ul> <li>Fix receiving IOCP events after deregistering a Windows named pipe (<a href="https://redirect.github.com/tokio-rs/mio/pull/1760">tokio-rs/mio#1760</a>, backport pr: <a href="https://redirect.github.com/tokio-rs/mio/pull/1761">tokio-rs/mio#1761</a>).</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/tokio-rs/mio/commit/0328bdef900b6396b8d00d33c825cd8af748553d"><code>0328bde</code></a> Release v0.8.11</li> <li><a href="https://github.com/tokio-rs/mio/commit/708449851283b57eb6f514c8f289b66e982720b3"><code>7084498</code></a> Fix warnings</li> <li><a href="https://github.com/tokio-rs/mio/commit/90d4fe00df870acd3d38f3dc4face9aacab8fbb9"><code>90d4fe0</code></a> named-pipes: fix receiving IOCP events after deregister</li> <li><a href="https://github.com/tokio-rs/mio/commit/c710a307f8627c4d63ac1003252aa45175e08399"><code>c710a30</code></a> Add v0.8.x to the CI</li> <li><a href="https://github.com/tokio-rs/mio/commit/c29e21c244b2b835e8b3e015b92c708c33c7d70a"><code>c29e21c</code></a> Release v0.8.10</li> <li>See full diff in <a href="https://github.com/tokio-rs/mio/compare/v0.8.10...v0.8.11">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=mio&package-manager=cargo&previous-version=0.8.10&new-version=0.8.11)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/rust-lang/miri/network/alerts). </details>

remove the ability to disable ABI checking This got deprecated in rust-lang/miri#3071, about half a year ago. `@rust-lang/miri` I think it's fine to remove this now.

compiletest: create fresh tempdir for tests to use Fixes rust-lang/miri#3364

rename tests/compiletest → tests/ui This hasn't been `compiletest` in a while.

Automatic Rustup

rustbot · 2024-03-09T17:57:02Z

The Miri subtree was changed

cc @rust-lang/miri

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

RalfJung · 2024-03-09T18:11:18Z

@bors r+ p=1

bors · 2024-03-09T18:11:20Z

📌 Commit 9a308d4 has been approved by RalfJung

It is now in the queue for this repository.

Miri subtree update r? `@ghost` `@WaffleLapkin` when this lands, setting `MIRI_TEMP` should not be needed any more on the dev desktops.

bors · 2024-03-09T23:20:57Z

⌛ Testing commit 9a308d4 with merge 96a16df...

rust-log-analyzer · 2024-03-10T00:02:28Z

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


test result: ok. 10 passed; 0 failed; 7 ignored; 0 measured; 0 filtered out; finished in 206.70ms

   Doc-tests rustc_codegen_llvm
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
##[group]Clock drift check
  local time: Sun Mar 10 00:02:00 UTC 2024
  local time: Sun Mar 10 00:02:00 UTC 2024
Session terminated, killing shell... ...killed.
##[error]The operation was canceled.
Cleaning up orphan processes

bors · 2024-03-10T00:02:47Z

💔 Test failed - checks-actions

RalfJung · 2024-03-10T08:30:53Z

@bors retry The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.

bors · 2024-03-10T09:40:42Z

⌛ Testing commit 9a308d4 with merge 3521a2f...

bors · 2024-03-10T11:57:16Z

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 3521a2f to master...

rust-timer · 2024-03-10T14:01:42Z

Finished benchmarking commit (3521a2f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	3.7%	[1.8%, 8.6%]	11
Regressions ❌ (secondary)	2.9%	[0.8%, 6.2%]	77
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.7%	[1.8%, 8.6%]	11

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 648.949s -> 647.634s (-0.20%)
Artifact size: 310.01 MiB -> 310.02 MiB (0.00%)

Miri subtree update r? `@ghost` `@WaffleLapkin` when this lands, setting `MIRI_TEMP` should not be needed any more on the dev desktops.

RalfJung and others added 30 commits March 2, 2024 16:41

remove some flags that haven't had an effect in a while

81fed2f

remove the ability to disable ABI checking

c1a5906

Fix .\miri fmt on Windows

32643dc

fix MIRI_LOG=info not setting the level for miri itself

cfc10f0

log when we change the active thread

3041c78

do not rely on tracing's scope exit logging, it is wrong

983c2c5

Auto merge of rust-lang#3348 - RalfJung:miri-thread-logging, r=RalfJung

f51f923

log when we change the active thread, and fix logging for concurrency Also avoid relying on the incorrect scope exit logging produced by tracing (Cc rust-lang/miri#2266)

nits and typos

83e2e2d

disable diagnostic deduplication

fbafd36

implement manual deduplication for isolation-error=warn-nobacktrace

d5f31bd

linux-futex test: add comment

f70feaf

Auto merge of rust-lang#3339 - RalfJung:remove-old-flags, r=saethlin

ede97c6

remove some flags that haven't had an effect in a while `@rust-lang/miri` any objections to this?

we properly rebuild the cache now when MIRI_LIB_SRC contents change

974446e

Auto merge of rust-lang#3354 - RalfJung:MIRI_LIB_SRC-change, r=RalfJung

8851f3c

we properly rebuild the sysroot now when MIRI_LIB_SRC contents change Thanks to RalfJung/rustc-build-sysroot#16

Use cargo miri clean in build-all-targets.sh

75f6694

Auto merge of rust-lang#3355 - saethlin:cargo-miri-clean, r=RalfJung

5b05be1

Use cargo miri clean in build-all-targets.sh

Conjob → Cronjob

a477cf4

reorder rustc crate imports a bit

45d955e

Auto merge of rust-lang#3356 - RalfJung:typo, r=RalfJung

4fdb215

Conjob → Cronjob Same as rust-lang/miri-test-libstd#44

Auto merge of rust-lang#3357 - RalfJung:imports, r=RalfJung

790287a

reorder rustc crate imports a bit

give macOS even more time to sleep

2b40181

Auto merge of rust-lang#3358 - RalfJung:zzz, r=RalfJung

65ec028

give macOS even more time to sleep

Auto merge of rust-lang#3340 - RalfJung:no-disable-abi-check, r=oli-obk

033c1e0

remove the ability to disable ABI checking This got deprecated in rust-lang/miri#3071, about half a year ago. `@rust-lang/miri` I think it's fine to remove this now.

Preparing for merge from rustc

4b955f1

Merge from rustc

a5a8437

make remaining FloatTy matches exhaustive

3c2318c

bors and others added 6 commits March 9, 2024 07:11

Auto merge of rust-lang#3366 - RalfJung:tempdir, r=oli-obk

cabac98

compiletest: create fresh tempdir for tests to use Fixes rust-lang/miri#3364

rename tests/compiletest → tests/ui

00be352

Auto merge of rust-lang#3368 - RalfJung:ui, r=RalfJung

b0fad9a

rename tests/compiletest → tests/ui This hasn't been `compiletest` in a while.

fix clippy lints

862f918

Auto merge of rust-lang#3367 - rust-lang:rustup-2024-03-09, r=RalfJung

0ebb78f

Automatic Rustup

update lockfile

9a308d4

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 9, 2024

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 9, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 9, 2024

Auto merge of rust-lang#122246 - RalfJung:miri, r=RalfJung

96a16df

Miri subtree update r? `@ghost` `@WaffleLapkin` when this lands, setting `MIRI_TEMP` should not be needed any more on the dev desktops.

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 10, 2024

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 10, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 10, 2024

bors merged commit 3521a2f into rust-lang:master Mar 10, 2024
12 checks passed

rustbot added this to the 1.78.0 milestone Mar 10, 2024

bors mentioned this pull request Mar 10, 2024

Move alignment checks to codegen #117473

Draft

RalfJung deleted the miri branch March 10, 2024 14:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Miri subtree update #122246

Miri subtree update #122246

RalfJung commented Mar 9, 2024

rustbot commented Mar 9, 2024

RalfJung commented Mar 9, 2024

bors commented Mar 9, 2024

bors commented Mar 9, 2024

rust-log-analyzer commented Mar 10, 2024

bors commented Mar 10, 2024

RalfJung commented Mar 10, 2024

bors commented Mar 10, 2024

bors commented Mar 10, 2024

rust-timer commented Mar 10, 2024

Miri subtree update #122246

Miri subtree update #122246

Conversation

RalfJung commented Mar 9, 2024

rustbot commented Mar 9, 2024

RalfJung commented Mar 9, 2024

bors commented Mar 9, 2024

bors commented Mar 9, 2024

rust-log-analyzer commented Mar 10, 2024

bors commented Mar 10, 2024

RalfJung commented Mar 10, 2024

bors commented Mar 10, 2024

bors commented Mar 10, 2024

rust-timer commented Mar 10, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size