merge revision(s) r47190: [Backport ruby#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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Author: nagachika

ChangeLog

@@ -1,3 +1,11 @@
+Wed Sep 10 02:33:08 2014  Koichi Sasada  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* lib/rdoc/generator/template/darkfish/js/jquery.js: Backport

parse.y

@@ -10403,7 +10403,7 @@ static VALUE
 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;

version.h

@@ -1,10 +1,10 @@
 #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"