X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FGC.c;h=0a65b327d3f716122a2038d4c0c27499b1d45c4b;hb=8def87551a7bf9f531059e519259b1fd9df45725;hp=7a447fdec3da1bf5761257a911a388a5e73f4cb5;hpb=a395e1afebc881a6aafbc246c6de2bb21fd32048;p=ghc-hetmet.git

diff --git a/ghc/rts/GC.c b/ghc/rts/GC.c
index 7a447fd..0a65b32 100644
--- a/ghc/rts/GC.c
+++ b/ghc/rts/GC.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: GC.c,v 1.157 2003/06/26 20:47:47 panne Exp $
+ * $Id: GC.c,v 1.162 2003/10/24 11:45:40 simonmar Exp $
  *
  * (c) The GHC Team 1998-2003
  *
@@ -378,6 +378,7 @@ GarbageCollect ( void (*get_roots)(evac_fn), rtsBool force_major_gc )
   if (RtsFlags.GcFlags.generations == 1) {
     old_to_blocks = g0s0->to_blocks;
     g0s0->to_blocks = NULL;
+    g0s0->n_to_blocks = 0;
   }
 
   /* Keep a count of how many new blocks we allocated during this GC
@@ -421,7 +422,7 @@ GarbageCollect ( void (*get_roots)(evac_fn), rtsBool force_major_gc )
 
       // mark the large objects as not evacuated yet 
       for (bd = stp->large_objects; bd; bd = bd->link) {
-	bd->flags = BF_LARGE;
+	bd->flags &= ~BF_EVACUATED;
       }
 
       // for a compacted step, we need to allocate the bitmap
@@ -2130,6 +2131,7 @@ selector_loop:
       }
 
       case AP:
+      case AP_STACK:
       case THUNK:
       case THUNK_1_0:
       case THUNK_0_1:
@@ -2664,6 +2666,11 @@ scavenge(step *stp)
     {
 	StgPtr next;
 
+	// Set the mut_link field to NULL, so that we will put this
+	// array back on the mutable list if it is subsequently thawed
+	// by unsafeThaw#.
+	((StgMutArrPtrs*)p)->mut_link = NULL;
+
 	next = p + mut_arr_ptrs_sizeW((StgMutArrPtrs*)p);
 	for (p = (P_)((StgMutArrPtrs *)p)->payload; p < next; p++) {
 	    (StgClosure *)*p = evacuate((StgClosure *)*p);
@@ -2974,6 +2981,11 @@ linear_scan:
 	{
 	    StgPtr next;
 	    
+	    // Set the mut_link field to NULL, so that we will put this
+	    // array on the mutable list if it is subsequently thawed
+	    // by unsafeThaw#.
+	    ((StgMutArrPtrs*)p)->mut_link = NULL;
+
 	    next = p + mut_arr_ptrs_sizeW((StgMutArrPtrs*)p);
 	    for (p = (P_)((StgMutArrPtrs *)p)->payload; p < next; p++) {
 		(StgClosure *)*p = evacuate((StgClosure *)*p);
@@ -3196,6 +3208,11 @@ scavenge_one(StgPtr p)
 	// follow everything 
 	StgPtr next;
       
+	// Set the mut_link field to NULL, so that we will put this
+	// array on the mutable list if it is subsequently thawed
+	// by unsafeThaw#.
+	((StgMutArrPtrs*)p)->mut_link = NULL;
+
 	next = p + mut_arr_ptrs_sizeW((StgMutArrPtrs*)p);
 	for (p = (P_)((StgMutArrPtrs *)p)->payload; p < next; p++) {
 	    (StgClosure *)*p = evacuate((StgClosure *)*p);
@@ -3404,6 +3421,9 @@ scavenge_mutable_list(generation *gen)
 	  (StgClosure *)*q = evacuate((StgClosure *)*q);
 	}
 	evac_gen = 0;
+	// Set the mut_link field to NULL, so that we will put this
+	// array back on the mutable list if it is subsequently thawed
+	// by unsafeThaw#.
 	p->mut_link = NULL;
 	if (failed_to_evac) {
 	    failed_to_evac = rtsFalse;