diff options
author | mrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-18 09:42:36 +0000 |
---|---|---|
committer | mrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-18 09:42:36 +0000 |
commit | 4023ffa92f87c497659e737c41da6808df716a50 (patch) | |
tree | 84e17cab30a4f553b35aa9d6870412919986c96b /array.c | |
parent | 21cf543d38513a723f1b1f5567dc028b16e56f4f (diff) | |
download | ruby-4023ffa92f87c497659e737c41da6808df716a50.tar.gz |
* array.c (ary_make_shared), test/ruby/test_array.rb (test_permutation): always return the original array when it is shared. [ruby-dev:42067] [Bug #3708]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -409,10 +409,7 @@ static VALUE ary_make_shared(VALUE ary) { assert(!ARY_EMBED_P(ary)); - if (ARY_SHARED_P(ary)) { - return ARY_SHARED(ary); - } - else if (ARY_SHARED_ROOT_P(ary)) { + if (ARY_SHARED_P(ary) || ARY_SHARED_ROOT_P(ary)) { return ary; } else if (OBJ_FROZEN(ary)) { |