From d90818016436a069590277c5fb07a4f50c2feb87 Mon Sep 17 00:00:00 2001 From: glass Date: Sun, 10 May 2015 02:25:33 +0000 Subject: * enum.c (enum_to_a): Use size to set array capa when possible. the patch is from HonoreDB . [fix GH-444] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ enum.c | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c7cdc8d6ef..7fe479ef34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun May 10 11:23:03 2015 Masaki Matsushita + + * enum.c (enum_to_a): Use size to set array capa when possible. + the patch is from HonoreDB . + [fix GH-444] + Sat May 9 06:48:36 2015 Eric Wong * ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard diff --git a/enum.c b/enum.c index a49e4b0b74..ea151b464d 100644 --- a/enum.c +++ b/enum.c @@ -515,7 +515,14 @@ enum_flat_map(VALUE obj) static VALUE enum_to_a(int argc, VALUE *argv, VALUE obj) { - VALUE ary = rb_ary_new(); + VALUE ary, size = rb_check_funcall(obj, id_size, 0, 0); + + if (NIL_P(size) || size == Qundef) { + ary = rb_ary_new(); + } + else { + ary = rb_ary_new_capa(NUM2LONG(size)); + } rb_block_call(obj, id_each, argc, argv, collect_all, ary); OBJ_INFECT(ary, obj); -- cgit v1.2.3