summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authormrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-18 10:13:54 +0000
committermrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-18 10:13:54 +0000
commit354e3760283d0f06ac1b7271eaf761a704a403cb (patch)
tree520d81e5ce0eff66c6fc334474cd89c1601322dc /array.c
parentdbb05925f7be3ca359291e89734e135559019834 (diff)
forget to commit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/array.c b/array.c
index ea4fe43ff0..51d3ad262a 100644
--- a/array.c
+++ b/array.c
@@ -409,7 +409,10 @@ static VALUE
ary_make_shared(VALUE ary)
{
assert(!ARY_EMBED_P(ary));
- if (ARY_SHARED_P(ary) || ARY_SHARED_ROOT_P(ary)) {
+ if (ARY_SHARED_P(ary)) {
+ return ARY_SHARED(ary);
+ }
+ else if (ARY_SHARED_ROOT_P(ary)) {
return ary;
}
else if (OBJ_FROZEN(ary)) {