naruse	2013-04-15 14:58:19 +0900 (Mon, 15 Apr 2013)

  New Revision: 40305

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

  Log:
    merge revision(s) 34306:
    
    * ext/json/parser/parser.rl (json_string_unescape): workaround fix
      for over optimization of GCC 4.7. [ruby-core:42085] [Bug #5888]
      http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51862

  Modified directories:
    branches/ruby_1_9_2/
  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/json/parser/parser.c
    branches/ruby_1_9_2/ext/json/parser/parser.rl
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 40304)
+++ ruby_1_9_2/ChangeLog	(revision 40305)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_2/ChangeLog#L1
+Mon Apr 15 14:57:43 2013  NARUSE, Yui  <naruse@r...>
+
+	* ext/json/parser/parser.rl (json_string_unescape): workaround fix
+	  for over optimization of GCC 4.7. [ruby-core:42085] [Bug #5888]
+	  http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51862
+
 Mon Apr 15 10:56:55 2013  NARUSE, Yui  <naruse@r...>
 
 	* cont.c (cont_restore_0): prevent optimizing out `sp'. sp is used for
Index: ruby_1_9_2/ext/json/parser/parser.rl
===================================================================
--- ruby_1_9_2/ext/json/parser/parser.rl	(revision 40304)
+++ ruby_1_9_2/ext/json/parser/parser.rl	(revision 40305)
@@ -382,6 +382,7 @@ static VALUE json_string_unescape(VALUE https://github.com/ruby/ruby/blob/trunk/ruby_1_9_2/ext/json/parser/parser.rl#L382
 {
     char *p = string, *pe = string, *unescape;
     int unescape_len;
+    char buf[4];
 
     while (pe < stringEnd) {
         if (*pe == '\\') {
@@ -414,7 +415,6 @@ static VALUE json_string_unescape(VALUE https://github.com/ruby/ruby/blob/trunk/ruby_1_9_2/ext/json/parser/parser.rl#L415
                     if (pe > stringEnd - 4) {
                         return Qnil;
                     } else {
-                        char buf[4];
                         UTF32 ch = unescape_unicode((unsigned char *) ++pe);
                         pe += 3;
                         if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
Index: ruby_1_9_2/ext/json/parser/parser.c
===================================================================
--- ruby_1_9_2/ext/json/parser/parser.c	(revision 40304)
+++ ruby_1_9_2/ext/json/parser/parser.c	(revision 40305)
@@ -1283,6 +1283,7 @@ static VALUE json_string_unescape(VALUE https://github.com/ruby/ruby/blob/trunk/ruby_1_9_2/ext/json/parser/parser.c#L1283
 {
     char *p = string, *pe = string, *unescape;
     int unescape_len;
+    char buf[4];
 
     while (pe < stringEnd) {
         if (*pe == '\\') {
@@ -1315,7 +1316,6 @@ static VALUE json_string_unescape(VALUE https://github.com/ruby/ruby/blob/trunk/ruby_1_9_2/ext/json/parser/parser.c#L1316
                     if (pe > stringEnd - 4) {
                         return Qnil;
                     } else {
-                        char buf[4];
                         UTF32 ch = unescape_unicode((unsigned char *) ++pe);
                         pe += 3;
                         if (UNI_SUR_HIGH_START == (ch & 0xFC00)) {
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 40304)
+++ ruby_1_9_2/version.h	(revision 40305)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_2/version.h#L1
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 324
+#define RUBY_PATCHLEVEL 325
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

Property changes on: ruby_1_9_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r34306


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