From 5164ba53f2b17ead1e0c471652012ed4557b4b8d Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 13 Dec 2009 17:48:12 +0000 Subject: merge revision(s) 25659:25661: * hash.c (rb_hash): always return a fixnum value because a return value of rb_hash may be used as a hash value itself and bignums have no unique VALUE. * test/ruby/test_hash.rb: add a test for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@26081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- hash.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'hash.c') diff --git a/hash.c b/hash.c index 771eab1069..5574476ff1 100644 --- a/hash.c +++ b/hash.c @@ -81,7 +81,19 @@ VALUE rb_hash(obj) VALUE obj; { - return rb_funcall(obj, id_hash, 0); + VALUE hval = rb_funcall(obj, id_hash, 0); + retry: + switch (TYPE(hval)) { + case T_FIXNUM: + return hval; + + case T_BIGNUM: + return LONG2FIX(((long*)(RBIGNUM_DIGITS(hval)))[0]); + + default: + hval = rb_to_int(hval); + goto retry; + } } static int @@ -102,10 +114,7 @@ rb_any_hash(a) break; default: - hval = rb_funcall(a, id_hash, 0); - if (!FIXNUM_P(hval)) { - hval = rb_funcall(hval, '%', 1, INT2FIX(536870923)); - } + hval = rb_hash(a); hnum = (int)FIX2LONG(hval); } hnum <<= 1; -- cgit v1.2.3