Revert "Fix fence on non-x86 arch and miri (#16)"

This reverts commit 54df36a.

Author: taiki-e

src/bounded.rs

@@ -129,7 +129,8 @@ impl<T> Bounded<T> {
                     }
                 }
             } else if stamp.wrapping_add(self.one_lap) == tail + 1 {
-                let head = crate::full_fence_for_load(|| self.head.load(Ordering::Relaxed));
+                crate::full_fence();
+                let head = self.head.load(Ordering::Relaxed);
 
                 // If the head lags one lap behind the tail as well...
                 if head.wrapping_add(self.one_lap) == tail {
@@ -190,7 +191,8 @@ impl<T> Bounded<T> {
                     }
                 }
             } else if stamp == head {
-                let tail = crate::full_fence_for_load(|| self.tail.load(Ordering::Relaxed));
+                crate::full_fence();
+                let tail = self.tail.load(Ordering::Relaxed);
 
                 // If the tail equals the head, that means the queue is empty.
                 if (tail & !self.mark_bit) == head {

src/lib.rs

@@ -445,11 +445,8 @@ impl<T> fmt::Display for PushError<T> {
 
 /// Equivalent to `atomic::fence(Ordering::SeqCst)`, but in some cases faster.
 #[inline]
-fn full_fence_for_load<T>(load_op: impl FnOnce() -> T) -> T {
-    if cfg!(all(
-        any(target_arch = "x86", target_arch = "x86_64"),
-        not(miri)
-    )) {
+fn full_fence() {
+    if cfg!(any(target_arch = "x86", target_arch = "x86_64")) {
         // HACK(stjepang): On x86 architectures there are two different ways of executing
         // a `SeqCst` fence.
         //
@@ -464,11 +461,7 @@ fn full_fence_for_load<T>(load_op: impl FnOnce() -> T) -> T {
         // x86 platforms is going to optimize this away.
         let a = AtomicUsize::new(0);
         let _ = a.compare_exchange(0, 1, Ordering::SeqCst, Ordering::SeqCst);
-        // On x86, `lock cmpxchg; mov` is fine. See also https://www.cl.cam.ac.uk/~pes20/cpp/cpp0xmappings.html.
-        load_op()
     } else {
-        let res = load_op();
         atomic::fence(Ordering::SeqCst);
-        res
     }
 }

src/unbounded.rs

@@ -237,7 +237,8 @@ impl<T> Unbounded<T> {
             let mut new_head = head + (1 << SHIFT);
 
             if new_head & MARK_BIT == 0 {
-                let tail = crate::full_fence_for_load(|| self.tail.index.load(Ordering::Relaxed));
+                crate::full_fence();
+                let tail = self.tail.index.load(Ordering::Relaxed);
 
                 // If the tail equals the head, that means the queue is empty.
                 if head >> SHIFT == tail >> SHIFT {