naruse	2012-02-06 00:06:50 +0900 (Mon, 06 Feb 2012)

  New Revision: 34432

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

  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 files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/json/parser/parser.c
    branches/ruby_1_9_3/ext/json/parser/parser.rl
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34431)
+++ ruby_1_9_3/ChangeLog	(revision 34432)
@@ -1,3 +1,9 @@
+Mon Feb  6 00:06:39 2012  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
+
 Fri Feb  3 16:16:10 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/ruby/envutil.rb (EnvUtil.invoke_ruby): yield also child pid
Index: ruby_1_9_3/ext/json/parser/parser.rl
===================================================================
--- ruby_1_9_3/ext/json/parser/parser.rl	(revision 34431)
+++ ruby_1_9_3/ext/json/parser/parser.rl	(revision 34432)
@@ -393,6 +393,7 @@
 {
     char *p = string, *pe = string, *unescape;
     int unescape_len;
+    char buf[4];
 
     while (pe < stringEnd) {
         if (*pe == '\\') {
@@ -425,7 +426,6 @@
                     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_3/ext/json/parser/parser.c
===================================================================
--- ruby_1_9_3/ext/json/parser/parser.c	(revision 34431)
+++ ruby_1_9_3/ext/json/parser/parser.c	(revision 34432)
@@ -1293,6 +1293,7 @@
 {
     char *p = string, *pe = string, *unescape;
     int unescape_len;
+    char buf[4];
 
     while (pe < stringEnd) {
         if (*pe == '\\') {
@@ -1325,7 +1326,6 @@
                     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_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34431)
+++ ruby_1_9_3/version.h	(revision 34432)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 31
+#define RUBY_PATCHLEVEL 32
 
-#define RUBY_RELEASE_DATE "2012-02-03"
+#define RUBY_RELEASE_DATE "2012-02-06"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 6
 
 #include "ruby/version.h"
 

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