From 77d29ef73cba81e7c18ab9bb95e0756b9f173f38 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Mon, 28 Jul 2025 23:22:34 -0700 Subject: [PATCH] Convert ATOMIC_LOAD_RELAXED to use new rbimpl_* --- ruby_atomic.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/ruby_atomic.h b/ruby_atomic.h index 1ccabcbdf6..2923275636 100644 --- a/ruby_atomic.h +++ b/ruby_atomic.h @@ -27,16 +27,7 @@ #define ATOMIC_VALUE_CAS(var, oldval, val) RUBY_ATOMIC_VALUE_CAS(var, oldval, val) #define ATOMIC_VALUE_EXCHANGE(var, val) RUBY_ATOMIC_VALUE_EXCHANGE(var, val) -static inline rb_atomic_t -rbimpl_atomic_load_relaxed(volatile rb_atomic_t *ptr) -{ -#if defined(HAVE_GCC_ATOMIC_BUILTINS) - return __atomic_load_n(ptr, __ATOMIC_RELAXED); -#else - return *ptr; -#endif -} -#define ATOMIC_LOAD_RELAXED(var) rbimpl_atomic_load_relaxed(&(var)) +#define ATOMIC_LOAD_RELAXED(var) rbimpl_atomic_load(&(var), RBIMPL_ATOMIC_RELAXED) typedef RBIMPL_ALIGNAS(8) uint64_t rbimpl_atomic_uint64_t;