From d60738f6f1fb182f09a4706852f535f62772c09b Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 7 Dec 2018 12:03:16 +0000 Subject: Adjust reserved hash values The reserved hash values in hash.c must be consistend with st.c. [ruby-core:90356] [Bug #15389] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- hash.c | 9 +++++++-- st.c | 3 +++ test/ruby/test_hash.rb | 9 +++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hash.c b/hash.c index c41b8e7387..63333b6b5f 100644 --- a/hash.c +++ b/hash.c @@ -311,14 +311,16 @@ static const struct st_hash_type identhash = { #define PTR_EQUAL(ptr, hash_val, key_) \ ((ptr)->hash == (hash_val) && EQUAL((key_), (ptr)->key)) -#define RESERVED_HASH_VAL ((st_hash_t) 0) -#define RESERVED_HASH_SUBSTITUTION_VAL (~(st_hash_t) 0) +#define RESERVED_HASH_VAL (~(st_hash_t) 0) +#define RESERVED_HASH_SUBSTITUTION_VAL ((st_hash_t) 0) #define SET_KEY(entry, _key) (entry)->key = (_key) #define SET_HASH(entry, _hash) (entry)->hash = (_hash) #define SET_RECORD(entry, _value) (entry)->record = (_value) typedef st_data_t st_hash_t; +extern const st_hash_t st_reserved_hash_val; +extern const st_hash_t st_reserved_hash_substitution_val; static inline st_hash_t do_hash(st_data_t key) @@ -5792,6 +5794,9 @@ Init_Hash(void) #undef rb_intern #define rb_intern(str) rb_intern_const(str) + RUBY_ASSERT(RESERVED_HASH_VAL == st_reserved_hash_val); + RUBY_ASSERT(RESERVED_HASH_SUBSTITUTION_VAL == st_reserved_hash_substitution_val); + id_hash = rb_intern("hash"); id_yield = rb_intern("yield"); id_default = rb_intern("default"); diff --git a/st.c b/st.c index 5256f95b6e..c6b3644e39 100644 --- a/st.c +++ b/st.c @@ -315,6 +315,9 @@ static const struct st_features features[] = { #define RESERVED_HASH_VAL (~(st_hash_t) 0) #define RESERVED_HASH_SUBSTITUTION_VAL ((st_hash_t) 0) +const st_hash_t st_reserved_hash_val = RESERVED_HASH_VAL; +const st_hash_t st_reserved_hash_substitution_val = RESERVED_HASH_SUBSTITUTION_VAL; + /* Return hash value of KEY for table TAB. */ static inline st_hash_t do_hash(st_data_t key, st_table *tab) diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 7db3c27f87..c934d1015e 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -1712,6 +1712,15 @@ class TestHash < Test::Unit::TestCase assert_equal(0, 1_000_000.times.count{a=Object.new.hash; b=Object.new.hash; 0 + a + b != 0 + b + a}, bug14218) end + def test_reserved_hash_val + s = Struct.new(:hash) + h = {} + keys = [*0..8] + keys.each {|i| h[s.new(i)]=true} + msg = proc {h.inspect} + assert_equal(keys, h.keys.map(&:hash), msg) + end + class TestSubHash < TestHash class SubHash < Hash def reject(*) -- cgit v1.2.3