diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-29 14:40:31 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-29 14:40:31 +0000 |
commit | 6e1b227fc332920205dfd4496ea875b6fa749952 (patch) | |
tree | 793ec3f9897d9b1df003221783b7f3125a6570c7 /array.c | |
parent | 8058e93f5e417fb3dea027a357bdcab7e0c11029 (diff) |
* revert the previous wrong commit; sorry.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20025 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1751,18 +1751,14 @@ rb_ary_sort_bang(VALUE ary) ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE), rb_block_given_p()?sort_1:sort_2, &data); - if (ARY_EMBED_P(tmp)) { + if (ARY_EMBED_P(ary) || ARY_EMBED_P(tmp)) { assert(ARY_EMBED_P(tmp)); - if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */ - rb_ary_unshared(ary); - FL_SET_EMBED(ary); - } MEMCPY(RARRAY_PTR(ary), ARY_EMBED_PTR(tmp), VALUE, ARY_EMBED_LEN(tmp)); ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp)); } else { + assert(!ARY_EMBED_P(ary)); assert(!ARY_EMBED_P(tmp)); - if (ARY_EMBED_P(ary)) FL_UNSET_EMBED(ary); if (RARRAY_PTR(ary) != RARRAY_PTR(tmp)) { assert(!ARY_SHARED_P(tmp)); if (ARY_SHARED_P(ary)) { |