1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

give up RSTRING_PTR() being VALUE-aligned

Browse Source 
rb_setup_fake_str() can take arbitrary char* address, typicalluy
C string literals.  These arguments have no guarantee of
alignment at all.  It was not a wise idea for me to think
RSTRING_PTR can be aligned.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2018-01-15 04:36:09 +00:00
parent bca40b8b56
commit e41b4a45a4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ruby/ruby.h
View File

@ -957,13 +957,13 @@ struct RString {
union { union {
struct { struct {
long len; long len;
ruby_aligned_char *ptr; char *ptr;
union { union {
long capa; long capa;
VALUE shared; VALUE shared;
} aux; } aux;
} heap; } heap;
char RUBY_ALIGNAS(SIZEOF_VALUE) ary[RSTRING_EMBED_LEN_MAX + 1]; char ary[RSTRING_EMBED_LEN_MAX + 1];
} as; } as;
}; };
#define RSTRING_EMBED_LEN(str) \ #define RSTRING_EMBED_LEN(str) \
@ -975,7 +975,7 @@ struct RString {
RSTRING(str)->as.heap.len) RSTRING(str)->as.heap.len)
#define RSTRING_PTR(str) \ #define RSTRING_PTR(str) \
(!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \ (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \
(ruby_aligned_char *)RSTRING(str)->as.ary : \ RSTRING(str)->as.ary : \
RSTRING(str)->as.heap.ptr) RSTRING(str)->as.heap.ptr)
#define RSTRING_END(str) \ #define RSTRING_END(str) \
(!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \ (!(RBASIC(str)->flags & RSTRING_NOEMBED) ? \