about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-10-10 05:54:58 +0000
committerbors <bors@rust-lang.org>2024-10-10 05:54:58 +0000
commit66fda4a8469464c428e750c5503953f52f14023e (patch)
tree44e9f22e78a47625104cd44cb2d0de3b5859e5e2
parentfaf8c14300ab609325aef85441725670ecc80a6a (diff)
parenteb76079911b3011e6c41bd69bc6536ad442c2cd2 (diff)
downloadrust-66fda4a8469464c428e750c5503953f52f14023e.tar.gz
rust-66fda4a8469464c428e750c5503953f52f14023e.zip
Auto merge of #3961 - RalfJung:event-release-clock-join, r=RalfJung
epoll event adding: no need to join, there's no old clock here
-rw-r--r--src/tools/miri/src/shims/unix/linux/epoll.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/miri/src/shims/unix/linux/epoll.rs b/src/tools/miri/src/shims/unix/linux/epoll.rs
index cc6b9e94f36..9ff7dbbdf84 100644
--- a/src/tools/miri/src/shims/unix/linux/epoll.rs
+++ b/src/tools/miri/src/shims/unix/linux/epoll.rs
@@ -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);