From 61277d473cba50897bdce62ee0045983106999df Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 5 Aug 2017 01:45:39 +0000
Subject: [PATCH] merge revision(s) 58523: [Backport #13528]

	rational.c: canonicalization case

	* rational.c (float_numerator, float_denominator): fix for
	  canonicalization case where `Float#to_r` could return an Integer
	  not a Rational.  although mathn.rb has been removed in the
	  trunk, fix for the backport purpose.
	  [ruby-core:80942] [Bug #13528]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@59510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 rational.c | 14 ++++++++++++--
 version.h  |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/rational.c b/rational.c
index 460f82cfeb..6786131bce 100644
--- a/rational.c
+++ b/rational.c
@@ -2022,9 +2022,14 @@ static VALUE
 float_numerator(VALUE self)
 {
     double d = RFLOAT_VALUE(self);
+    VALUE r;
     if (isinf(d) || isnan(d))
 	return self;
-    return nurat_numerator(float_to_r(self));
+    r = float_to_r(self);
+    if (canonicalization && k_integer_p(r)) {
+	return r;
+    }
+    return nurat_numerator(r);
 }
 
 /*
@@ -2040,9 +2045,14 @@ static VALUE
 float_denominator(VALUE self)
 {
     double d = RFLOAT_VALUE(self);
+    VALUE r;
     if (isinf(d) || isnan(d))
 	return INT2FIX(1);
-    return nurat_denominator(float_to_r(self));
+    r = float_to_r(self);
+    if (canonicalization && k_integer_p(r)) {
+	return ONE;
+    }
+    return nurat_denominator(r);
 }
 
 /*
diff --git a/version.h b/version.h
index da628b993f..af8af5cb0c 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.4.2"
 #define RUBY_RELEASE_DATE "2017-08-05"
-#define RUBY_PATCHLEVEL 173
+#define RUBY_PATCHLEVEL 174
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 8