From 0a4162ac3cda41ef43b0e1ece4b6042327b8556c Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 5 May 2010 09:45:06 +0000 Subject: [PATCH] Don't raise a throwTo when the target is masking and BlockedOnBlackHole --- rts/RaiseAsync.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/rts/RaiseAsync.c b/rts/RaiseAsync.c index df7429a..d8ab08a 100644 --- a/rts/RaiseAsync.c +++ b/rts/RaiseAsync.c @@ -357,14 +357,20 @@ check_target: case BlockedOnBlackHole: { - // Revoke the message by replacing it with IND. We're not - // locking anything here, so we might still get a TRY_WAKEUP - // message from the owner of the blackhole some time in the - // future, but that doesn't matter. - ASSERT(target->block_info.bh->header.info == &stg_MSG_BLACKHOLE_info); - OVERWRITE_INFO(target->block_info.bh, &stg_IND_info); - raiseAsync(cap, target, msg->exception, rtsFalse, NULL); - return THROWTO_SUCCESS; + if (target->flags & TSO_BLOCKEX) { + // BlockedOnBlackHole is not interruptible. + blockedThrowTo(cap,target,msg); + return THROWTO_BLOCKED; + } else { + // Revoke the message by replacing it with IND. We're not + // locking anything here, so we might still get a TRY_WAKEUP + // message from the owner of the blackhole some time in the + // future, but that doesn't matter. + ASSERT(target->block_info.bh->header.info == &stg_MSG_BLACKHOLE_info); + OVERWRITE_INFO(target->block_info.bh, &stg_IND_info); + raiseAsync(cap, target, msg->exception, rtsFalse, NULL); + return THROWTO_SUCCESS; + } } case BlockedOnSTM: -- 1.7.10.4