nagachika	2014-02-22 14:00:27 +0900 (Sat, 22 Feb 2014)

  New Revision: 45106

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

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

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/compile.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 45105)
+++ ruby_2_0_0/ChangeLog	(revision 45106)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Feb 22 13:56:38 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]
+
 Sat Feb 22 13:04:54 2014  Shugo Maeda  <shugo@r...>
 
 	* ext/socket/init.c (wait_connectable): break if the socket is
Index: ruby_2_0_0/compile.c
===================================================================
--- ruby_2_0_0/compile.c	(revision 45105)
+++ ruby_2_0_0/compile.c	(revision 45106)
@@ -5701,7 +5701,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/compile.c#L5701
 				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_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 45105)
+++ ruby_2_0_0/version.h	(revision 45106)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44720


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