summaryrefslogtreecommitdiff
path: root/hash.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-27 02:53:45 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-27 02:53:45 +0000
commit149d24719b7eb3af09f3cd77c0c1a2d2ce578df2 (patch)
tree5dc8d28386555348222a41e3219641b3edf60178 /hash.c
parentf2e6cb4f3de6ca47a77e2c7bd0df39e3457f625b (diff)
merges r22308 from trunk into ruby_1_9_1.
-- * 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_9_1@25938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
-rw-r--r--hash.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/hash.c b/hash.c
index bfeee51491..fa08b535d6 100644
--- a/hash.c
+++ b/hash.c
@@ -57,7 +57,19 @@ rb_any_cmp(VALUE a, VALUE b)
VALUE
rb_hash(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
@@ -77,10 +89,7 @@ rb_any_hash(VALUE 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;