yugui	2011-05-31 09:13:30 +0900 (Tue, 31 May 2011)

  New Revision: 31844

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

  Log:
    merges r31822 and r31823 from trunk into ruby_1_9_2.
    --
    * insns.def (opt_mult): as r31805, volatile it.
      Without this, clang -O fails calculation.
    
    * numeric.c (fix_mul): ditto.
    
    * rational.c (f_imul): ditto.
    --
    Fix mixed declarations in r31822.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/insns.def
    branches/ruby_1_9_2/numeric.c
    branches/ruby_1_9_2/rational.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31843)
+++ ruby_1_9_2/ChangeLog	(revision 31844)
@@ -1,3 +1,12 @@
+Mon May 30 15:44:16 2011  NARUSE, Yui  <naruse@r...>
+
+	* insns.def (opt_mult): as r31805, volatile it.
+	  Without this, clang -O fails calculation.
+
+	* numeric.c (fix_mul): ditto.
+
+	* rational.c (f_imul): ditto.
+
 Mon May 30 10:26:51 2011  NARUSE, Yui  <naruse@r...>
 
 	* numeric.c (int_pow): make sure to assign the result of x * z.
Index: ruby_1_9_2/insns.def
===================================================================
--- ruby_1_9_2/insns.def	(revision 31843)
+++ ruby_1_9_2/insns.def	(revision 31844)
@@ -1445,13 +1445,14 @@
 {
     if (FIXNUM_2_P(recv, obj) &&
 	BASIC_OP_UNREDEFINED_P(BOP_MULT)) {
-	long a, b, c;
+	long a, b;
 
 	a = FIX2LONG(recv);
 	if (a == 0) {
 	    val = recv;
 	}
 	else {
+	    volatile long c;
 	    b = FIX2LONG(obj);
 	    c = a * b;
 
Index: ruby_1_9_2/numeric.c
===================================================================
--- ruby_1_9_2/numeric.c	(revision 31843)
+++ ruby_1_9_2/numeric.c	(revision 31844)
@@ -2322,7 +2322,7 @@
 #if SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG
 	LONG_LONG d;
 #else
-	long c;
+	volatile long c;
 	VALUE r;
 #endif
 
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31843)
+++ ruby_1_9_2/version.h	(revision 31844)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 261
+#define RUBY_PATCHLEVEL 262
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/rational.c
===================================================================
--- ruby_1_9_2/rational.c	(revision 31843)
+++ ruby_1_9_2/rational.c	(revision 31844)
@@ -588,7 +588,7 @@
 f_imul(long a, long b)
 {
     VALUE r;
-    long c;
+    volatile long c;
 
     if (a == 0 || b == 0)
 	return ZERO;

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