X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2Fsm%2FGCAux.c;h=404e9bbcbcc981697d60221a669148649b0b30fd;hp=52e0aefd1bc61fddb11910cddbb03d35eafde595;hb=a2a67cd520b9841114d69a87a423dabcb3b4368e;hpb=f86e7206ea94b48b94fb61007a1c5d55b8c60f45

diff --git a/rts/sm/GCAux.c b/rts/sm/GCAux.c
index 52e0aef..404e9bb 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"
@@ -41,7 +42,6 @@ isAlive(StgClosure *p)
     q = UNTAG_CLOSURE(p);
 
     ASSERT(LOOKS_LIKE_CLOSURE_PTR(q));
-    info = get_itbl(q);
 
     // ignore static closures 
     //
@@ -49,15 +49,12 @@ isAlive(StgClosure *p)
     // 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;
     }
 
     // ignore closures in generations that we're not collecting. 
     bd = Bdescr((P_)q);
-    if (bd->gen_no > N) {
-	return p;
-    }
 
     // if it's a pointer into to-space, then we're done
     if (bd->flags & BF_EVACUATED) {
@@ -66,14 +63,28 @@ 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;
     }
 
+    info = q->header.info;
+
+    if (IS_FORWARDING_PTR(info)) {
+        // alive! 
+        return (StgClosure*)UN_FORWARDING_PTR(info);
+    }
+
+    info = INFO_PTR_TO_STRUCT(info);
+
     switch (info->type) {
 
     case IND:
@@ -85,13 +96,9 @@ isAlive(StgClosure *p)
       p = ((StgInd *)q)->indirectee;
       continue;
 
-    case EVACUATED:
-      // alive! 
-      return ((StgEvacuated *)q)->evacuee;
-
     case TSO:
       if (((StgTSO *)q)->what_next == ThreadRelocated) {
-	p = (StgClosure *)((StgTSO *)q)->link;
+	p = (StgClosure *)((StgTSO *)q)->_link;
 	continue;
       } 
       return NULL;