diff --git a/array.c b/array.c index 8e24da2ce6..e21c01194c 100644 --- a/array.c +++ b/array.c @@ -515,11 +515,11 @@ VALUE } VALUE -rb_ary_new_from_values(long n, const VALUE *elts) +rb_ary_tmp_new_from_values(VALUE klass, long n, const VALUE *elts) { VALUE ary; - ary = rb_ary_new2(n); + ary = ary_new(klass, n); if (n > 0 && elts) { ary_memcpy(ary, 0, n, elts); ARY_SET_LEN(ary, n); @@ -528,6 +528,12 @@ rb_ary_new_from_values(long n, const VALUE *elts) return ary; } +VALUE +rb_ary_new_from_values(long n, const VALUE *elts) +{ + return rb_ary_tmp_new_from_values(rb_cArray, n, elts); +} + VALUE rb_ary_tmp_new(long capa) { diff --git a/insns.def b/insns.def index 45dab0a927..a056b221d5 100644 --- a/insns.def +++ b/insns.def @@ -388,11 +388,8 @@ toregexp (VALUE val) // inc += 1 - cnt; { VALUE rb_reg_new_ary(VALUE ary, int options); - rb_num_t i; - const VALUE ary = rb_ary_tmp_new(cnt); - for (i = 0; i < cnt; i++) { - rb_ary_store(ary, cnt-i-1, TOPN(i)); - } + VALUE rb_ary_tmp_new_from_values(VALUE, long, const VALUE *); + const VALUE ary = rb_ary_tmp_new_from_values(0, cnt, STACK_ADDR_FROM_TOP(cnt)); POPN(cnt); val = rb_reg_new_ary(ary, (int)opt); rb_ary_clear(ary);