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

Merged
merged 85 commits into from
Aug 18, 2024
Merged

Miri subtree update #129230

merged 85 commits into from
Aug 18, 2024

Conversation

RalfJung
Copy link
Member

r? @ghost

Vanille-N and others added 30 commits July 24, 2024 10:35
add and fix return-place-protection tests
remove some SSE/SSE2 intrinsics that are no longer used by stdarch

Fixes rust-lang/miri#3691
Don't panic on `miri_print_borrow_state()` under `-Zmiri-disable-stacked-borrows`.

Fixes rust-lang#3459

Instead, just print "attempted to print borrow state, but no borrow state is being tracked" directly to ~~stdout~~ stderr and return successfully. Alternately, the diagnostic machinery could be used to print a structured error/warning.

 (Does not address the comment about nothing being printed for `miri_print_borrow_state` with `alloc_id = 0`)
throw_unsup_format for alignment greater than 2^29

Fixes rust-lang#3687
josh: wait until the socket is ready
bors and others added 11 commits August 17, 2024 22:49
Testcase fix for epoll

Fixes rust-lang#3811

This PR:
- Fixed the error in ``epoll_ctl_del`` test
- Simplified the logic in ``epoll_ctl_mod`` test
- Added a new test to check if flag that we don't register won't trigger notification (double negation sounds a bit confusing here, feel free to suggest a better one ;) )
- Use assert_eq(0) for epoll_ctl test
Set EINVAL for epoll_wait maxevent value 0

Fixes rust-lang#3821
epoll test_socketpair_read: explicitly check real and Miri behavior
epoll: iterate through output buffer then fetch an event from ready list

Fixes rust-lang#3812
Add epollerr support

Fixes rust-lang#3816

For socketpair, if the peer fd is closed while having data in its read buffer, ``EPOLLER`` will be thrown.

This is still WIP because I am currently finding a way to check if peer fd still has something in its ``readbuf`` when it is closed and add the ``EPOLLER`` flag In ``get_epoll_ready_events``.
@rustbot
Copy link
Collaborator

rustbot commented Aug 18, 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 Aug 18, 2024
@RalfJung
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Aug 18, 2024

📌 Commit c74ffd8 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 Aug 18, 2024
@RalfJung
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Aug 18, 2024

📌 Commit 0708b28 has been approved by RalfJung

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Aug 18, 2024

⌛ Testing commit 0708b28 with merge f04f6ca...

@bors
Copy link
Contributor

bors commented Aug 18, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 18, 2024
@bors bors merged commit f04f6ca into rust-lang:master Aug 18, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 18, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f04f6ca): 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 (primary -3.2%, secondary 4.5%)

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)
4.5% [4.5%, 4.5%] 1
Improvements ✅
(primary)
-3.2% [-3.2%, -3.2%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -3.2% [-3.2%, -3.2%] 1

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: 749.337s -> 751.389s (0.27%)
Artifact size: 339.12 MiB -> 339.14 MiB (0.01%)

@RalfJung RalfJung deleted the miri-sync branch August 19, 2024 11:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

7 participants