archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merged r22308. [ruby-dev:39637]

Browse source 
* 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@25661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2009-11-05 12:22:24 +00:00
parent 60a40ecaf6
commit ee3e66e7a6
4 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hash.c
View file

@ -83,7 +83,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
@ -104,10 +116,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;