merge revision(s) 67468: [Backport #15757]

	range.c: force hash values fixable

	* range.c (range_hash): force hash values fixable on LLP64
	  environment.  [ruby-core:92194] [Bug #15757]

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

3 files changed, 5 insertions, 4 deletions

diff --git a/range.c b/range.c
index ac9affd872..293d9bdbcf 100644
--- a/range.c
+++ b/range.c
@@ -229,7 +229,7 @@ range_hash(VALUE range)
     hash = rb_hash_uint(hash, EXCL(range) << 24);
     hash = rb_hash_end(hash);
 
-    return LONG2FIX(hash);
+    return ST2FIX(hash);
 }
 
 static void
diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb
index f58d1f817c..a7d34655b3 100644
--- a/test/ruby/test_range.rb
+++ b/test/ruby/test_range.rb
@@ -203,6 +203,7 @@ class TestRange < Test::Unit::TestCase
     assert_not_equal((0..1).hash, (0...1).hash)
     assert_equal((0..nil).hash, (0..nil).hash)
     assert_not_equal((0..nil).hash, (0...nil).hash)
+    assert_kind_of(String, (0..1).hash.to_s)
   end
 
   def test_step
diff --git a/version.h b/version.h
index d68e3a45d1..762da5fb1b 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.6.3"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 51
+#define RUBY_PATCHLEVEL 52
 
 #define RUBY_RELEASE_YEAR 2019
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_MONTH 4
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"