archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Revert "statement experssion is a GCCism" to pass ICC CI.

Browse source 
This reverts commit a6b50f379d.
This commit is contained in:
nagachika 2020-09-20 20:23:12 +09:00
parent eb8270d675
commit 1b39a995b5
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/ruby/ruby.h
View file

@ -1218,10 +1218,10 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *);
(void)((sval) = (type *)DATA_PTR(result)); (void)((sval) = (type *)DATA_PTR(result));
#ifdef __GNUC__ #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_Make_Struct0(data_struct_obj, klass, type, sizeof(type), mark, free, sval); \
data_struct_obj \ data_struct_obj; \
) })
#else #else
#define Data_Make_Struct(klass,type,mark,free,sval) (\ #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)) \ 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)); (void)((sval) = (type *)DATA_PTR(result));
#ifdef __GNUC__ #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); \ TypedData_Make_Struct0(data_struct_obj, klass, type, sizeof(type), data_type, sval); \
data_struct_obj \ data_struct_obj; \
) })
#else #else
#define TypedData_Make_Struct(klass, type, data_type, sval) (\ #define TypedData_Make_Struct(klass, type, data_type, sval) (\
rb_data_typed_object_make((klass),(data_type),(void **)&(sval),sizeof(type)) \ rb_data_typed_object_make((klass),(data_type),(void **)&(sval),sizeof(type)) \

6
internal.h
View file

@ -252,7 +252,7 @@ asan_unpoison_object(VALUE obj, bool newobj_p)
__builtin_mul_overflow_p((a), (b), (__typeof__(a * b))0) __builtin_mul_overflow_p((a), (b), (__typeof__(a * b))0)
#elif defined HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW #elif defined HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW
#define MUL_OVERFLOW_P(a, b) \ #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 #endif
#define MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, min, max) ( \ #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 #ifdef HAVE_BUILTIN___BUILTIN_MUL_OVERFLOW_P
/* __builtin_mul_overflow_p can take bitfield */ /* __builtin_mul_overflow_p can take bitfield */
/* and GCC permits bitfields for integers other than int */ /* 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; \ struct { long fixnum : SIZEOF_LONG * CHAR_BIT - 1; } c; \
__builtin_mul_overflow_p((a), (b), c.fixnum); \ __builtin_mul_overflow_p((a), (b), c.fixnum); \
) })
#else #else
#define MUL_OVERFLOW_FIXNUM_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX) #define MUL_OVERFLOW_FIXNUM_P(a, b) MUL_OVERFLOW_SIGNED_INTEGER_P(a, b, FIXNUM_MIN, FIXNUM_MAX)
#endif #endif

6
ruby_atomic.h
View file

@ -9,10 +9,10 @@ typedef unsigned int rb_atomic_t;
# define ATOMIC_DEC(var) __atomic_fetch_sub(&(var), 1, __ATOMIC_SEQ_CST) # 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_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_EXCHANGE(var, val) __atomic_exchange_n(&(var), (val), __ATOMIC_SEQ_CST)
# define ATOMIC_CAS(var, oldval, newval) RB_GNUC_EXTENSION_BLOCK( \ # define ATOMIC_CAS(var, oldval, newval) \
__typeof__(var) oldvaldup = (oldval); /* oldval should not be modified */ \ ({ __typeof__(var) oldvaldup = (oldval); /* oldval should not be modified */ \
__atomic_compare_exchange_n(&(var), &oldvaldup, (newval), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); \ __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_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) # define ATOMIC_SIZE_SUB(var, val) __atomic_fetch_sub(&(var), (val), __ATOMIC_SEQ_CST)