tmm1	2013-12-10 14:46:48 +0900 (Tue, 10 Dec 2013)

  New Revision: 44109

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

  Log:
    gc.c: build complete object graph for RGENGC_CHECK_MODE
    
    * gc.c (reflist_add): return 0 if reference already exists
    * gc.c (allrefs_add): return 1 on newly added references
    * gc.c (allrefs_i): follow references to construct complete object
      graph. before this patch, RGENGC_CHECK could fail to verify some WB
      miss issues. [Bug #9226] [ruby-core:58959]

  Modified files:
    trunk/ChangeLog
    trunk/gc.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44108)
+++ ChangeLog	(revision 44109)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Dec 10 14:41:53 2013  Aman Gupta <ruby@t...>
+
+	* gc.c (reflist_add): return 0 if reference already exists
+	* gc.c (allrefs_add): return 1 on newly added references
+	* gc.c (allrefs_i): follow references to construct complete object
+	  graph. before this patch, RGENGC_CHECK could fail to verify some WB
+	  miss issues. [Bug #9226] [ruby-core:58959]
+
 Tue Dec 10 11:20:56 2013  Aman Gupta <ruby@t...>
 
 	* ext/objspace/objspace_dump.c (dump_object): include fstring flag on
Index: gc.c
===================================================================
--- gc.c	(revision 44108)
+++ gc.c	(revision 44109)
@@ -4164,14 +4164,21 @@ reflist_destruct(struct reflist *refs) https://github.com/ruby/ruby/blob/trunk/gc.c#L4164
     xfree(refs);
 }
 
-static void
+static int
 reflist_add(struct reflist *refs, VALUE obj)
 {
+    int i = 0;
     if (refs->pos == refs->size) {
 	refs->size *= 2;
 	SIZED_REALLOC_N(refs->list, VALUE, refs->size, refs->size/2);
     }
+
+    for (i=0; i<refs->pos; i++)
+	if (refs->list[i] == obj)
+	    return 0; /* already exists */
+
     refs->list[refs->pos++] = obj;
+    return 1; /* added */
 }
 
 static void
@@ -4215,17 +4222,18 @@ struct allrefs { https://github.com/ruby/ruby/blob/trunk/gc.c#L4222
     VALUE root_obj;
 };
 
-static void
+static int
 allrefs_add(struct allrefs *data, VALUE obj)
 {
     struct reflist *refs;
 
     if (st_lookup(data->references, obj, (st_data_t *)&refs)) {
-	reflist_add(refs, data->root_obj);
+	return reflist_add(refs, data->root_obj);
     }
     else {
 	refs = reflist_create(data->root_obj);
 	st_insert(data->references, obj, (st_data_t)refs);
+	return 1;
     }
 }
 
@@ -4233,7 +4241,8 @@ static void https://github.com/ruby/ruby/blob/trunk/gc.c#L4241
 allrefs_i(VALUE obj, void *ptr)
 {
     struct allrefs *data = (struct allrefs *)ptr;
-    allrefs_add(data, obj);
+    if (allrefs_add(data, obj)) /* follow new reference */
+	push_mark_stack(&data->objspace->mark_stack, obj);
 }
 
 static void

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