diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 05:00:27 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 05:00:27 +0000 |
commit | f38ceeacd6e5ed29fa50e2713c395d3a7732b564 (patch) | |
tree | a1d09014446064f68370cbdcb1c706d5ff7279b7 | |
parent | 2583078951f14a2df251ba7c27310f62e69269ad (diff) |
merge revision(s) r44720: [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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | compile.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sat Feb 22 13:56:38 2014 Charlie Somerville <charliesome@ruby-lang.org> + + * 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] + Sat Feb 22 13:04:54 2014 Shugo Maeda <shugo@ruby-lang.org> * ext/socket/init.c (wait_connectable): break if the socket is @@ -5701,7 +5701,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor, 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); @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-02-22" -#define RUBY_PATCHLEVEL 447 +#define RUBY_PATCHLEVEL 448 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 |