Skip to content

miri subtree update#154582

Merged
rust-bors[bot] merged 49 commits intorust-lang:mainfrom
RalfJung:miri
Mar 31, 2026
Merged

miri subtree update#154582
rust-bors[bot] merged 49 commits intorust-lang:mainfrom
RalfJung:miri

Conversation

@RalfJung
Copy link
Copy Markdown
Member

devnexen and others added 30 commits March 21, 2026 11:30
The `_umtx_time` flags check in `read_umtx_time` used equality (`flags == abs_time`) instead of bitwise AND (`flags & abs_time != 0`) to detect `UMTX_ABSTIME`. While functionally equivalent for current valid inputs (0 or `UMTX_ABSTIME` alone), the equality check would silently treat an absolute timeout as relative if `flags` had `UMTX_ABSTIME` set alongside other bits. Additionally, unknown flags were silently accepted, whereas the FreeBSD kernel (`umtx_copyin_umtx_time()` in `kern_umtx.c`) rejects them with `EINVAL`.

The fix adds validation that rejects unsupported flags and switches to the standard bitwise AND pattern used elsewhere in the codebase (e.g. `O_APPEND`/`O_TRUNC` checks in `fs.rs`).
…threads

Unblock all threads with exceeded timeouts at once
This updates the rust-version file to 212b0d4.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 212b0d4
Filtered ref: e8897faa70ed30070b7637e854418aa7aa5ea0d9
Upstream diff: rust-lang/rust@fd0c901...212b0d4

This merge was created using https://github.com/rust-lang/josh-sync.
CONTRIBUTING: explain how to build miri against a locally built rustc
test miri_start with and without std
This updates the rust-version file to 8a70352.
./miri toolchain: support overwriting the to-be-installed commit
This updates the rust-version file to 1174f78.
test with cargo's new build-dir layout
rust-bors bot pushed a commit that referenced this pull request Mar 30, 2026
…uwer

Rollup of 5 pull requests

Successful merges:

 - #154582 (miri subtree update)
 - #154270 (Create `Ty` type alias in `rustc_type_ir`)
 - #154574 (delete several `ui/consts` tests)
 - #154577 (Update `mir-opt` 64-bit panic-abort tests for `Alignment` rename)
 - #154579 (remove debug requirement from hooks)
@tgross35
Copy link
Copy Markdown
Contributor

Something seems to be taking an extra long time in #154588. Maybe it's this?

@bors try jobs=dist-x86_64-linux

@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Mar 31, 2026
miri subtree update


try-job: dist-x86_64-linux
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 31, 2026

rust-bors bot pushed a commit that referenced this pull request Mar 31, 2026
@tgross35
Copy link
Copy Markdown
Contributor

Letting the try job finish,
@bors yield

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 31, 2026

Auto build was cancelled. Cancelled workflows:

The next pull request likely to be tested is #154582.

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 31, 2026

rust-bors bot pushed a commit that referenced this pull request Mar 31, 2026
@tgross35
Copy link
Copy Markdown
Contributor

🤔 isn't that how yield should work?

@bors r-

@rust-bors rust-bors bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 31, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 31, 2026

This pull request was unapproved.

This PR was contained in a rollup (#154588), which was unapproved.

Auto build was cancelled due to unapproval. Cancelled workflows:

@tgross35
Copy link
Copy Markdown
Contributor

@bors r=RalfJung

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 31, 2026

📌 Commit 79d00db has been approved by RalfJung

It is now in the queue for this repository.

@rust-bors rust-bors bot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 31, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Mar 31, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 31, 2026

☀️ Try build successful (CI)
Build commit: 58ce3db (58ce3db80ec878f75ba92c5d586ae5f680231345, parent: 08cd08fbef8c6663b052d8d9e4930d5696cbb8a7)

tgross35 added a commit to tgross35/rust that referenced this pull request Mar 31, 2026
rust-bors bot pushed a commit that referenced this pull request Mar 31, 2026
Rollup of 9 pull requests

Successful merges:

 - #154582 (miri subtree update)
 - #142659 (compiler-builtins: Clean up features)
 - #153574 (Avoid ICE when param-env normalization leaves unresolved inference variables)
 - #153648 (Fix EII function aliases eliminated by LTO)
 - #153790 (Fix regression when dealing with generics/values with unresolved inference)
 - #154551 (Skip suggestions pointing to macro def for assert_eq)
 - #154574 (delete several `ui/consts` tests)
 - #154577 (Update `mir-opt` 64-bit panic-abort tests for `Alignment` rename)
 - #154579 (remove debug requirement from hooks)
@rust-bors rust-bors bot merged commit 8e46490 into rust-lang:main Mar 31, 2026
12 of 13 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 31, 2026
rust-timer added a commit that referenced this pull request Mar 31, 2026
Rollup merge of #154582 - RalfJung:miri, r=RalfJung

miri subtree update

Subtree update of `miri` to rust-lang/miri@7662148.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost
github-actions bot pushed a commit to rust-lang/compiler-builtins that referenced this pull request Mar 31, 2026
Rollup of 9 pull requests

Successful merges:

 - rust-lang/rust#154582 (miri subtree update)
 - rust-lang/rust#142659 (compiler-builtins: Clean up features)
 - rust-lang/rust#153574 (Avoid ICE when param-env normalization leaves unresolved inference variables)
 - rust-lang/rust#153648 (Fix EII function aliases eliminated by LTO)
 - rust-lang/rust#153790 (Fix regression when dealing with generics/values with unresolved inference)
 - rust-lang/rust#154551 (Skip suggestions pointing to macro def for assert_eq)
 - rust-lang/rust#154574 (delete several `ui/consts` tests)
 - rust-lang/rust#154577 (Update `mir-opt` 64-bit panic-abort tests for `Alignment` rename)
 - rust-lang/rust#154579 (remove debug requirement from hooks)
chenyukang pushed a commit to chenyukang/rust that referenced this pull request Apr 1, 2026
Rollup of 9 pull requests

Successful merges:

 - rust-lang#154582 (miri subtree update)
 - rust-lang#142659 (compiler-builtins: Clean up features)
 - rust-lang#153574 (Avoid ICE when param-env normalization leaves unresolved inference variables)
 - rust-lang#153648 (Fix EII function aliases eliminated by LTO)
 - rust-lang#153790 (Fix regression when dealing with generics/values with unresolved inference)
 - rust-lang#154551 (Skip suggestions pointing to macro def for assert_eq)
 - rust-lang#154574 (delete several `ui/consts` tests)
 - rust-lang#154577 (Update `mir-opt` 64-bit panic-abort tests for `Alignment` rename)
 - rust-lang#154579 (remove debug requirement from hooks)
RalfJung pushed a commit to RalfJung/miri that referenced this pull request Apr 1, 2026
Rollup of 9 pull requests

Successful merges:

 - rust-lang/rust#154582 (miri subtree update)
 - rust-lang/rust#142659 (compiler-builtins: Clean up features)
 - rust-lang/rust#153574 (Avoid ICE when param-env normalization leaves unresolved inference variables)
 - rust-lang/rust#153648 (Fix EII function aliases eliminated by LTO)
 - rust-lang/rust#153790 (Fix regression when dealing with generics/values with unresolved inference)
 - rust-lang/rust#154551 (Skip suggestions pointing to macro def for assert_eq)
 - rust-lang/rust#154574 (delete several `ui/consts` tests)
 - rust-lang/rust#154577 (Update `mir-opt` 64-bit panic-abort tests for `Alignment` rename)
 - rust-lang/rust#154579 (remove debug requirement from hooks)
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.

8 participants