naruse	2019-04-11 21:08:55 +0900 (Thu, 11 Apr 2019)

  New Revision: 67514

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=67514

  Log:
    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]

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/range.c
    branches/ruby_2_6/test/ruby/test_range.rb
    branches/ruby_2_6/version.h
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 67513)
+++ ruby_2_6/version.h	(revision 67514)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #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"
 
Index: ruby_2_6/test/ruby/test_range.rb
===================================================================
--- ruby_2_6/test/ruby/test_range.rb	(revision 67513)
+++ ruby_2_6/test/ruby/test_range.rb	(revision 67514)
@@ -203,6 +203,7 @@ class TestRange < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_6/test/ruby/test_range.rb#L203
     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
Index: ruby_2_6/range.c
===================================================================
--- ruby_2_6/range.c	(revision 67513)
+++ ruby_2_6/range.c	(revision 67514)
@@ -229,7 +229,7 @@ range_hash(VALUE range) https://github.com/ruby/ruby/blob/trunk/ruby_2_6/range.c#L229
     hash = rb_hash_uint(hash, EXCL(range) << 24);
     hash = rb_hash_end(hash);
 
-    return LONG2FIX(hash);
+    return ST2FIX(hash);
 }
 
 static void
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 67513)
+++ ruby_2_6	(revision 67514)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r67468

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/