diff options
| author | nagachika <nagachika@ruby-lang.org> | 2020-09-20 20:23:12 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2020-09-20 20:23:12 +0900 |
| commit | 1b39a995b559677bf4bf2d0ac3a1c924928a936f (patch) | |
| tree | 1888420892abec4a1baf7fa3b99f485dafa248f2 /ruby_atomic.h | |
| parent | eb8270d67596fff58e245ff4227dd35e67dbef5c (diff) | |
| download | ruby-1b39a995b559677bf4bf2d0ac3a1c924928a936f.tar.gz | |
Revert "statement experssion is a GCCism" to pass ICC CI.
This reverts commit a6b50f379d4b71acac73ac6b22cbe2d2c5b50b3f.
Diffstat (limited to 'ruby_atomic.h')
| -rw-r--r-- | ruby_atomic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ruby_atomic.h b/ruby_atomic.h index 1b395cd23f..2516dbfb42 100644 --- a/ruby_atomic.h +++ b/ruby_atomic.h @@ -9,10 +9,10 @@ typedef unsigned int rb_atomic_t; # define ATOMIC_DEC(var) __atomic_fetch_sub(&(var), 1, __ATOMIC_SEQ_CST) # define ATOMIC_OR(var, val) __atomic_fetch_or(&(var), (val), __ATOMIC_SEQ_CST) # define ATOMIC_EXCHANGE(var, val) __atomic_exchange_n(&(var), (val), __ATOMIC_SEQ_CST) -# define ATOMIC_CAS(var, oldval, newval) RB_GNUC_EXTENSION_BLOCK( \ - __typeof__(var) oldvaldup = (oldval); /* oldval should not be modified */ \ +# define ATOMIC_CAS(var, oldval, newval) \ +({ __typeof__(var) oldvaldup = (oldval); /* oldval should not be modified */ \ __atomic_compare_exchange_n(&(var), &oldvaldup, (newval), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); \ - oldvaldup ) + oldvaldup; }) # define ATOMIC_SIZE_ADD(var, val) __atomic_fetch_add(&(var), (val), __ATOMIC_SEQ_CST) # define ATOMIC_SIZE_SUB(var, val) __atomic_fetch_sub(&(var), (val), __ATOMIC_SEQ_CST) |