Track location for atomic new/drop

tokio-rs · Apr 9, 2020 · c0cef54 · c0cef54
1 parent 93c96d5
commit c0cef54
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/rt/atomic.rs b/src/rt/atomic.rs
@@ -313,6 +313,9 @@ impl<T: Numeric> Atomic<T> {
                     state.stores[index].value = T::into_u64(self.0);
 
                     if !std::thread::panicking() {
+                        state
+                            .unsync_mut_locations
+                            .track(location!(), &execution.threads);
                         state.track_unsync_mut(&execution.threads);
                     }
                 });
@@ -358,6 +361,7 @@ impl State {
         };
 
         // All subsequent accesses must happen-after.
+        state.unsync_mut_locations.track(location, &threads);
         state.track_unsync_mut(threads);
 
         // Store the initial thread

diff --git a/src/rt/mod.rs b/src/rt/mod.rs
@@ -1,3 +1,7 @@
+#[macro_use]
+mod location;
+pub(crate) use self::location::Location;
+
 mod access;
 use self::access::Access;
 
@@ -10,10 +14,6 @@ pub(crate) use self::arc::Arc;
 mod atomic;
 pub(crate) use self::atomic::{fence, Atomic};
 
-#[macro_use]
-mod location;
-pub(crate) use self::location::Location;
-
 mod cell;
 pub(crate) use self::cell::Cell;