Miri subtree update #117011

RalfJung · 2023-10-21T06:42:04Z

ensure RET assignments do not get propagated on unwinding Mostly this adds a test for rust-lang/unsafe-code-guidelines#468, and then also some other related tests I thought of while writing that test.

Implement `llvm.x86.aesni.*` intrinsics

avoid confusing loop in catch_panic test Fixes rust-lang/miri#3115

Rustup

Automatic sync from rustc

…Jung Implement `llvm.x86.sse41.*` intrinsics

triagebot: re-enable merge commit check rust-lang/triagebot#1720 has landed. Also make the keyword "Rustup", which is what we've been already using for such PRs for a while. Just adjust the bot to also put that in the title.

Automatic Rustup

Now it masks out the correct bit and adds some explanatory comments. Also extends the tests.

Fix rounding mode check in SSE4.1 round functions Now it masks out the correct bit and adds some explanatory comments. Also extends the tests.

--- updated-dependencies: - dependency-name: rustix dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>

….19, r=RalfJung Bump rustix from 0.38.17 to 0.38.19 [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rustix&package-manager=cargo&previous-version=0.38.17&new-version=0.38.19)](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>

Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.17 to 0.38.19. - [Release notes](https://github.com/bytecodealliance/rustix/releases) - [Commits](bytecodealliance/rustix@v0.38.17...v0.38.19) --- updated-dependencies: - dependency-name: rustix dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>

…rustix-0.38.19, r=RalfJung Bump rustix from 0.38.17 to 0.38.19 in /cargo-miri Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.17 to 0.38.19. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/bytecodealliance/rustix/commit/3a53dfe16cddc39fd20ecfb07c7d78880cb3880a"><code>3a53dfe</code></a> chore: Release rustix version 0.38.19</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/55cbe8839c8a78896b7f1e5310b3bcf20f8b0ac5"><code>55cbe88</code></a> Fixes for <code>Dir</code> on macOS, FreeBSD, and WASI.</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/31fd98ca723b93cc6101a3e29843ea5cf094e159"><code>31fd98c</code></a> Merge pull request from GHSA-c827-hfw6-qwvm</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/4bb2f4bbcd3a482112aadb4a226e0fce21fe5d8c"><code>4bb2f4b</code></a> Add <code>mlockall</code> and <code>munlockall</code> (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/872">#872</a>)</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/d012bcf8967ba518bfa5a05d2c166139f4d4a9a0"><code>d012bcf</code></a> Fixes needed by io_uring. (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/873">#873</a>)</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/5e5c0460cc576af9798f542a96ef6abb780b1ba1"><code>5e5c046</code></a> Add a test for <code>get_socket_nosigpipe</code>. (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/874">#874</a>)</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/1a9d12963d49fda5347b622ee814e2e017fe7444"><code>1a9d129</code></a> chore: Release rustix version 0.38.18</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/112c268cd79438caae20a0bd4560ada5a1565450"><code>112c268</code></a> io-uring API updates. (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/871">#871</a>)</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/0c227041a7faced80a532966dc085961fb46073a"><code>0c22704</code></a> Provide {get,set}_socket_nosigpipe on NetBSD and DragonFly BSD (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/870">#870</a>)</li> <li>See full diff in <a href="https://github.com/bytecodealliance/rustix/compare/v0.38.17...v0.38.19">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rustix&package-manager=cargo&previous-version=0.38.17&new-version=0.38.19)](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>

Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.17 to 0.38.19. - [Release notes](https://github.com/bytecodealliance/rustix/releases) - [Commits](bytecodealliance/rustix@v0.38.17...v0.38.19) --- updated-dependencies: - dependency-name: rustix dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>

Rustup

…ting the base address

intptrcast: remove information about dead allocations The discussion in rust-lang/miri#3103 convinced me we don't have to keep `int_to_ptr_map` around for dead allocations. But we should not make that depend on the GC, we can just tie it to when the allocation gets freed. That means everything still behaves deterministically, if anything weird happens (but it shouldn't). r? `@saethlin` Only the first and last commit contain logic changes, the 2nd commit just moves code around a bit.

Rustup Also fix josh build (they have a `deny(warnings)` that's causing issues).

Automatic Rustup

rustbot · 2023-10-21T06:42:09Z

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.

The Miri subtree was changed

cc @rust-lang/miri

RalfJung · 2023-10-21T06:43:08Z

@bors r+ p=1

bors · 2023-10-21T06:43:10Z

📌 Commit 49e8acb has been approved by RalfJung

It is now in the queue for this repository.

bors · 2023-10-21T07:14:40Z

⌛ Testing commit 49e8acb with merge 45a45c6...

bors · 2023-10-21T09:07:55Z

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 45a45c6 to master...

rust-timer · 2023-10-21T10:28:55Z

Finished benchmarking commit (45a45c6): 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)	-	-	0
Regressions ❌ (secondary)	1.7%	[1.7%, 1.7%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

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: 631.871s -> 630.052s (-0.29%)
Artifact size: 304.05 MiB -> 304.01 MiB (-0.01%)

RalfJung and others added 30 commits October 9, 2023 08:59

add test for self-assignment on call through reference

fc4aa4e

add test to ensure RET assignments do not get propagated on unwinding

e6aa233

return_pointer_aliasing2 should also run with SB

e6637cb

Auto merge of rust-lang#3114 - RalfJung:fn-call-tests, r=RalfJung

ec1db97

ensure RET assignments do not get propagated on unwinding Mostly this adds a test for rust-lang/unsafe-code-guidelines#468, and then also some other related tests I thought of while writing that test.

Implement llvm.x86.aesni.* intrinsics

700bc97

Auto merge of rust-lang#3101 - eduardosm:x86-aes-intrinsics, r=RalfJung

aaba0a5

Implement `llvm.x86.aesni.*` intrinsics

avoid confusing loop in catch_panic test

d3b761a

Auto merge of rust-lang#3117 - RalfJung:catch-panic-loop, r=RalfJung

2b0c8a7

avoid confusing loop in catch_panic test Fixes rust-lang/miri#3115

Preparing for merge from rustc

e3c2b66

Merge from rustc

461d19b

fmt

35de5bb

Auto merge of rust-lang#3120 - RalfJung:rustup, r=RalfJung

eba1f5b

Rustup

Preparing for merge from rustc

c4b45c5

Merge from rustc

2383a00

Auto merge of rust-lang#3121 - rust-lang:rustup-2023-10-14, r=saethlin

99d6cd4

Automatic sync from rustc

Implement llvm.x86.sse41.* intrinsics

949bb64

Auto merge of rust-lang#3118 - eduardosm:intrinsics-x86-sse41, r=Ralf…

b800211

…Jung Implement `llvm.x86.sse41.*` intrinsics

triagebot: re-enable merge commit check

1c928f9

Auto merge of rust-lang#3123 - RalfJung:triagebot, r=RalfJung

c1dbc19

triagebot: re-enable merge commit check rust-lang/triagebot#1720 has landed. Also make the keyword "Rustup", which is what we've been already using for such PRs for a while. Just adjust the bot to also put that in the title.

Preparing for merge from rustc

8fa1b6a

Merge from rustc

2ca415c

fmt

d6f52bf

Auto merge of rust-lang#3126 - rust-lang:rustup-2023-10-17, r=RalfJung

f408492

Automatic Rustup

Fix rounding mode check in SSE4.1 round functions

a8aa303

Now it masks out the correct bit and adds some explanatory comments. Also extends the tests.

Auto merge of rust-lang#3124 - eduardosm:fix-sse41-round, r=RalfJung

2366a90

Fix rounding mode check in SSE4.1 round functions Now it masks out the correct bit and adds some explanatory comments. Also extends the tests.

Bump rustix from 0.38.17 to 0.38.19

0036d40

--- updated-dependencies: - dependency-name: rustix dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>

bors and others added 14 commits October 19, 2023 19:28

Auto merge of rust-lang#3130 - RalfJung:rustup, r=RalfJung

5d62040

Rustup

intptrcast: only find strictly in-bounds pointers when we are not hit…

f386329

…ting the base address

switch intptrcast to helper trait pattern like everything else

55ce55d

remove allocations from int_to_ptr_map and exposed when they get freed

b325f31

clarify comment

ecaf828

Preparing for merge from rustc

464135d

Merge from rustc

20fe485

ignore deny lints in josh

b824bb1

Auto merge of rust-lang#3131 - RalfJung:rustup, r=RalfJung

c51ce16

Rustup Also fix josh build (they have a `deny(warnings)` that's causing issues).

Preparing for merge from rustc

ee54d83

Merge from rustc

8044a59

Auto merge of rust-lang#3132 - rust-lang:rustup-2023-10-21, r=RalfJung

49056df

Automatic Rustup

update lockfile

49e8acb

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 21, 2023

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 Oct 21, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 21, 2023

bors merged commit 45a45c6 into rust-lang:master Oct 21, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 21, 2023

RalfJung deleted the miri branch October 22, 2023 08:14

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Miri subtree update #117011

Miri subtree update #117011

RalfJung commented Oct 21, 2023

rustbot commented Oct 21, 2023

RalfJung commented Oct 21, 2023

bors commented Oct 21, 2023

bors commented Oct 21, 2023

bors commented Oct 21, 2023

rust-timer commented Oct 21, 2023

Miri subtree update #117011

Miri subtree update #117011

Conversation

RalfJung commented Oct 21, 2023

rustbot commented Oct 21, 2023

RalfJung commented Oct 21, 2023

bors commented Oct 21, 2023

bors commented Oct 21, 2023

bors commented Oct 21, 2023

rust-timer commented Oct 21, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size