From 86a4ef44e954126825adc49ee40d22f165f5d831 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 20 Mar 2016 09:47:20 +0000
Subject: * time.c (add): remove FIXABLE() which is in LONG2NUM().

* time.c (sub): ditto.

* time.c (mul): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 time.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'time.c')

diff --git a/time.c b/time.c
index 80eacf07f1..c51bd5bff7 100644
--- a/time.c
+++ b/time.c
@@ -75,9 +75,7 @@ static VALUE
 add(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y)) {
-        long l = FIX2LONG(x) + FIX2LONG(y);
-        if (FIXABLE(l)) return LONG2FIX(l);
-        return LONG2NUM(l);
+        return LONG2NUM(FIX2LONG(x) + FIX2LONG(y));
     }
     if (RB_TYPE_P(x, T_BIGNUM)) return rb_big_plus(x, y);
     return rb_funcall(x, '+', 1, y);
@@ -87,9 +85,7 @@ static VALUE
 sub(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y)) {
-        long l = FIX2LONG(x) - FIX2LONG(y);
-        if (FIXABLE(l)) return LONG2FIX(l);
-        return LONG2NUM(l);
+        return LONG2NUM(FIX2LONG(x) - FIX2LONG(y));
     }
     if (RB_TYPE_P(x, T_BIGNUM)) return rb_big_minus(x, y);
     return rb_funcall(x, '-', 1, y);
@@ -144,10 +140,7 @@ mul(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y)) {
 #if HAVE_LONG_LONG && SIZEOF_LONG * 2 <= SIZEOF_LONG_LONG
-        LONG_LONG ll = (LONG_LONG)FIX2LONG(x) * FIX2LONG(y);
-        if (FIXABLE(ll))
-            return LONG2FIX(ll);
-        return LL2NUM(ll);
+        return LL2NUM((LONG_LONG)FIX2LONG(x) * FIX2LONG(y));
 #else
 	long z;
 	if (long_mul(FIX2LONG(x), FIX2LONG(y), &z))
-- 
cgit v1.2.3