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.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/insns.def b/insns.def
index f75007dca2..d1158e6056 100644
--- a/insns.def
+++ b/insns.def
@@ -1445,13 +1445,14 @@ opt_mult
 {
     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;