charliesome	2014-01-28 08:56:22 +0900 (Tue, 28 Jan 2014)

  New Revision: 44720

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44720

  Log:
    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]

  Modified files:
    trunk/ChangeLog
    trunk/compile.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44719)
+++ ChangeLog	(revision 44720)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Jan 28 08:56:00 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]
+
 Mon Jan 27 21:52:55 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread_pthread.c: get current main thread stack size, which may
Index: compile.c
===================================================================
--- compile.c	(revision 44719)
+++ compile.c	(revision 44720)
@@ -5808,7 +5808,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq https://github.com/ruby/ruby/blob/trunk/compile.c#L5808
 				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);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/