Skip to content

Commit

Permalink
Auto merge of #3961 - RalfJung:event-release-clock-join, r=RalfJung
Browse files Browse the repository at this point in the history
epoll event adding: no need to join, there's no old clock here
  • Loading branch information
bors committed Oct 10, 2024
2 parents faf8c14 + eb76079 commit 66fda4a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/miri/src/shims/unix/linux/epoll.rs
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ fn check_and_update_one_event_interest<'tcx>(
let mut event_instance = EpollEventInstance::new(flags, epoll_event_interest.data);
// If we are tracking data races, remember the current clock so we can sync with it later.
ecx.release_clock(|clock| {
event_instance.clock.join(clock);
event_instance.clock.clone_from(clock);
});
// Triggers the notification by inserting it to the ready list.
ready_list.insert(epoll_key, event_instance);
Expand Down

0 comments on commit 66fda4a

Please sign in to comment.