1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

object.c: hash value from objid with salt

Browse Source 
* hash.c (rb_objid_hash): return hash value from object ID with a
  salt, extract from rb_any_hash().
* object.c (rb_obj_hash): return same value as rb_any_hash().
  fix r44125.  [ruby-core:59638] [Bug #9381]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-01-08 06:55:24 +00:00
parent 06f624b891
commit ab6efa5be2
4 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Wed Jan 8 15:55:21 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (rb_objid_hash): return hash value from object ID with a
salt, extract from rb_any_hash().
* object.c (rb_obj_hash): return same value as rb_any_hash().
fix r44125. [ruby-core:59638] [Bug #9381]
Wed Jan 8 13:12:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jan 8 13:12:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/timeout.rb (Timeout::ExitException.catch): pass arguments * lib/timeout.rb (Timeout::ExitException.catch): pass arguments

15
hash.c
View File

@ -122,6 +122,8 @@ rb_hash(VALUE obj)
return hval; return hval;
} }
st_index_t rb_objid_hash(st_index_t index);
static st_index_t static st_index_t
rb_any_hash(VALUE a) rb_any_hash(VALUE a)
{ {
@ -130,9 +132,7 @@ rb_any_hash(VALUE a)
if (SPECIAL_CONST_P(a)) { if (SPECIAL_CONST_P(a)) {
if (a == Qundef) return 0; if (a == Qundef) return 0;
hnum = rb_hash_start((st_index_t)a); hnum = rb_objid_hash((st_index_t)a);
hnum = rb_hash_uint(hnum, (st_index_t)rb_any_hash);
hnum = rb_hash_end(hnum);
} }
else if (BUILTIN_TYPE(a) == T_STRING) { else if (BUILTIN_TYPE(a) == T_STRING) {
hnum = rb_str_hash(a); hnum = rb_str_hash(a);
@ -145,6 +145,15 @@ rb_any_hash(VALUE a)
return (st_index_t)RSHIFT(hnum, 1); return (st_index_t)RSHIFT(hnum, 1);
} }
st_index_t
rb_objid_hash(st_index_t index)
{
st_index_t hnum = rb_hash_start(index);
hnum = rb_hash_uint(hnum, (st_index_t)rb_any_hash);
hnum = rb_hash_end(hnum);
return hnum;
}
static const struct st_hash_type objhash = { static const struct st_hash_type objhash = {
rb_any_cmp, rb_any_cmp,
rb_any_hash, rb_any_hash,

3
object.c
View File

@ -161,6 +161,7 @@ rb_obj_equal(VALUE obj1, VALUE obj2)
VALUE VALUE
rb_obj_hash(VALUE obj) rb_obj_hash(VALUE obj)
{ {
st_index_t rb_objid_hash(st_index_t index);
VALUE oid = rb_obj_id(obj); VALUE oid = rb_obj_id(obj);
#if SIZEOF_LONG == SIZEOF_VOIDP #if SIZEOF_LONG == SIZEOF_VOIDP
st_index_t index = NUM2LONG(oid); st_index_t index = NUM2LONG(oid);
@ -169,7 +170,7 @@ rb_obj_hash(VALUE obj)
#else #else
# error not supported # error not supported
#endif #endif
st_index_t h = rb_hash_end(rb_hash_start(index)); st_index_t h = rb_objid_hash(index);
return LONG2FIX(h); return LONG2FIX(h);
} }

21
test/ruby/test_hash.rb
View File

@ -1215,6 +1215,27 @@ class TestHash < Test::Unit::TestCase
assert_no_memory_leak([], prepare, code, bug9187) assert_no_memory_leak([], prepare, code, bug9187)
end end
def test_wrapper_of_special_const
bug9381 = '[ruby-core:59638] [Bug #9381]'
wrapper = Class.new do
def initialize(obj)
@obj = obj
end
def hash
@obj.hash
end
def eql?(other)
@obj.eql?(other)
end
end
hash = {5 => bug9381}
assert_equal(bug9381, hash[wrapper.new(5)])
end
class TestSubHash < TestHash class TestSubHash < TestHash
class SubHash < Hash class SubHash < Hash
def reject(*) def reject(*)