From fd1b0305a3bbf53929cc67f52dae166dcd0cc075 Mon Sep 17 00:00:00 2001
From: William Throwe <wtt6@cornell.edu>
Date: Wed, 15 Jul 2015 08:09:04 -0400
Subject: [PATCH 1/2] Make AtomicPtr Send

This appears to have just been an oversight, and it is annoying to not
be able to use an Arc<AtomicPtr>.
---
 src/libcore/atomic.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libcore/atomic.rs b/src/libcore/atomic.rs
index a77df09664313..e8d5d83be0faa 100644
--- a/src/libcore/atomic.rs
+++ b/src/libcore/atomic.rs
@@ -72,7 +72,7 @@
 
 use self::Ordering::*;
 
-use marker::Sync;
+use marker::{Send, Sync};
 
 use intrinsics;
 use cell::UnsafeCell;
@@ -133,6 +133,7 @@ impl<T> Default for AtomicPtr<T> {
     }
 }
 
+unsafe impl<T> Send for AtomicPtr<T> {}
 unsafe impl<T> Sync for AtomicPtr<T> {}
 
 /// Atomic memory orderings

From 3a4904f06f5d39bfa50d1cd55e6ad6229c34045d Mon Sep 17 00:00:00 2001
From: William Throwe <wtt6@cornell.edu>
Date: Wed, 15 Jul 2015 08:11:35 -0400
Subject: [PATCH 2/2] Add regression test for atomics being Send + Sync

Thanks to Tamir Duberstein for the implementation suggestion.
---
 src/test/run-pass/sync-send-atomics.rs | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 src/test/run-pass/sync-send-atomics.rs

diff --git a/src/test/run-pass/sync-send-atomics.rs b/src/test/run-pass/sync-send-atomics.rs
new file mode 100644
index 0000000000000..1ead6268d0c2a
--- /dev/null
+++ b/src/test/run-pass/sync-send-atomics.rs
@@ -0,0 +1,22 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// pretty-expanded FIXME #23616
+
+use std::sync::atomic::*;
+
+trait SendSync: Send + Sync {}
+
+impl SendSync for AtomicBool {}
+impl SendSync for AtomicIsize {}
+impl SendSync for AtomicUsize {}
+impl<T> SendSync for AtomicPtr<T> {}
+
+fn main() {}