[Gc] [patch] fix possible merge error

Andreas Tobler toa at pop.agri.ch
Tue Jan 9 12:49:41 PST 2007


Hi all,

I'm not sure if the attached is correct, but comparing to the original 
patch from Allan Hsu and the cvs version it seems to me the attached 
should be the correct way, Allan?


2007-01-09  Andreas Tobler  <a.tobler at schweiz.org>

	* darwin_stop_world.c (GC_stop_world): Fix merge error.

Index: darwin_stop_world.c
===================================================================
RCS file: /cvsroot/bdwgc/bdwgc/darwin_stop_world.c,v
retrieving revision 1.9
diff -u -r1.9 darwin_stop_world.c
--- darwin_stop_world.c 14 Dec 2006 21:51:40 -0000      1.9
+++ darwin_stop_world.c 9 Jan 2007 20:46:30 -0000
@@ -443,9 +443,9 @@
          prevcount = listcount;
        }
      } while (changes);
-    GC_ASSERT(prev_list != 0);
-    for(i = 0; i < prevcount; i++)
-      mach_port_deallocate(my_task, prev_list[i]);
+    GC_ASSERT(act_list != 0);
+    for(i = 0; i < listcount; i++)
+      mach_port_deallocate(my_task, act_list[i]);

      vm_deallocate(my_task, (vm_address_t)act_list,
      sizeof(thread_t) * listcount);


More information about the Gc mailing list