From 603f95a0ed37d90854f80393881fb38ab29128a7 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 2 Oct 2018 16:42:21 +0000
Subject: Fix Rational of Float

[ruby-core:89239] [Bug #15189]

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

(limited to 'object.c')

diff --git a/object.c b/object.c
index 7d6e47932c..6a66159a94 100644
--- a/object.c
+++ b/object.c
@@ -3421,9 +3421,18 @@ rb_str_to_dbl(VALUE str, int badcheck)
 #define big2dbl_without_to_f(x) rb_big2dbl(x)
 #define int2dbl_without_to_f(x) \
     (FIXNUM_P(x) ? fix2dbl_without_to_f(x) : big2dbl_without_to_f(x))
-#define rat2dbl_without_to_f(x) \
-    (int2dbl_without_to_f(rb_rational_num(x)) / \
-     int2dbl_without_to_f(rb_rational_den(x)))
+static inline double
+rat2dbl_without_to_f(VALUE x)
+{
+    VALUE num = rb_rational_num(x);
+    VALUE den = rb_rational_den(x);
+    if (RB_INTEGER_TYPE_P(num) && RB_INTEGER_TYPE_P(den)) {
+        return int2dbl_without_to_f(num) / int2dbl_without_to_f(den);
+    }
+    else {
+        return NUM2DBL(num) / NUM2DBL(den);
+    }
+}
 
 #define special_const_to_float(val, pre, post) \
     switch (val) { \
-- 
cgit v1.2.3