X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMessages.c;h=5e0fa2544f8e4d7f567e6ebb4f57351e1f485b50;hb=e9b68a09e815946e9d6b6606f80e43d582cf098d;hp=7a37a8625964d6ff8f7c0c0318ceffd7abcee1e2;hpb=565f3c753ccedeb19b5b8190090241a2185eb0cb;p=ghc-hetmet.git diff --git a/rts/Messages.c b/rts/Messages.c index 7a37a86..5e0fa25 100644 --- a/rts/Messages.c +++ b/rts/Messages.c @@ -161,7 +161,7 @@ nat messageBlackHole(Capability *cap, MessageBlackHole *msg) const StgInfoTable *info; StgClosure *p; StgBlockingQueue *bq; - StgClosure *bh = msg->bh; + StgClosure *bh = UNTAG_CLOSURE(msg->bh); StgTSO *owner; debugTraceCap(DEBUG_sched, cap, "message: thread %d blocking on blackhole %p", @@ -175,6 +175,7 @@ nat messageBlackHole(Capability *cap, MessageBlackHole *msg) // all. if (info != &stg_BLACKHOLE_info && info != &stg_CAF_BLACKHOLE_info && + info != &__stg_EAGER_BLACKHOLE_info && info != &stg_WHITEHOLE_info) { // if it is a WHITEHOLE, then a thread is in the process of // trying to BLACKHOLE it. But we know that it was once a