X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FRaiseAsync.c;h=ad830cf32206a96ad5ded2b9ce134fe2ef2b9c28;hb=9fdce342ee41c788a1dfe76fc81707367f2e7675;hp=d8ab08ab131bc09681675abf4de31d482ab92b74;hpb=0a4162ac3cda41ef43b0e1ece4b6042327b8556c;p=ghc-hetmet.git

diff --git a/rts/RaiseAsync.c b/rts/RaiseAsync.c
index d8ab08a..ad830cf 100644
--- a/rts/RaiseAsync.c
+++ b/rts/RaiseAsync.c
@@ -840,9 +840,7 @@ raiseAsync(Capability *cap, StgTSO *tso, StgClosure *exception,
 	    // top of the CATCH_FRAME ready to enter.
 	    //
 	{
-#ifdef PROFILING
 	    StgCatchFrame *cf = (StgCatchFrame *)frame;
-#endif
 	    StgThunk *raise;
 	    
 	    if (exception == NULL) break;
@@ -863,7 +861,12 @@ raiseAsync(Capability *cap, StgTSO *tso, StgClosure *exception,
 	     * a surprise exception before we get around to executing the
 	     * handler.
 	     */
-	    tso->flags |= TSO_BLOCKEX | TSO_INTERRUPTIBLE;
+            tso->flags |= TSO_BLOCKEX;
+            if ((cf->exceptions_blocked & TSO_INTERRUPTIBLE) == 0) {
+                tso->flags &= ~TSO_INTERRUPTIBLE;
+            } else {
+                tso->flags |= TSO_INTERRUPTIBLE;
+            }
 
 	    /* Put the newly-built THUNK on top of the stack, ready to execute
 	     * when the thread restarts.