X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FSanity.c;h=3f4b3cf7b05a81f0edf68b26f493f4d276f0028d;hb=59df5fd1bb61bb04653f55b027fd2d4606f305ac;hp=8f3b627a2bbae3c8505b81ae16de6d1e6625f9e2;hpb=c1580e72e315576b5f58427f1c29f268b565e95e;p=ghc-hetmet.git

diff --git a/rts/Sanity.c b/rts/Sanity.c
index 8f3b627..3f4b3cf 100644
--- a/rts/Sanity.c
+++ b/rts/Sanity.c
@@ -312,10 +312,6 @@ checkClosure( StgClosure* p )
     case IND_PERM:
     case IND_OLDGEN:
     case IND_OLDGEN_PERM:
-#ifdef TICKY_TICKY
-    case SE_BLACKHOLE:
-    case SE_CAF_BLACKHOLE:
-#endif
     case BLACKHOLE:
     case CAF_BLACKHOLE:
     case STABLE_NAME:
@@ -637,10 +633,12 @@ checkHeapChunk(StgPtr start, StgPtr end)
 #endif
 
 void
-checkChain(bdescr *bd)
+checkLargeObjects(bdescr *bd)
 {
   while (bd != NULL) {
-    checkClosure((StgClosure *)bd->start);
+    if (!(bd->flags & BF_PINNED)) {
+      checkClosure((StgClosure *)bd->start);
+    }
     bd = bd->link;
   }
 }
@@ -798,7 +796,7 @@ checkGlobalTSOList (rtsBool checkTSOs)
           // be on the mutable list.
           if (tso->what_next == ThreadRelocated) continue;
           if (tso->flags & (TSO_DIRTY|TSO_LINK_DIRTY)) {
-              ASSERT(Bdescr((P_)tso)->gen_no == 0 || tso->flags & TSO_MARKED);
+              ASSERT(Bdescr((P_)tso)->gen_no == 0 || (tso->flags & TSO_MARKED));
               tso->flags &= ~TSO_MARKED;
           }
       }
@@ -828,7 +826,7 @@ checkMutableList( bdescr *mut_bd, nat gen )
 }
 
 void
-checkMutableLists (void)
+checkMutableLists (rtsBool checkTSOs)
 {
     nat g, i;
 
@@ -838,7 +836,7 @@ checkMutableLists (void)
             checkMutableList(capabilities[i].mut_lists[g], g);
         }
     }
-    checkGlobalTSOList(rtsTrue);
+    checkGlobalTSOList(checkTSOs);
 }
 
 /*