diff --git a/ChangeLog b/ChangeLog index e94d5437ae..282d7ccfbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Nov 6 10:37:07 2013 Masaki Matsushita + + * array.c (rb_ary_and): defer hash creation and some refactoring. + Wed Nov 6 09:14:31 2013 Koichi Sasada * benchmark/bm_vm1_gc_short_lived.rb: added. diff --git a/array.c b/array.c index c7428c5b21..ce27875a16 100644 --- a/array.c +++ b/array.c @@ -4009,20 +4009,20 @@ static VALUE rb_ary_and(VALUE ary1, VALUE ary2) { VALUE hash, ary3, v; + st_table *table; st_data_t vv; long i; ary2 = to_ary(ary2); - ary3 = rb_ary_new2(RARRAY_LEN(ary1) < RARRAY_LEN(ary2) ? - RARRAY_LEN(ary1) : RARRAY_LEN(ary2)); + ary3 = rb_ary_new(); + if (RARRAY_LEN(ary2) == 0) return ary3; hash = ary_make_hash(ary2); - - if (RHASH_EMPTY_P(hash)) - return ary3; + table = rb_hash_tbl_raw(hash); for (i=0; i