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

  New Revision: 47480

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

  Log:
    merge revision(s) r47190: [Backport #10139]
    
    * string.c (setup_fake_str): fake strings should not set class by
      RBASIC_SET_CLASS() because it insert write barriers to fake
      (non-RVALUE) structure.
      It can cause unexpected behaviour.
      Ruby 2.1 also have a same problem (setup_fake_str() in parse.y).
    
    * symbol.c (setup_fake_str): ditto.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/parse.y
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47479)
+++ ruby_2_1/ChangeLog	(revision 47480)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Sep 10 02:33:08 2014  Koichi Sasada  <ko1@a...>
+
+	* parse.y (setup_fake_str): fake strings should not set class by
+	  RBASIC_SET_CLASS() because it insert write barriers to fake
+	  (non-RVALUE) structure.
+
+	  It can cause unexpected behaviour.
+
 Fri Sep  5 17:01:38 2014  Zachary Scott  <e@z...>
 
 	* lib/rdoc/generator/template/darkfish/js/jquery.js: Backport
Index: ruby_2_1/parse.y
===================================================================
--- ruby_2_1/parse.y	(revision 47479)
+++ ruby_2_1/parse.y	(revision 47480)
@@ -10403,7 +10403,7 @@ static VALUE https://github.com/ruby/ruby/blob/trunk/ruby_2_1/parse.y#L10403
 setup_fake_str(struct RString *fake_str, const char *name, long len)
 {
     fake_str->basic.flags = T_STRING|RSTRING_NOEMBED;
-    RBASIC_SET_CLASS((VALUE)fake_str, rb_cString);
+    RBASIC_SET_CLASS_RAW((VALUE)fake_str, rb_cString);
     fake_str->as.heap.len = len;
     fake_str->as.heap.ptr = (char *)name;
     fake_str->as.heap.aux.capa = len;
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47479)
+++ ruby_2_1/version.h	(revision 47480)
@@ -1,10 +1,10 @@ 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-06"
-#define RUBY_PATCHLEVEL 227
+#define RUBY_RELEASE_DATE "2014-09-10"
+#define RUBY_PATCHLEVEL 228
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_DAY 10
 
 #include "ruby/version.h"
 

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


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