diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | array.c | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Sun Jun 16 01:56:54 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * array.c (FL_SET_EMBED): shared object is frozen even when get + unshared. + + * array.c (rb_ary_modify): ARY_SET_CAPA needs unshared array. + Sun Jun 16 01:32:26 2013 TAKANO Mitsuhiro <tak@no32.tk> * insns.def: fix condition. @@ -67,7 +67,6 @@ memfill(register VALUE *mem, register long size, register VALUE val) #define ARY_OWNS_HEAP_P(a) (!FL_TEST((a), ELTS_SHARED|RARRAY_EMBED_FLAG)) #define FL_SET_EMBED(a) do { \ assert(!ARY_SHARED_P(a)); \ - assert(!OBJ_FROZEN(a)); \ FL_SET((a), RARRAY_EMBED_FLAG); \ } while (0) #define FL_UNSET_EMBED(ary) FL_UNSET((ary), RARRAY_EMBED_FLAG|RARRAY_EMBED_LEN_MASK) @@ -268,10 +267,10 @@ rb_ary_modify(VALUE ary) } else if (ARY_SHARED_NUM(shared) == 1 && len > (RARRAY_LEN(shared)>>1)) { long shift = RARRAY_PTR(ary) - RARRAY_PTR(shared); + FL_UNSET_SHARED(ary); ARY_SET_PTR(ary, RARRAY_PTR(shared)); ARY_SET_CAPA(ary, RARRAY_LEN(shared)); MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+shift, VALUE, len); - FL_UNSET_SHARED(ary); FL_SET_EMBED(shared); rb_ary_decrement_share(shared); } @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-06-16" -#define RUBY_PATCHLEVEL 221 +#define RUBY_PATCHLEVEL 222 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 6 |