From: Ian Lynagh <igloo@earth.li>
Date: Thu, 31 Jul 2008 19:42:52 +0000 (+0000)
Subject: Fix the catching of "IOEnv failure" with extensible extensions
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=9b2cd28e7be049d7abaff2cb9c0cda8eb67932f4

Fix the catching of "IOEnv failure" with extensible extensions
---

diff --git a/compiler/typecheck/TcSplice.lhs b/compiler/typecheck/TcSplice.lhs
index d63b4a0..55e0975 100644
--- a/compiler/typecheck/TcSplice.lhs
+++ b/compiler/typecheck/TcSplice.lhs
@@ -73,6 +73,8 @@ import qualified Language.Haskell.TH.Syntax as TH
 import GHC.Exts		( unsafeCoerce#, Int#, Int(..) )
 #if __GLASGOW_HASKELL__ < 609
 import qualified Exception ( userErrors )
+#else
+import System.IO.Error
 #endif
 \end{code}
 
@@ -603,9 +605,15 @@ runMeta convert expr
 		     -> failM	-- Error already in Tc monad
 		     | otherwise -> failWithTc (mk_msg "run" exn)	-- Exception
 #else
-	    Left (SomeException exn) -> do
+	    Left (SomeException exn) ->
                     case cast exn of
-                        Just (ErrorCall "IOEnv failure") ->
+                    Just (ErrorCall "IOEnv failure") ->
+                        failM -- Error already in Tc monad
+                    _ ->
+                        case cast exn of
+                        Just ioe
+                         | isUserError ioe &&
+                           (ioeGetErrorString ioe == "IOEnv failure") ->
                             failM -- Error already in Tc monad
                         _ -> failWithTc (mk_msg "run" exn)	-- Exception
 #endif