akr	2008-06-05 22:52:02 +0900 (Thu, 05 Jun 2008)

  New Revision: 16845

  Modified files:
    trunk/ChangeLog
    trunk/gc.c

  Log:
    * gc.c (os_obj_of): heaps may be modified in yield.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16845&r2=16844&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/gc.c?r1=16845&r2=16844&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16844)
+++ ChangeLog	(revision 16845)
@@ -1,3 +1,7 @@
+Thu Jun  5 22:50:50 2008  Tanaka Akira  <akr@f...>
+
+	* gc.c (os_obj_of): heaps may be modified in yield.
+
 Thu Jun  5 21:46:50 2008  Yusuke Endoh  <mame@t...>
 
 	* st.c (st_reverse_foreach): comment out unused function.
Index: gc.c
===================================================================
--- gc.c	(revision 16844)
+++ gc.c	(revision 16845)
@@ -1856,9 +1856,19 @@
 {
     size_t i;
     size_t n = 0;
+    RVALUE *membase = 0;
+    RVALUE *p, *pend;
+    volatile VALUE v;
 
-    for (i = 0; i < heaps_used; i++) {
-	RVALUE *p, *pend;
+    i = 0;
+    while (i < heaps_used) {
+        while (0 < i && (uintptr_t)membase < (uintptr_t)heaps[i-1].membase)
+            i--;
+        while (i < heaps_used && (uintptr_t)heaps[i].membase <= (uintptr_t)membase )
+            i++;
+        if (heaps_used <= i)
+            break;
+        membase = heaps[i].membase;
 
 	p = heaps[i].slot; pend = p + heaps[i].limit;
 	for (;p < pend; p++) {
@@ -1872,8 +1882,9 @@
 		    if (FL_TEST(p, FL_SINGLETON)) continue;
 		  default:
 		    if (!p->as.basic.klass) continue;
-		    if (!of || rb_obj_is_kind_of((VALUE)p, of)) {
-			rb_yield((VALUE)p);
+                    v = (VALUE)p;
+		    if (!of || rb_obj_is_kind_of(v, of)) {
+			rb_yield(v);
 			n++;
 		    }
 		}

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