From eb76079911b3011e6c41bd69bc6536ad442c2cd2 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 10 Oct 2024 07:53:16 +0200 Subject: epoll event adding: no need to join, there's no old clock here --- src/tools/miri/src/shims/unix/linux/epoll.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools') 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); -- cgit 1.4.1-3-g733a5