diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2021-05-06 15:11:08 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2021-05-07 11:17:44 +0100 |
| commit | 3cba120ba453b5371e53766ec816f016d004ed91 (patch) | |
| tree | 55a512e94d983e7dbc55c9a9f042f838fbcdb962 | |
| parent | 1b1bf2463619e23eba1b36b6d7df276ce73563dd (diff) | |
| download | rust-3cba120ba453b5371e53766ec816f016d004ed91.tar.gz rust-3cba120ba453b5371e53766ec816f016d004ed91.zip | |
std panicking: ALWAYS_ABORT: use Relaxed memory ordering
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>
| -rw-r--r-- | library/std/src/panicking.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/panicking.rs b/library/std/src/panicking.rs index 62476581f99..a8410bea734 100644 --- a/library/std/src/panicking.rs +++ b/library/std/src/panicking.rs @@ -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 mod panic_count { } 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 |