]> git.lizzy.rs Git - rust.git/commitdiff
std panicking: ALWAYS_ABORT: use Relaxed memory ordering
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 6 May 2021 14:11:08 +0000 (15:11 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 7 May 2021 10:17:44 +0000 (11:17 +0100)
As per
  https://github.com/rust-lang/rust/pull/81858#discussion_r626507810

Suggested-by: Mara Bos <m-ou.se@m-ou.se>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
library/std/src/panicking.rs

index 62476581f990f0739ebe9fe9795a1fd60408dad0..a8410bea7342b1f198c412d2e9e5403bca9bf480 100644 (file)
@@ -259,7 +259,7 @@ pub mod panic_count {
 
     pub fn increase() -> (bool, usize) {
         (
-            GLOBAL_PANIC_COUNT.fetch_add(1, Ordering::Acquire) & ALWAYS_ABORT_FLAG != 0,
+            GLOBAL_PANIC_COUNT.fetch_add(1, Ordering::Relaxed) & ALWAYS_ABORT_FLAG != 0,
             LOCAL_PANIC_COUNT.with(|c| {
                 let next = c.get() + 1;
                 c.set(next);
@@ -278,7 +278,7 @@ pub fn decrease() {
     }
 
     pub fn set_always_abort() {
-        GLOBAL_PANIC_COUNT.fetch_or(ALWAYS_ABORT_FLAG, Ordering::Release);
+        GLOBAL_PANIC_COUNT.fetch_or(ALWAYS_ABORT_FLAG, Ordering::Relaxed);
     }
 
     // Disregards ALWAYS_ABORT_FLAG