diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-09 11:39:53 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-09 11:39:53 +0000 |
| commit | 712c7168bf55f61df33efa2a7552e4b3c25b306c (patch) | |
| tree | a8f7e877849ffca9db3de17e3fe783d367f25933 /rational.c | |
| parent | 4329b14cfbe4c91561c12ba7d1b40c66faea30b5 (diff) | |
| download | ruby-712c7168bf55f61df33efa2a7552e4b3c25b306c.tar.gz | |
* internal.h (MUL_OVERFLOW_SIGNED_INTEGER_P): New macro.
(MUL_OVERFLOW_FIXNUM_P): Ditto.
(MUL_OVERFLOW_LONG_P): Ditto.
* array.c (rb_ary_product): Don't overflow on signed integer
multiplication.
* numeric.c (fix_mul): Ditto.
(int_pow): Ditto.
* rational.c (f_imul): Ditto.
* insns.def (opt_mult): Ditto.
* thread.c (sleep_timeval): Don't overflow on signed integer addition.
* bignum.c (rb_int2big): Don't overflow on signed integer negation.
(rb_big2ulong): Ditto.
(rb_big2long): Ditto.
(rb_big2ull): Ditto.
(rb_big2ll): Ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'rational.c')
| -rw-r--r-- | rational.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/rational.c b/rational.c index e96cace65c..7b3e851e7e 100644 --- a/rational.c +++ b/rational.c @@ -639,7 +639,6 @@ inline static VALUE f_imul(long a, long b) { VALUE r; - volatile long c; if (a == 0 || b == 0) return ZERO; @@ -648,10 +647,10 @@ f_imul(long a, long b) else if (b == 1) return LONG2NUM(a); - c = a * b; - r = LONG2NUM(c); - if (NUM2LONG(r) != c || (c / a) != b) + if (MUL_OVERFLOW_LONG_P(a, b)) r = rb_big_mul(rb_int2big(a), rb_int2big(b)); + else + r = LONG2NUM(a * b); return r; } |