Revert "Update T3279 to use mask rather than block"

This reverts commit a6d80ce5fb2211af8dafc425705fefb316702802.

1 files changed, 8 insertions, 14 deletions

diff --git a/testsuite/tests/concurrent/should_run/T3279.hs b/testsuite/tests/concurrent/should_run/T3279.hs
index 46e9b03674..f479704310 100644
--- a/testsuite/tests/concurrent/should_run/T3279.hs
+++ b/testsuite/tests/concurrent/should_run/T3279.hs
@@ -1,30 +1,24 @@
 -- test for #3279
 
-import Data.IORef
 import System.IO.Unsafe
 import GHC.Conc
 import Control.Exception
 
+f :: Int
+f = (1 +) . unsafePerformIO $ do
+        error "foo" `catch` \(SomeException e) -> do
+            myThreadId >>= flip throwTo e
+            -- point X
+            unblock $ return 1
+
 main :: IO ()
 main = do
-    restoreRef <- newIORef id
-
-    let f :: Int
-        f = (1 +) . unsafePerformIO $ do
-                error "foo" `catch` \(SomeException e) -> do
-                    myThreadId >>= flip throwTo e
-                    -- point X
-                    restore <- readIORef restoreRef
-                    restore $ return 1
-
     evaluate f `catch` \(SomeException e) -> return 0
     -- the evaluation of 'x' is now suspended at point X
-    tid <- mask $ \restore -> do writeIORef restoreRef restore
-                                 forkIO (evaluate f >> return ())
+    tid <- block $ forkIO (evaluate f >> return ())
     killThread tid
     -- now execute the 'unblock' above with a pending exception
     yield
-    writeIORef restoreRef id
     -- should print 1 + 1 = 2
     print f