From 8fcdd0157326e73b110737fbd6d0c3a3a60866d8 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 29 Oct 2008 17:43:46 +0000 Subject: * array.c (rb_ary_sort_bang): refactoring. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'array.c') diff --git a/array.c b/array.c index 45eef76c1..ce11aa4b1 100644 --- a/array.c +++ b/array.c @@ -1751,19 +1751,25 @@ rb_ary_sort_bang(VALUE ary) assert(ARY_EMBED_P(tmp)); if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */ rb_ary_unshare(ary); - FL_SET_EMBED(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(tmp)); - if (ARY_EMBED_P(ary) || RARRAY_PTR(ary) != RARRAY_PTR(tmp)) { + if (ARY_HEAP_PTR(ary) == ARY_HEAP_PTR(tmp)) { + assert(!ARY_EMBED_P(ary)); + FL_UNSET_SHARED(ary); + ARY_SET_CAPA(ary, ARY_CAPA(tmp)); + } + else { assert(!ARY_SHARED_P(tmp)); if (ARY_EMBED_P(ary)) { FL_UNSET_EMBED(ary); } else if (ARY_SHARED_P(ary)) { + /* ary might be destructively operated in the given block */ rb_ary_unshare(ary); } else { @@ -1773,10 +1779,6 @@ rb_ary_sort_bang(VALUE ary) ARY_SET_HEAP_LEN(ary, RARRAY_LEN(tmp)); ARY_SET_CAPA(ary, ARY_CAPA(tmp)); } - else { - FL_UNSET_SHARED(ary); - ARY_SET_CAPA(ary, ARY_CAPA(tmp)); - } /* tmp was lost ownership for the ptr */ FL_UNSET(tmp, FL_FREEZE); FL_SET_EMBED(tmp); -- cgit