From 2a3d7b5992d3389544a6596103d1068096491ff4 Mon Sep 17 00:00:00 2001 From: mame Date: Wed, 29 Oct 2008 14:40:31 +0000 Subject: [PATCH] * revert the previous wrong commit; sorry. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20025 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ----- array.c | 8 ++------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d7bf4ca0c..07475885f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,3 @@ -Wed Oct 29 23:24:38 2008 Yusuke Endoh - - * array.c (rb_ary_sort_bang): replacing array during sort broke - invariant of array. - Wed Oct 29 20:45:08 2008 Yusuke Endoh * test/webrick/utils.rb (start_server): provide a reference to log of diff --git a/array.c b/array.c index dcf8d0e56c..e04de09cc2 100644 --- a/array.c +++ b/array.c @@ -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)) {