X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fsm%2FScav.c;h=34096d489be76cc4d2f6cfcfba7638660292909a;hb=73e88c2a30cbb2fc9cf8c394c620c0f3edcdd0eb;hp=9d1a0b6bf4cd185713b1f6f78419625bdfafed4a;hpb=6a405b1efd138a4af4ed93ce4ff173a4c5704512;p=ghc-hetmet.git diff --git a/rts/sm/Scav.c b/rts/sm/Scav.c index 9d1a0b6..34096d4 100644 --- a/rts/sm/Scav.c +++ b/rts/sm/Scav.c @@ -69,7 +69,7 @@ scavengeTSO (StgTSO *tso) return; } - debugTrace(DEBUG_gc,"scavenging thread %d",tso->id); + debugTrace(DEBUG_gc,"scavenging thread %d",(int)tso->id); saved_eager = gct->eager_promotion; gct->eager_promotion = rtsFalse; @@ -1372,7 +1372,7 @@ scavenge_one(StgPtr p) * evacuated, so we perform that check here. */ StgClosure *q = ((StgInd *)p)->indirectee; - if (HEAP_ALLOCED(q) && Bdescr((StgPtr)q)->flags & BF_EVACUATED) { + if (HEAP_ALLOCED_GC(q) && Bdescr((StgPtr)q)->flags & BF_EVACUATED) { break; } evacuate(&((StgInd *)p)->indirectee);