summaryrefslogtreecommitdiff
path: root/ghc/InteractiveUI.hs
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2013-02-19 17:07:16 +0000
committerIan Lynagh <ian@well-typed.com>2013-02-19 17:33:40 +0000
commit7ae0f5bd87ab54b62843e88cdb7df3d0a0cfe265 (patch)
tree16ff2a58e20903947568f0063d325c6113840442 /ghc/InteractiveUI.hs
parent5700479b68aa96f380c44d3a085786b1fdbff3d8 (diff)
downloadhaskell-7ae0f5bd87ab54b62843e88cdb7df3d0a0cfe265.tar.gz
Remove gblock and gunblock
Diffstat (limited to 'ghc/InteractiveUI.hs')
-rw-r--r--ghc/InteractiveUI.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
index ec7e5225df..5b3e572650 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -2944,7 +2944,8 @@ showException se =
-- may never be delivered. Thanks to Marcin for pointing out the bug.
ghciHandle :: ExceptionMonad m => (SomeException -> m a) -> m a -> m a
-ghciHandle h m = gcatch m $ \e -> gunblock (h e)
+ghciHandle h m = gmask $ \restore ->
+ gcatch (restore m) $ \e -> restore (h e)
ghciTry :: GHCi a -> GHCi (Either SomeException a)
ghciTry (GHCi m) = GHCi $ \s -> gtry (m s)