Redesign 64-bit HEAP_ALLOCED (FIX #2934 at the same time)

[ghc-hetmet.git] / rts / Sanity.c

diff --git a/rts/Sanity.c b/rts/Sanity.c
index 8f3b627..20507ca 100644 (file)
--- 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:
@@ -798,7 +794,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 +824,7 @@ checkMutableList( bdescr *mut_bd, nat gen )
 }
 
 void
-checkMutableLists (void)
+checkMutableLists (rtsBool checkTSOs)
 {
     nat g, i;
 
@@ -838,7 +834,7 @@ checkMutableLists (void)
             checkMutableList(capabilities[i].mut_lists[g], g);
         }
     }
-    checkGlobalTSOList(rtsTrue);
+    checkGlobalTSOList(checkTSOs);
 }
 
 /*