[commit: ghc] ghc-7.10: AllocationLimitExceeded should be a child of SomeAsyncException (aec39c9)

git at git.haskell.org git at git.haskell.org
Mon Mar 9 18:54:43 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/aec39c95e482f475f39f65f787d903b166d15f5b/ghc

>---------------------------------------------------------------

commit aec39c95e482f475f39f65f787d903b166d15f5b
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Feb 25 09:31:18 2015 +0000

    AllocationLimitExceeded should be a child of SomeAsyncException
    
    (cherry picked from commit b7f7889fc28460e3e8be3ea8e29f98ff473fd934)


>---------------------------------------------------------------

aec39c95e482f475f39f65f787d903b166d15f5b
 libraries/base/GHC/IO/Exception.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/base/GHC/IO/Exception.hs b/libraries/base/GHC/IO/Exception.hs
index 6701fdf..0ed504c 100644
--- a/libraries/base/GHC/IO/Exception.hs
+++ b/libraries/base/GHC/IO/Exception.hs
@@ -107,7 +107,9 @@ instance Show Deadlock where
 data AllocationLimitExceeded = AllocationLimitExceeded
     deriving Typeable
 
-instance Exception AllocationLimitExceeded
+instance Exception AllocationLimitExceeded where
+  toException = asyncExceptionToException
+  fromException = asyncExceptionFromException
 
 instance Show AllocationLimitExceeded where
     showsPrec _ AllocationLimitExceeded =



More information about the ghc-commits mailing list