X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRaiseAsync.c;h=d55595309bceb82e4b3f8f3c7d23ec3206d80258;hb=485b8d1a00a65aa565e3b30ef8f63fa2880d4093;hp=95e2492efcd9c3e015d7a5b1643f4688c16d14cd;hpb=1ca9b6f8f22b58898b42bcb5b1017a85f4ab06a7;p=ghc-hetmet.git diff --git a/rts/RaiseAsync.c b/rts/RaiseAsync.c index 95e2492..d555953 100644 --- a/rts/RaiseAsync.c +++ b/rts/RaiseAsync.c @@ -13,7 +13,6 @@ #include "RaiseAsync.h" #include "SMP.h" #include "Schedule.h" -#include "Storage.h" #include "LdvProfile.h" #include "Updates.h" #include "STM.h" @@ -438,6 +437,9 @@ check_target: case BlockedOnRead: case BlockedOnWrite: case BlockedOnDelay: +#if defined(mingw32_HOST_OS) + case BlockedOnDoProc: +#endif if ((target->flags & TSO_BLOCKEX) && ((target->flags & TSO_INTERRUPTIBLE) == 0)) { blockedThrowTo(source,target); @@ -1017,6 +1019,7 @@ raiseAsync(Capability *cap, StgTSO *tso, StgClosure *exception, StgTRecHeader *trec = tso -> trec; StgTRecHeader *outer = stmGetEnclosingTRec(trec); stmAbortTransaction(cap, trec); + stmFreeAbortedTRec(cap, trec); tso -> trec = outer; break;