summaryrefslogtreecommitdiff
path: root/gc.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-19 07:10:58 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-19 07:10:58 +0000
commit38cfec906d1cc99a5743d66c44f3245eea90e56d (patch)
tree5928e27426d173fb2d07a0878a2e31e4dc4f6fc8 /gc.c
parent5155a402abc54f260e49228f7ded5408444cbe0e (diff)
* 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
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c11
1 files changed, 9 insertions, 2 deletions
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);