nagachika	2014-09-10 02:59:51 +0900 (Wed, 10 Sep 2014)

  New Revision: 47481

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

  Log:
    merge revision(s) r47191: [Backport #10140]
    
    * iseq.c (rb_iseq_clone): Should not insert write barrier from
      non-RVALUE data (to non-RVALUE data, of course).
      Ruby 2.1 also has a same problem.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/iseq.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47480)
+++ ruby_2_1/ChangeLog	(revision 47481)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Sep 10 02:51:38 2014  Koichi Sasada  <ko1@a...>
+
+	* iseq.c (rb_iseq_clone): Should not insert write barrier from
+	  non-RVALUE data (to non-RVALUE data, of course).
+
+	  Ruby 2.1 also has a same problem.
+
 Wed Sep 10 02:33:08 2014  Koichi Sasada  <ko1@a...>
 
 	* parse.y (setup_fake_str): fake strings should not set class by
Index: ruby_2_1/iseq.c
===================================================================
--- ruby_2_1/iseq.c	(revision 47480)
+++ ruby_2_1/iseq.c	(revision 47481)
@@ -1943,7 +1943,7 @@ rb_iseq_clone(VALUE iseqval, VALUE newcb https://github.com/ruby/ruby/blob/trunk/ruby_2_1/iseq.c#L1943
 	if (iseq0->cref_stack->nd_next) {
 	    RB_OBJ_WRITE(iseq1->cref_stack, &iseq1->cref_stack->nd_next, iseq0->cref_stack->nd_next);
 	}
-	RB_OBJ_WRITE(iseq1, &iseq1->klass, newcbase);
+	RB_OBJ_WRITE(iseq1->self, &iseq1->klass, newcbase);
     }
 
     return newiseq;
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47480)
+++ ruby_2_1/version.h	(revision 47481)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-09-10"
-#define RUBY_PATCHLEVEL 228
+#define RUBY_PATCHLEVEL 229
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r47191


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