diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-30 13:02:42 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-30 13:02:42 +0000 |
commit | bf4a14a274fbcc02356336449c52d3553938014a (patch) | |
tree | e4f187bc652551f30c75674b3d645e85cc6396c3 | |
parent | 860e548a637a705b0d88b18cca14590d55264dcd (diff) |
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_5@67705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | range.c | 2 | ||||
-rw-r--r-- | test/ruby/test_range.rb | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -232,7 +232,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 fef7acc062..da883767bc 100644 --- a/test/ruby/test_range.rb +++ b/test/ruby/test_range.rb @@ -165,6 +165,7 @@ class TestRange < Test::Unit::TestCase assert_kind_of(Integer, (0..1).hash) assert_equal((0..1).hash, (0..1).hash) assert_not_equal((0..1).hash, (0...1).hash) + assert_kind_of(String, (0..1).hash.to_s) end def test_step @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.5.6" #define RUBY_RELEASE_DATE "2019-04-30" -#define RUBY_PATCHLEVEL 162 +#define RUBY_PATCHLEVEL 163 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 4 |