X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fsm%2FGCAux.c;h=f69c81d5e0d56e86e7f20fb4f38766d8e9704e5f;hb=129e7b91d1cd0fc583b6bba01e39d10c30db18be;hp=825d0f9a3edeb06831c6e571794589aa9dc76461;hpb=4e79709df545c16812b85f2c27ab3411f5a7b54f;p=ghc-hetmet.git

diff --git a/rts/sm/GCAux.c b/rts/sm/GCAux.c
index 825d0f9..f69c81d 100644
--- a/rts/sm/GCAux.c
+++ b/rts/sm/GCAux.c
@@ -7,10 +7,11 @@
  *
  * ---------------------------------------------------------------------------*/
 
+#include "PosixSource.h"
 #include "Rts.h"
-#include "Storage.h"
-#include "MBlock.h"
+
 #include "GC.h"
+#include "Storage.h"
 #include "Compact.h"
 #include "Task.h"
 #include "Capability.h"
@@ -44,11 +45,15 @@ isAlive(StgClosure *p)
 
     // ignore static closures 
     //
+    // ToDo: This means we never look through IND_STATIC, which means
+    // isRetainer needs to handle the IND_STATIC case rather than
+    // raising an error.
+    //
     // ToDo: for static closures, check the static link field.
     // Problem here is that we sometimes don't set the link field, eg.
     // for static closures with an empty SRT or CONSTR_STATIC_NOCAFs.
     //
-    if (!HEAP_ALLOCED(q)) {
+    if (!HEAP_ALLOCED_GC(q)) {
 	return p;
     }
 
@@ -62,11 +67,16 @@ isAlive(StgClosure *p)
 
     // large objects use the evacuated flag
     if (bd->flags & BF_LARGE) {
+        if (get_itbl(q)->type == TSO &&
+            ((StgTSO *)p)->what_next == ThreadRelocated) {
+            p = (StgClosure *)((StgTSO *)p)->_link;
+            continue;
+        }
 	return NULL;
     }
 
     // check the mark bit for compacted steps
-    if ((bd->flags & BF_COMPACTED) && is_marked((P_)q,bd)) {
+    if ((bd->flags & BF_MARKED) && is_marked((P_)q,bd)) {
 	return p;
     }
 
@@ -84,8 +94,6 @@ isAlive(StgClosure *p)
     case IND:
     case IND_STATIC:
     case IND_PERM:
-    case IND_OLDGEN:		// rely on compatible layout with StgInd 
-    case IND_OLDGEN_PERM:
       // follow indirections 
       p = ((StgInd *)q)->indirectee;
       continue;
@@ -113,14 +121,15 @@ revertCAFs( void )
 {
     StgIndStatic *c;
 
-    for (c = (StgIndStatic *)revertible_caf_list; c != NULL; 
+    for (c = (StgIndStatic *)revertible_caf_list; 
+         c != (StgIndStatic *)END_OF_STATIC_LIST; 
 	 c = (StgIndStatic *)c->static_link) 
     {
 	SET_INFO(c, c->saved_info);
 	c->saved_info = NULL;
 	// could, but not necessary: c->static_link = NULL; 
     }
-    revertible_caf_list = NULL;
+    revertible_caf_list = END_OF_STATIC_LIST;
 }
 
 void
@@ -128,12 +137,14 @@ markCAFs (evac_fn evac, void *user)
 {
     StgIndStatic *c;
 
-    for (c = (StgIndStatic *)caf_list; c != NULL; 
+    for (c = (StgIndStatic *)caf_list;
+         c != (StgIndStatic*)END_OF_STATIC_LIST; 
 	 c = (StgIndStatic *)c->static_link) 
     {
 	evac(user, &c->indirectee);
     }
-    for (c = (StgIndStatic *)revertible_caf_list; c != NULL; 
+    for (c = (StgIndStatic *)revertible_caf_list; 
+         c != (StgIndStatic*)END_OF_STATIC_LIST; 
 	 c = (StgIndStatic *)c->static_link) 
     {
 	evac(user, &c->indirectee);