summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-29 07:51:23 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-29 07:51:23 +0000
commitbe24b385ffb2c31e5f0974aee55bce1e37f1bc2b (patch)
tree8ab725e28efaeb91cdf7f216dce8e6ac62907dce
parentac82a1b2058a0f5049bf77895003cbf0ba092f4c (diff)
ChangeLog: commit miss
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog15
-rw-r--r--hash.c19
-rw-r--r--test/ruby/test_hash.rb14
3 files changed, 25 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 991148f3cbc..a0ed1680617 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,3 @@
-Mon Jul 29 16:48:38 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (rb_hash_initialize_copy): copy st_table type even if empty.
- [ruby-core:56256] [Bug #8703]
-
-Mon Jul 29 16:34:29 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (rb_hash_initialize_copy): clear old table before copy new
- table.
-
-Mon Jul 29 16:34:09 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * hash.c (rb_hash_assoc): aggregate object can be initialized only
- with link time constants.
-
Mon Jul 29 14:54:44 2013 Masaki Matsushita <glass.saga@gmail.com>
* hash.c (rb_hash_assoc): performance improvement by replacing
diff --git a/hash.c b/hash.c
index d346a520aa7..5a8dd9b1fa8 100644
--- a/hash.c
+++ b/hash.c
@@ -1306,14 +1306,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)) {
@@ -2167,11 +2175,10 @@ rb_hash_assoc(VALUE hash, VALUE key)
struct lookup2_arg arg;
struct reset_hash_type_arg ensure_arg;
const struct st_hash_type *orighash = table->type;
- const struct st_hash_type assochash = {
- assoc_cmp,
- orighash->hash,
- };
+ struct st_hash_type assochash;
+ assochash.compare = assoc_cmp;
+ assochash.hash = orighash->hash;
table->type = &assochash;
arg.hash = hash;
arg.key = key;
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
index 1baff2982c8..e8b8ef040c8 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 = { }
set2 = { set1 => true}
@@ -912,13 +918,17 @@ class TestHash < Test::Unit::TestCase
def test_compare_by_identity
a = "foo"
- assert_not_predicate({}, :compare_by_identity?)
- h = { a => "bar" }
+ assert_not_predicate(@cls[], :compare_by_identity?)
+ h = @cls[a => "bar"]
assert_not_predicate(h, :compare_by_identity?)
h.compare_by_identity
assert_predicate(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