diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-15 15:43:02 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-15 15:43:02 +0000 |
commit | 4ccf22e18d5e2c541ac195bf7e71af3abb5d82f7 (patch) | |
tree | 8535d9c9f4dcd3564d7d18e7911dd309395731d8 | |
parent | bbf24e6d69a60ad691a00e55ed7ea9ae270d8620 (diff) |
merge revision(s) r42224,r42225,r42226,r42227,r42228,r42229,r42232: [Backport #8703]
* hash.c (rb_hash_assoc): performance improvement by replacing
compare function in RHASH(hash)->ntbl->type temporarily.
* hash.c (rb_hash_assoc): aggregate object can be initialized only
with link time constants.
* hash.c (rb_hash_initialize_copy): clear old table before copy new
table.
* hash.c (rb_hash_initialize_copy): copy st_table type even if empty.
[ruby-core:56256] [Bug #8703]
* hash.c (rb_hash_initialize_copy): copy st_table type even if empty.
[ruby-core:56256] [Bug #8703]
* hash.c (rb_hash_initialize_copy): clear old table before copy new
table.
* hash.c (rb_hash_assoc): aggregate object can be initialized only
with link time constants.
* hash.c (rb_hash_assoc): revert r42224. table->type->compare is
called only if hashes are matched.
* test/ruby/test_hash.rb: add a test to check using #== to compare.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 27 | ||||
-rw-r--r-- | hash.c | 12 | ||||
-rw-r--r-- | test/ruby/test_hash.rb | 17 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 52 insertions, 6 deletions
@@ -1,3 +1,30 @@ +Sun Feb 16 00:27:04 2014 Masaki Matsushita <glass.saga@gmail.com> + + * hash.c (rb_hash_assoc): revert r42224. table->type->compare is + called only if hashes are matched. + + * test/ruby/test_hash.rb: add a test to check using #== to compare. + +Sun Feb 16 00:27:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * hash.c (rb_hash_initialize_copy): copy st_table type even if empty. + [ruby-core:56256] [Bug #8703] + +Sun Feb 16 00:27:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * hash.c (rb_hash_initialize_copy): clear old table before copy new + table. + +Sun Feb 16 00:27:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * hash.c (rb_hash_assoc): aggregate object can be initialized only + with link time constants. + +Sun Feb 16 00:27:04 2014 Masaki Matsushita <glass.saga@gmail.com> + + * hash.c (rb_hash_assoc): performance improvement by replacing + compare function in RHASH(hash)->ntbl->type temporarily. + Sun Feb 16 00:01:16 2014 Tanaka Akira <akr@fsij.org> * lib/resolv.rb: Ignore name servers which cause EAFNOSUPPORT on @@ -1223,14 +1223,22 @@ replace_i(VALUE key, VALUE val, VALUE hash) static VALUE rb_hash_initialize_copy(VALUE hash, VALUE hash2) { + st_table *ntbl; + rb_hash_modify_check(hash); hash2 = to_hash(hash2); Check_Type(hash2, T_HASH); - if (!RHASH_EMPTY_P(hash2)) { + ntbl = RHASH(hash)->ntbl; + if (RHASH(hash2)->ntbl) { + if (ntbl) st_free_table(ntbl); RHASH(hash)->ntbl = st_copy(RHASH(hash2)->ntbl); - rb_hash_rehash(hash); + if (RHASH(hash)->ntbl->num_entries) + rb_hash_rehash(hash); + } + else if (ntbl) { + st_clear(ntbl); } if (FL_TEST(hash2, HASH_PROC_DEFAULT)) { diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb index 3fedec460f..c84ee74adf 100644 --- a/test/ruby/test_hash.rb +++ b/test/ruby/test_hash.rb @@ -102,6 +102,12 @@ class TestHash < Test::Unit::TestCase assert_raises(TypeError) { h.dup } end + def test_clear_initialize_copy + h = @cls[1=>2] + h.instance_eval {initialize_copy({})} + assert_empty(h) + end + def test_dup_will_rehash set1 = @cls[] set2 = @cls[set1 => true] @@ -892,11 +898,12 @@ class TestHash < Test::Unit::TestCase assert_equal([3,4], @cls[1=>2, 3=>4, 5=>6].assoc(3)) assert_nil(@cls[1=>2, 3=>4, 5=>6].assoc(4)) assert_equal([1.0,1], @cls[1.0=>1].assoc(1)) + assert_equal([1.0,1], @cls[1.0=>1].assoc(1)) end def test_rassoc assert_equal([3,4], @cls[1=>2, 3=>4, 5=>6].rassoc(4)) - assert_nil({1=>2, 3=>4, 5=>6}.rassoc(3)) + assert_nil(@cls[1=>2, 3=>4, 5=>6].rassoc(3)) end def test_flatten @@ -925,13 +932,17 @@ class TestHash < Test::Unit::TestCase def test_compare_by_identity a = "foo" - assert(!{}.compare_by_identity?) - h = { a => "bar" } + assert_not_predicate(@cls[], :compare_by_identity?) + h = @cls[a => "bar"] assert(!h.compare_by_identity?) h.compare_by_identity assert(h.compare_by_identity?) #assert_equal("bar", h[a]) assert_nil(h["foo"]) + + bug8703 = '[ruby-core:56256] [Bug #8703] copied identhash' + h.clear + assert_predicate(h.dup, :compare_by_identity?, bug8703) end class ObjWithHash @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-02-16" -#define RUBY_PATCHLEVEL 413 +#define RUBY_PATCHLEVEL 414 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 |