From e00b83ceb91048da8549399c11618345ce32d9cc Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 3 Aug 2009 22:44:45 +0000 Subject: * hash.c (rb_hash_replace): should copy compare_by_identity status as well. [ruby-core:24728] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ hash.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 453902c6bd..e376d31429 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 4 06:30:01 2009 Yukihiro Matsumoto + + * hash.c (rb_hash_replace): should copy compare_by_identity status as well. + [ruby-core:24728] + Tue Aug 4 05:43:03 2009 Yukihiro Matsumoto * thread.c (recursive_push): need to set UNTRUST. [ruby-dev:38997] diff --git a/hash.c b/hash.c index 74b654ee18..ce8af6c6d9 100644 --- a/hash.c +++ b/hash.c @@ -1060,6 +1060,10 @@ rb_hash_replace(VALUE hash, VALUE hash2) hash2 = to_hash(hash2); if (hash == hash2) return hash; rb_hash_clear(hash); + if (RHASH(hash2)->ntbl) { + rb_hash_tbl(hash); + RHASH(hash)->ntbl->type = RHASH(hash2)->ntbl->type; + } rb_hash_foreach(hash2, replace_i, hash); RHASH(hash)->ifnone = RHASH(hash2)->ifnone; if (FL_TEST(hash2, HASH_PROC_DEFAULT)) { -- cgit v1.2.3