kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix complex hash keys to work with compaction

Browse source 
For example when an array containing objects is a hash key, the contents
of the array may move which can cause the hash value for the array to
change.   This commit makes the default `hash` value based off the
object id, so the hash value will remain stable.

Fixes test/shell/test_command_processor.rb
This commit is contained in:
Aaron Patterson 2019-04-23 12:10:52 -07:00
parent cf930985da
commit 75061f46ae
No known key found for this signature in database
GPG key ID: 953170BCB4FFAFC6
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hash.c
View file

@ -272,7 +272,11 @@ rb_objid_hash(st_index_t index)
static st_index_t
objid_hash(VALUE obj)
{
return (st_index_t)st_index_hash((st_index_t)obj);
#if SIZEOF_LONG == SIZEOF_VOIDP
return (st_index_t)st_index_hash((st_index_t)NUM2LONG(rb_obj_id(obj)));
#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
return (st_index_t)st_index_hash((st_index_t)NUM2LL(rb_obj_id(obj)));
#endif
}
VALUE

7
test/ruby/test_gc_compact.rb
View file

@ -121,4 +121,11 @@ class TestGCCompact < Test::Unit::TestCase
skip "couldn't get objects to collide" if collisions == 0
assert_operator collisions, :>, 0
end
def test_complex_hash_keys
list_of_objects = big_list
hash = list_of_objects.hash
GC.verify_compaction_references
assert_equal hash, list_of_objects.hash
end
end