X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FSanity.c;h=4430c4b6bd4661acd491bd28815713939fcfb58a;hb=6cf8982ac30be6836a0cdd8be5a6ac1a1a144213;hp=02d81ed7cee8cd354b0fa76723ae31fb50f96fd2;hpb=dd56e9ab4544e83d27532a8d9058140bfe81825c;p=ghc-hetmet.git

diff --git a/rts/Sanity.c b/rts/Sanity.c
index 02d81ed..4430c4b 100644
--- a/rts/Sanity.c
+++ b/rts/Sanity.c
@@ -18,14 +18,13 @@
 
 #ifdef DEBUG                                                   /* whole file */
 
-#include "RtsFlags.h"
 #include "RtsUtils.h"
-#include "BlockAlloc.h"
+#include "sm/Storage.h"
+#include "sm/BlockAlloc.h"
 #include "Sanity.h"
-#include "MBlock.h"
-#include "Storage.h"
 #include "Schedule.h"
 #include "Apply.h"
+#include "Printer.h"
 
 /* -----------------------------------------------------------------------------
    Forward decls.
@@ -237,7 +236,7 @@ checkPAP (StgClosure *tagged_fun, StgClosure** payload, StgWord n_args)
 	break;
     }
 
-    ASSERT(fun_info->f.arity > TAG_MASK ? GET_CLOSURE_TAG(tagged_fun) == 1
+    ASSERT(fun_info->f.arity > TAG_MASK ? GET_CLOSURE_TAG(tagged_fun) == 0
            : GET_CLOSURE_TAG(tagged_fun) == fun_info->f.arity);
 }
 
@@ -582,7 +581,7 @@ checkGlobalTSOList (rtsBool checkTSOs)
           // If this TSO is dirty and in an old generation, it better
           // be on the mutable list.
           if (tso->what_next == ThreadRelocated) continue;
-          if (tso->flags & (TSO_DIRTY|TSO_LINK_DIRTY)) {
+          if (tso->dirty || (tso->flags & TSO_LINK_DIRTY)) {
               ASSERT(Bdescr((P_)tso)->gen_no == 0 || (tso->flags & TSO_MARKED));
               tso->flags &= ~TSO_MARKED;
           }