summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authortarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-07 02:20:05 +0000
committertarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-07 02:20:05 +0000
commit7185eac56a353b3767c2444564f1446b404d9af4 (patch)
tree4401e31ea2ed48515612029b0929bc479fc59286 /array.c
parentb1bbe884cd5e6554017b5c6b610acf653db23a04 (diff)
* array.c (ary_new): change order of allocation in order
to remove FL_OLDGEN operation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/array.c b/array.c
index beee4da..4b5e84e 100644
--- a/array.c
+++ b/array.c
@@ -392,7 +392,7 @@ empty_ary_alloc(VALUE klass)
static VALUE
ary_new(VALUE klass, long capa)
{
- VALUE ary;
+ VALUE ary,*ptr;
if (capa < 0) {
rb_raise(rb_eArgError, "negative array size (or size too big)");
@@ -405,20 +405,16 @@ ary_new(VALUE klass, long capa)
RUBY_DTRACE_ARRAY_CREATE(capa, rb_sourcefile(), rb_sourceline());
}
- ary = ary_alloc(klass);
if (capa > RARRAY_EMBED_LEN_MAX) {
+ ptr = ALLOC_N(VALUE, capa);
+ ary = ary_alloc(klass);
FL_UNSET_EMBED(ary);
- ARY_SET_PTR(ary, ALLOC_N(VALUE, capa));
+ ARY_SET_PTR(ary, ptr);
ARY_SET_CAPA(ary, capa);
ARY_SET_HEAP_LEN(ary, 0);
+ } else {
+ ary = ary_alloc(klass);
- /* NOTE: `ary' can be old because the following suquence is possible.
- * (1) ary = ary_alloc();
- * (2) GC (for (3)) -> promote ary
- * (3) ALLOC_N(VALUE, capa)
- * So that force ary as young object.
- */
- RBASIC(ary)->flags &= ~FL_OLDGEN;
}
return ary;