mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67706 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
bf4a14a274
commit
e31f9b0aff
3 changed files with 3 additions and 2 deletions
2
proc.c
2
proc.c
|
|
@ -1550,7 +1550,7 @@ method_hash(VALUE method)
|
||||||
hash = rb_hash_method_entry(hash, m->me);
|
hash = rb_hash_method_entry(hash, m->me);
|
||||||
hash = rb_hash_end(hash);
|
hash = rb_hash_end(hash);
|
||||||
|
|
||||||
return INT2FIX(hash);
|
return ST2FIX(hash);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -197,6 +197,7 @@ class TestMethod < Test::Unit::TestCase
|
||||||
def o.foo; end
|
def o.foo; end
|
||||||
assert_kind_of(Integer, o.method(:foo).hash)
|
assert_kind_of(Integer, o.method(:foo).hash)
|
||||||
assert_equal(Array.instance_method(:map).hash, Array.instance_method(:collect).hash)
|
assert_equal(Array.instance_method(:map).hash, Array.instance_method(:collect).hash)
|
||||||
|
assert_kind_of(String, o.method(:foo).hash.to_s)
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_owner
|
def test_owner
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#define RUBY_VERSION "2.5.6"
|
#define RUBY_VERSION "2.5.6"
|
||||||
#define RUBY_RELEASE_DATE "2019-04-30"
|
#define RUBY_RELEASE_DATE "2019-04-30"
|
||||||
#define RUBY_PATCHLEVEL 163
|
#define RUBY_PATCHLEVEL 164
|
||||||
|
|
||||||
#define RUBY_RELEASE_YEAR 2019
|
#define RUBY_RELEASE_YEAR 2019
|
||||||
#define RUBY_RELEASE_MONTH 4
|
#define RUBY_RELEASE_MONTH 4
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue