diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-24 16:08:04 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-24 16:08:04 +0000 |
commit | ba71368071c85eec4413e7a057ecba9831f923d0 (patch) | |
tree | d041d008f9df4e96c97ac452a8a677537572c408 | |
parent | c126c95c719cfa564c0750a64f877a5ac02ae905 (diff) |
merges r23815 from trunk into ruby_1_9_1.
--
* compile.c (iseq_set_arguments, iseq_compile_each): internal
arrays must be hidden. [ruby-dev:38613]
* vm.c (Init_top_self): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | compile.c | 5 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | vm.c | 2 |
4 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Mon Jun 22 16:14:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * compile.c (iseq_set_arguments, iseq_compile_each): internal + arrays must be hidden. [ruby-dev:38613] + + * vm.c (Init_top_self): ditto. + Tue Jun 23 01:17:38 2009 Tanaka Akira <akr@fsij.org> * ruby.c (process_options): don't specify .so for encdb here. @@ -1088,7 +1088,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args) if (node_opt) { NODE *node = node_opt; LABEL *label; - VALUE labels = rb_ary_new(); + VALUE labels = rb_ary_tmp_new(1); int i = 0, j; while (node) { @@ -1112,6 +1112,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args) for (j = 0; j < i; j++) { iseq->arg_opt_table[j] &= ~1; } + rb_ary_clear(labels); } else { iseq->arg_opts = 0; @@ -3010,7 +3011,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) DECL_ANCHOR(head); DECL_ANCHOR(body_seq); DECL_ANCHOR(cond_seq); - VALUE special_literals = rb_ary_new(); + VALUE special_literals = rb_ary_tmp_new(1); INIT_ANCHOR(head); INIT_ANCHOR(body_seq); @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-06-25" -#define RUBY_PATCHLEVEL 201 +#define RUBY_PATCHLEVEL 202 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 @@ -1992,7 +1992,7 @@ Init_top_self(void) rb_define_singleton_method(rb_vm_top_self(), "to_s", main_to_s, 0); /* initialize mark object array */ - vm->mark_object_ary = rb_ary_new(); + vm->mark_object_ary = rb_ary_tmp_new(1); } VALUE * |