From 38cfec906d1cc99a5743d66c44f3245eea90e56d Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 19 Mar 2015 07:10:58 +0000 Subject: * gc.c (rb_copy_wb_protected_attribute): need demote for old objects. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ gc.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f5c1d2354..7ade41d42f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Mar 19 16:08:42 2015 Koichi Sasada + + * gc.c (rb_copy_wb_protected_attribute): need demote for old objects. + Thu Mar 19 10:31:00 2015 Nobuyoshi Nakada * random.c (fill_random_bytes): release the handle in the static diff --git a/gc.c b/gc.c index dd5a4bd51a..8b1493fc5e 100644 --- a/gc.c +++ b/gc.c @@ -5730,9 +5730,16 @@ void rb_copy_wb_protected_attribute(VALUE dest, VALUE obj) { #if USE_RGENGC + rb_objspace_t *objspace = &rb_objspace; + if (RVALUE_WB_UNPROTECTED(obj)) { - MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(dest), dest); - RVALUE_AGE_RESET_RAW(dest); + if (!RVALUE_OLD_P(dest)) { + MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(dest), dest); + RVALUE_AGE_RESET_RAW(dest); + } + else { + RVALUE_DEMOTE(objspace, obj); + } } check_rvalue_consistency(dest); -- cgit v1.2.3