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 | |
| parent | eb8270d67596fff58e245ff4227dd35e67dbef5c (diff) | |
Revert "statement experssion is a GCCism" to pass ICC CI.
This reverts commit a6b50f379d4b71acac73ac6b22cbe2d2c5b50b3f.
| -rw-r--r-- | include/ruby/ruby.h | 12 | ||||
| -rw-r--r-- | internal.h | 6 | ||||
| -rw-r--r-- | ruby_atomic.h | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 9b7c9842f8..1ce73d5559 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1218,10 +1218,10 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *); (void)((sval) = (type *)DATA_PTR(result)); #ifdef __GNUC__ -#define Data_Make_Struct(klass,type,mark,free,sval) RB_GNUC_EXTENSION_BLOCK(\ +#define Data_Make_Struct(klass,type,mark,free,sval) ({\ Data_Make_Struct0(data_struct_obj, klass, type, sizeof(type), mark, free, sval); \ - data_struct_obj \ -) + data_struct_obj; \ +}) #else #define Data_Make_Struct(klass,type,mark,free,sval) (\ rb_data_object_make((klass),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free),(void **)&(sval),sizeof(type)) \ @@ -1236,10 +1236,10 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *); (void)((sval) = (type *)DATA_PTR(result)); #ifdef __GNUC__ -#define TypedData_Make_Struct(klass, type, data_type, sval) RB_GNUC_EXTENSION_BLOCK(\ +#define TypedData_Make_Struct(klass, type, data_type, sval) ({\ TypedData_Make_Struct0(data_struct_obj, klass, type, sizeof(type), data_type, sval); \ - data_struct_obj \ -) + data_struct_obj; \ +}) #else #define TypedData_Make_Struct(klass, type, data_type, sval) (\ rb_data_typed_object_make((klass),(data_type),(void **)&(sval),sizeof(type)) \ diff --git a/internal.h b/internal.h index d5f1b93b39..b431c47e9a 100644 --- a/internal.h +++ b/internal.h @@ -252,7 +252,7 @@ asan_unpoison_object(VALUE obj, bool newobj_p) __builtin_mul_overflow_p((a), (b), (__typeof__(a * b))0) #elif defined HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW #define MUL_OVERFLOW_P(a, b) \ - RB_GNUC_EXTENSION_BLOCK(__typeof__(a) c; __builtin_mul_overflow((a), (b), &c)) + ({__typeof__(a) c; __builtin_mul_overflow((a), (b), &c);}) #endif #define MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, min, max) ( \ @@ -265,10 +265,10 @@ asan_unpoison_object(VALUE obj, bool newobj_p) #ifdef HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW_P /* __builtin_mul_overflow_p can take bitfield */ /* and GCC permits bitfields for integers other than int */ -#define MUL_OVERFLOW_FIXNUM_P(a, b) RB_GNUC_EXTENSION_BLOCK( \ +#define MUL_OVERFLOW_FIXNUM_P(a, b) ({ \ struct { long fixnum : SIZEOF_LONG * CHAR_BIT - 1; } c; \ __builtin_mul_overflow_p((a), (b), c.fixnum); \ -) +}) #else #define MUL_OVERFLOW_FIXNUM_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX) #endif 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) |