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  <ko1@atdot.net>
+
+	* gc.c (rb_copy_wb_protected_attribute): need demote for old objects.
+
 Thu Mar 19 10:31:00 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* 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);