naruse	2019-04-11 21:09:16 +0900 (Thu, 11 Apr 2019)

  New Revision: 67515

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

  Log:
    merge revision(s) 67467: [Backport #15756]
    
    range.c: force hash values fixable
    
    * range.c (method_hash): force hash values fixable on LLP64
      environment.  [ruby-core:92191] [Bug #15756]

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/proc.c
    branches/ruby_2_6/test/ruby/test_method.rb
    branches/ruby_2_6/version.h
Index: ruby_2_6/proc.c
===================================================================
--- ruby_2_6/proc.c	(revision 67514)
+++ ruby_2_6/proc.c	(revision 67515)
@@ -1547,7 +1547,7 @@ method_hash(VALUE method) https://github.com/ruby/ruby/blob/trunk/ruby_2_6/proc.c#L1547
     hash = rb_hash_method_entry(hash, m->me);
     hash = rb_hash_end(hash);
 
-    return INT2FIX(hash);
+    return ST2FIX(hash);
 }
 
 /*
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 67514)
+++ ruby_2_6/version.h	(revision 67515)
@@ -1,6 +1,6 @@ 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 52
+#define RUBY_PATCHLEVEL 53
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_6/test/ruby/test_method.rb
===================================================================
--- ruby_2_6/test/ruby/test_method.rb	(revision 67514)
+++ ruby_2_6/test/ruby/test_method.rb	(revision 67515)
@@ -197,6 +197,7 @@ class TestMethod < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_6/test/ruby/test_method.rb#L197
     def o.foo; end
     assert_kind_of(Integer, o.method(:foo).hash)
     assert_equal(Array.instance_method(:map).hash, Array.instance_method(:collect).hash)
+    assert_kind_of(String, o.method(:foo).hash.to_s)
   end
 
   def test_owner
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 67514)
+++ ruby_2_6	(revision 67515)

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

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