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

Miri subtree update #136452

Merged
merged 54 commits into from
Feb 3, 2025
Merged

Miri subtree update #136452

merged 54 commits into from
Feb 3, 2025

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Feb 2, 2025

r? @ghost

Unblocks #122408 from the Miri side

oli-obk and others added 30 commits January 27, 2025 10:49
Added a helper to dedup target OS checks
Check fixed args number for variadic function
…-solaris

Set st_fstype of stat on Solaris and Illumos OSes
Use deref_pointer_as instead of deref_pointer
eduardosm and others added 14 commits February 1, 2025 16:26
Update rand and getrandom dependencies
files: make read/write take callback to store result
miri_get_backtrace: stop supporting the v0 protocol
This is necessary to unblock rust-lang#122408. The documentation for these is available [here](https://developer.apple.com/documentation/os/os_sync_wait_on_address?language=objc).

Because the futex wait operations (`os_sync_wait_on_address` et al.) return the number of remaining waiters after returning, this required some changes to the common futex infrastructure, which I've changed to take a callback instead of precalculating the return values.
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 2, 2025
@rustbot
Copy link
Collaborator

rustbot commented Feb 2, 2025

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
Copy link
Member Author

RalfJung commented Feb 2, 2025

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Feb 2, 2025

📌 Commit df9a3f2 has been approved by RalfJung

It is now in the queue for this repository.

@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 Feb 2, 2025
@bors
Copy link
Contributor

bors commented Feb 2, 2025

⌛ Testing commit df9a3f2 with merge af3c00d...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2025
Miri subtree update

r? `@ghost`

Unblocks rust-lang#122408 from the Miri side
@matthiaskrgr
Copy link
Member

@bors retry yield rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2025
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#136145 (Test validity of pattern types)
 - rust-lang#136339 (CompileTest: Add Directives to Ignore `arm-unknown-*` Targets)
 - rust-lang#136403 (Fix malformed error annotations in a UI test)
 - rust-lang#136414 (Shorten error message for callable with wrong return type)
 - rust-lang#136425 (Move `rustc_middle::infer::unify_key`)
 - rust-lang#136426 (Explain why we retroactively change a static initializer to have a different type)
 - rust-lang#136445 (Couple of cleanups to DiagCtxt and EarlyDiagCtxt)
 - rust-lang#136452 (Miri subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 2, 2025
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#136145 (Test validity of pattern types)
 - rust-lang#136339 (CompileTest: Add Directives to Ignore `arm-unknown-*` Targets)
 - rust-lang#136403 (Fix malformed error annotations in a UI test)
 - rust-lang#136414 (Shorten error message for callable with wrong return type)
 - rust-lang#136425 (Move `rustc_middle::infer::unify_key`)
 - rust-lang#136426 (Explain why we retroactively change a static initializer to have a different type)
 - rust-lang#136445 (Couple of cleanups to DiagCtxt and EarlyDiagCtxt)
 - rust-lang#136452 (Miri subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a8055f9 into rust-lang:master Feb 3, 2025
6 of 7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 3, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 3, 2025
Rollup merge of rust-lang#136452 - RalfJung:miri-sync, r=RalfJung

Miri subtree update

r? `@ghost`

Unblocks rust-lang#122408 from the Miri side
@RalfJung RalfJung deleted the miri-sync branch February 3, 2025 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.