From 7a4401903177bd0e81e7e62c09cc6bc06f6a399d Mon Sep 17 00:00:00 2001 From: usa Date: Sat, 1 Oct 2016 17:06:21 +0000 Subject: [PATCH] * string.c (rb_str_hash_m): st_index_t is not guaranteed as the same size with int, and of course also not guaranteed the value can be Fixnum. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ string.c | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1cc19899de..acba651c9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Oct 2 02:04:12 2016 NAKAMURA Usaku + + * string.c (rb_str_hash_m): st_index_t is not guaranteed as the same + size with int, and of course also not guaranteed the value can be + Fixnum. + Sun Oct 2 02:03:06 2016 NAKAMURA Usaku * numeric.c (rb_fix2str): detect unnormalized Fixnum value. diff --git a/string.c b/string.c index 8a57bc9048..1c27c89e8b 100644 --- a/string.c +++ b/string.c @@ -2963,7 +2963,13 @@ static VALUE rb_str_hash_m(VALUE str) { st_index_t hval = rb_str_hash(str); - return INT2FIX(hval); +#if SIZEOF_LONG == SIZEOF_VOIDP + return ULONG2NUM(hval); +#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP + return ULL2NUM(hval); +#else +# error unsupported platform +#endif } #define lesser(a,b) (((a)>(b))?(b):(a))