ruby-changes:32990
From: naruse <ko1@a...>
Date: Fri, 21 Feb 2014 14:52:05 +0900 (JST)
Subject: [ruby-changes:32990] naruse:r45069 (ruby_2_1): merge revision(s) 44720: [Backport #9455]
naruse 2014-02-21 14:52:00 +0900 (Fri, 21 Feb 2014) New Revision: 45069 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45069 Log: merge revision(s) 44720: [Backport #9455] * compile.c (iseq_build_from_ary_body): Use :blockptr instead of :block as hash key when loading serialized instruction sequences from arrays. [Bug #9455] [ruby-core:60146] Modified directories: branches/ruby_2_1/ Modified files: branches/ruby_2_1/ChangeLog branches/ruby_2_1/compile.c branches/ruby_2_1/version.h Index: ruby_2_1/ChangeLog =================================================================== --- ruby_2_1/ChangeLog (revision 45068) +++ ruby_2_1/ChangeLog (revision 45069) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1 +Fri Feb 21 13:39:21 2014 Charlie Somerville <charliesome@r...> + + * compile.c (iseq_build_from_ary_body): Use :blockptr instead of :block + as hash key when loading serialized instruction sequences from arrays. + [Bug #9455] [ruby-core:60146] + Thu Feb 20 12:58:45 2014 Tanaka Akira <akr@f...> * process.c (READ_FROM_CHILD): Apply the last hunk of Index: ruby_2_1/compile.c =================================================================== --- ruby_2_1/compile.c (revision 45068) +++ ruby_2_1/compile.c (revision 45069) @@ -5766,7 +5766,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq https://github.com/ruby/ruby/blob/trunk/ruby_2_1/compile.c#L5766 VALUE vmid = rb_hash_aref(op, ID2SYM(rb_intern("mid"))); VALUE vflag = rb_hash_aref(op, ID2SYM(rb_intern("flag"))); VALUE vorig_argc = rb_hash_aref(op, ID2SYM(rb_intern("orig_argc"))); - VALUE vblock = rb_hash_aref(op, ID2SYM(rb_intern("block"))); + VALUE vblock = rb_hash_aref(op, ID2SYM(rb_intern("blockptr"))); if (!NIL_P(vmid)) mid = SYM2ID(vmid); if (!NIL_P(vflag)) flag = NUM2ULONG(vflag); Index: ruby_2_1/version.h =================================================================== --- ruby_2_1/version.h (revision 45068) +++ ruby_2_1/version.h (revision 45069) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1 #define RUBY_VERSION "2.1.1" -#define RUBY_RELEASE_DATE "2014-02-20" -#define RUBY_PATCHLEVEL 39 +#define RUBY_RELEASE_DATE "2014-02-21" +#define RUBY_PATCHLEVEL 40 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 21 #include "ruby/version.h" Property changes on: ruby_2_1 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r44720 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/