diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/defines.h | 4 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/include/ruby/defines.h b/include/ruby/defines.h index 2c72a7cb8a..da2ba24109 100644 --- a/include/ruby/defines.h +++ b/include/ruby/defines.h @@ -376,6 +376,10 @@ void rb_ia64_flushrs(void); # endif #endif +#ifndef RUBY_ALIGNAS +#define RUBY_ALIGNAS(x) y +#endif + RUBY_SYMBOL_EXPORT_END #if defined(__cplusplus) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 6d84a6b06e..fe0ecf4622 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -853,14 +853,10 @@ enum ruby_fl_type { RUBY_FL_SINGLETON = RUBY_FL_USER0 }; -struct RBasic { +struct RUBY_ALIGNAS(sizeof(VALUE)) RBasic { VALUE flags; const VALUE klass; -} -#ifdef __GNUC__ - __attribute__((aligned(sizeof(VALUE)))) -#endif -; +}; VALUE rb_obj_hide(VALUE obj); VALUE rb_obj_reveal(VALUE obj, VALUE klass); /* do not use this API to change klass information */ @@ -953,18 +949,21 @@ enum ruby_rstring_flags { RSTRING_ENUM_END }; + +typedef RUBY_ALIGNAS(sizeof(VALUE)) char ruby_aligned_char; + struct RString { struct RBasic basic; union { struct { long len; - char *ptr; + ruby_aligned_char *ptr; union { long capa; VALUE shared; } aux; } heap; - char ary[RSTRING_EMBED_LEN_MAX + 1]; + char RUBY_ALIGNAS(sizeof(VALUE)) ary[RSTRING_EMBED_LEN_MAX + 1]; } as; }; #define RSTRING_EMBED_LEN(str) \ @@ -976,7 +975,7 @@ struct RString { RSTRING(str)->as.heap.len) #define RSTRING_PTR(str) \ (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \ - RSTRING(str)->as.ary : \ + (ruby_aligned_char *)RSTRING(str)->as.ary : \ RSTRING(str)->as.heap.ptr) #define RSTRING_END(str) \ (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \ |