From a22dd11af820ed123cf5cc4843720420a75b103f Mon Sep 17 00:00:00 2001 From: charliesome Date: Mon, 27 Jan 2014 23:56:22 +0000 Subject: [PATCH] compile.c: use correct key for block when loading serialized iseqs * 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/trunk@44720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ compile.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 41add16ad8..8a31ce7239 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jan 28 08:56:00 2014 Charlie Somerville + + * 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] + Mon Jan 27 21:52:55 2014 Nobuyoshi Nakada * thread_pthread.c: get current main thread stack size, which may diff --git a/compile.c b/compile.c index 6c693da32e..55f500b489 100644 --- a/compile.c +++ b/compile.c @@ -5808,7 +5808,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);