about summary refs log tree commit diff
path: root/src/libstd/thread
diff options
context:
space:
mode:
authortyler <tyler@brainiumstudios.com>2019-01-15 20:09:06 -0800
committertyler <tyler@brainiumstudios.com>2019-01-15 20:09:06 -0800
commit1a51bb8174e97251a37fcd83ff8750b7773e762a (patch)
tree6be072ace8dc30fa353030cdce39cf768aa4c896 /src/libstd/thread
parente2f221c75932de7a29845c8d6f1f73536ad00c41 (diff)
downloadrust-1a51bb8174e97251a37fcd83ff8750b7773e762a.tar.gz
rust-1a51bb8174e97251a37fcd83ff8750b7773e762a.zip
OSX: fix #57534 registering thread dtors while running thread dtors
Diffstat (limited to 'src/libstd/thread')
-rw-r--r--src/libstd/thread/local.rs8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs
index efd231e0176..5d2eb5f8e73 100644
--- a/src/libstd/thread/local.rs
+++ b/src/libstd/thread/local.rs
@@ -69,9 +69,6 @@ use mem;
 ///    destroyed, but not all platforms have this guard. Those platforms that do
 ///    not guard typically have a synthetic limit after which point no more
 ///    destructors are run.
-/// 3. On macOS, initializing TLS during destruction of other TLS slots can
-///    sometimes cancel *all* destructors for the current thread, whether or not
-///    the slots have already had their destructors run or not.
 ///
 /// [`with`]: ../../std/thread/struct.LocalKey.html#method.with
 /// [`thread_local!`]: ../../std/macro.thread_local.html
@@ -604,11 +601,8 @@ mod tests {
     }
 
     // Note that this test will deadlock if TLS destructors aren't run (this
-    // requires the destructor to be run to pass the test). macOS has a known bug
-    // where dtors-in-dtors may cancel other destructors, so we just ignore this
-    // test on macOS.
+    // requires the destructor to be run to pass the test).
     #[test]
-    #[cfg_attr(target_os = "macos", ignore)]
     fn dtors_in_dtors_in_dtors() {
         struct S1(Sender<()>);
         thread_local!(static K1: UnsafeCell<Option<S1>> = UnsafeCell::new(None));