[前][次][番号順一覧][スレッド一覧]

ruby-changes:37947

From: ko1 <ko1@a...>
Date: Thu, 19 Mar 2015 22:14:05 +0900 (JST)
Subject: [ruby-changes:37947] ko1:r50028 (trunk): * gc.c (rb_copy_wb_protected_attribute): `dest' can be WB unprotected.

ko1	2015-03-19 22:13:46 +0900 (Thu, 19 Mar 2015)

  New Revision: 50028

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50028

  Log:
    * gc.c (rb_copy_wb_protected_attribute): `dest' can be WB unprotected.

  Modified files:
    trunk/ChangeLog
    trunk/gc.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50027)
+++ ChangeLog	(revision 50028)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Mar 19 22:12:46 2015  Koichi Sasada  <ko1@a...>
+
+	* gc.c (rb_copy_wb_protected_attribute): `dest' can be WB unprotected.
+
 Thu Mar 19 21:25:25 2015  Koichi Sasada  <ko1@a...>
 
 	* gc.c (rb_copy_wb_protected_attribute): demote `dest' object.
Index: gc.c
===================================================================
--- gc.c	(revision 50027)
+++ gc.c	(revision 50028)
@@ -5734,12 +5734,7 @@ rb_copy_wb_protected_attribute(VALUE des https://github.com/ruby/ruby/blob/trunk/gc.c#L5734
 #if USE_RGENGC
     rb_objspace_t *objspace = &rb_objspace;
 
-    if (RGENGC_CHECK_MODE > 0 && RVALUE_WB_UNPROTECTED(dest)) {
-	rb_bug("rb_copy_wb_protected_attribute: dest should not be WB unprotected - %s",
-	       obj_info(dest));
-    }
-
-    if (RVALUE_WB_UNPROTECTED(obj)) {
+    if (RVALUE_WB_UNPROTECTED(obj) && !RVALUE_WB_UNPROTECTED(dest)) {
 	if (!RVALUE_OLD_P(dest)) {
 	    MARK_IN_BITMAP(GET_HEAP_WB_UNPROTECTED_BITS(dest), dest);
 	    RVALUE_AGE_RESET_RAW(dest);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]