diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-15 17:14:53 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-15 17:14:53 +0000 |
commit | 1ef4fecd63db680dd9b417791de9522944ebde61 (patch) | |
tree | a725a662c333c87ebcdf6b452be7efb0ef187ec3 /array.c | |
parent | e5989985c7698b606625eddfd5e437ddd6efa77b (diff) |
merge revision(s) 41245: [Backport #8513]
* array.c (FL_SET_EMBED): shared object is frozen even when get
unshared.
* array.c (rb_ary_modify): ARY_SET_CAPA needs unshared array.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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); } |