* time.c (mod): Add Fixnum case.

* time.c (quo): c can be Fixnum except a == FIXNUM_MIN && b == -1.
  Such case can be optimized out because quo()'s argument is constant.

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

2 files changed, 15 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index eab1eb60a0..4ef6222be7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 21 22:15:11 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (mod): Add Fixnum case.
+
+	* time.c (quo): c can be Fixnum except a == FIXNUM_MIN && b == -1.
+	  Such case can be optimized out because quo()'s argument is constant.
+
 Mon Mar 21 22:09:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* internal.h (rb_fix_mul_fix): multiply converted values, not
diff --git a/time.c b/time.c
index 908ad2fcd1..b725190780 100644
--- a/time.c
+++ b/time.c
@@ -107,10 +107,12 @@ mul(VALUE x, VALUE y)
 static VALUE
 mod(VALUE x, VALUE y)
 {
-    switch (TYPE(x)) {
-      case T_BIGNUM: return rb_big_modulo(x, y);
-      default: return rb_funcall(x, '%', 1, y);
+    if (FIXNUM_P(y)) {
+	if (FIX2LONG(y) == 0) rb_num_zerodiv();
+	if (FIXNUM_P(x)) return LONG2FIX(rb_mod(FIX2LONG(x), FIX2LONG(y)));
     }
+    if (RB_TYPE_P(x, T_BIGNUM)) return rb_big_modulo(x, y);
+    return rb_funcall(x, '%', 1, y);
 }
 
 #define neg(x) (sub(INT2FIX(0), (x)))
@@ -124,9 +126,10 @@ quo(VALUE x, VALUE y)
         a = FIX2LONG(x);
         b = FIX2LONG(y);
         if (b == 0) rb_num_zerodiv();
+        if (a == FIXNUM_MIN && b == -1) LONG2NUM(-a);
         c = a / b;
-        if (c * b == a) {
-            return LONG2NUM(c);
+        if (a % b == 0) {
+            return LONG2FIX(c);
         }
     }
     ret = rb_funcall(x, id_quo, 1, y);