diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-11 12:08:55 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-11 12:08:55 +0000 |
commit | 42acabf11b689bc184adbe220c8d2b57f7b60737 (patch) | |
tree | 32ee0bc636212ed55995a43f80c4918a27844153 | |
parent | d1b82673bcf7e67c836f8f7f32a299ca81d10b47 (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_6@67514 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 | 6 |
3 files changed, 5 insertions, 4 deletions
@@ -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 @@ -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" |