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

Merged
merged 26 commits into from
Oct 5, 2024
Merged

Miri subtree update #131286

merged 26 commits into from
Oct 5, 2024

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Oct 5, 2024

r? @ghost

tiif and others added 26 commits October 1, 2024 03:00
Refactor ``return_read_bytes_and_count`` and ``return_written_byte_count_or_error``

Fixes rust-lang#3904

This PR
- separate the error logic from ``return_read_bytes_and_count`` and ``return_written_byte_count_or_error`` into a helper function ``set_last_error_and_return``.
Make returning io errors more uniform and convenient
This test demonstrates the need to synchronize the clock
of the thread waking up from an epoll_wait from the thread
that issued the epoll awake event.
A couple of instructions were left over from an earlier rebase
it would seem. They don't impact the logic but the ready_list type
is about to change in the next commit.

Rather than modify one of these lines in the commit that changes
ready_list, only to have these lines removed later on, remove them now.
They don't impact the tests results.
This adds a VClock to the epoll implementation's ready_list
and has this VClock synced from the thread that updates
an event in the ready_list and then has the VClocks of any
threads being made runnable again, out of the calls to
epoll_wait, synced from it.
A simplification that doesn't impact the epoll implementation's logic.

It is not necessary to clone the ready_list before reading its
`is_empty` state.

This avoids the clone step but more importantly avoids the invisible
drop step of the clone.
…li-obk

Add vector clock to epoll ready lists

Replaces rust-lang#3928

Fixes rust-lang#3911
Implement LLVM x86 gfni intrinsics
…lfJung

pthread mutex: better error in reentrant-locking-UB

Also test reentrant locking of PTHREAD_MUTEX_INITIALIZER
Prefer refutable slice patterns over len check + index op

Just something I noticed while reviewing other PRs

We do it for shim arguments almost everywhere, but when the size is not statically known, we didn't use the helpers as they rely on array ops. But we can avoid a len check followed by several index ops by just using a refutable slice pattern with `let else`.

The pattern is so common, it seems almost worth a dedicated macro
@rustbot
Copy link
Collaborator

rustbot commented Oct 5, 2024

The Miri subtree was changed

cc @rust-lang/miri

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 5, 2024
@RalfJung
Copy link
Member Author

RalfJung commented Oct 5, 2024

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Oct 5, 2024

📌 Commit 3b418b1 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 Oct 5, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 5, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#130428 (Stabilize `const_slice_split_at_mut` and `const_slice_first_last_chunk`)
 - rust-lang#131094 (std: replace `LazyBox` with `OnceBox`)
 - rust-lang#131256 (move f16/f128 const fn under f16/f128 feature gate)
 - rust-lang#131278 (remove outdated contribution direction)
 - rust-lang#131286 (Miri subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 72acacf into rust-lang:master Oct 5, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 5, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 5, 2024
Rollup merge of rust-lang#131286 - RalfJung:miri-sync, r=RalfJung

Miri subtree update

r? `@ghost`
@bors
Copy link
Contributor

bors commented Oct 5, 2024

⌛ Testing commit 3b418b1 with merge f559d61...

@RalfJung RalfJung deleted the miri-sync branch October 5, 2024 14:06
@workingjubilee
Copy link
Member

@bors r-
@bors retry

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 7, 2024
@workingjubilee
Copy link
Member

@bors r-

@bors bors 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 Oct 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants