18000 Use GHC.IO.catchException in favor of Exception.catch

fix #18000

2 files changed, 7 insertions, 6 deletions

diff --git a/compiler/GHC/SysTools/Tasks.hs b/compiler/GHC/SysTools/Tasks.hs
index 0fb74233fc..a3bde302bc 100644
--- a/compiler/GHC/SysTools/Tasks.hs
+++ b/compiler/GHC/SysTools/Tasks.hs
@@ -12,6 +12,7 @@ module GHC.SysTools.Tasks where
 import GHC.Prelude
 import GHC.Platform
 import GHC.ForeignSrcLang
+import GHC.IO (catchException)
 
 import GHC.CmmToLlvm.Base (LlvmVersion, llvmVersionStr, supportedLlvmVersionMin, supportedLlvmVersionMax, llvmVersionStr, parseLlvmVersion)
 
@@ -190,7 +191,7 @@ runClang logger dflags args = traceToolCommand logger dflags "clang" $ do
       args1 = map Option (getOpts dflags opt_a)
       args2 = args0 ++ args1 ++ args
   mb_env <- getGccEnv args2
-  catch
+  catchException
     (runSomethingFiltered logger dflags id "Clang (Assembler)" clang args2 Nothing mb_env)
     (\(err :: SomeException) -> do
         errorMsg logger dflags $
diff --git a/compiler/GHC/SysTools/Terminal.hs b/compiler/GHC/SysTools/Terminal.hs
index fb122865f0..1c04e21c34 100644
--- a/compiler/GHC/SysTools/Terminal.hs
+++ b/compiler/GHC/SysTools/Terminal.hs
@@ -3,15 +3,15 @@
 module GHC.SysTools.Terminal (stderrSupportsAnsiColors) where
 
 import GHC.Prelude
+import GHC.IO (catchException)
 
 #if defined(MIN_VERSION_terminfo)
-import Control.Exception (catch)
 import Data.Maybe (fromMaybe)
 import System.Console.Terminfo (SetupTermError, Terminal, getCapability,
                                 setupTermFromEnv, termColors)
 import System.Posix (queryTerminal, stdError)
 #elif defined(mingw32_HOST_OS)
-import Control.Exception (catch, try)
+import Control.Exception (try)
 -- import Data.Bits ((.|.), (.&.))
 import Foreign (Ptr, peek, with)
 import qualified Graphics.Win32 as Win32
@@ -43,7 +43,7 @@ stderrSupportsAnsiColors' = do
     stderr_available <- queryTerminal stdError
     if stderr_available then
       fmap termSupportsColors setupTermFromEnv
-        `catch` \ (_ :: SetupTermError) -> pure False
+        `catchException` \ (_ :: SetupTermError) -> pure False
     else
       pure False
   where
@@ -52,7 +52,7 @@ stderrSupportsAnsiColors' = do
 
 #elif defined(mingw32_HOST_OS)
   h <- Win32.getStdHandle Win32.sTD_ERROR_HANDLE
-         `catch` \ (_ :: IOError) ->
+         `catchException` \ (_ :: IOError) ->
            pure Win32.nullHANDLE
   if h == Win32.nullHANDLE
     then pure False
@@ -72,7 +72,7 @@ stderrSupportsAnsiColors' = do
     enableVTP h mode = do
         setConsoleMode h (modeAddVTP mode)
         modeHasVTP <$> getConsoleMode h
-      `catch` \ (_ :: IOError) ->
+      `catchException` \ (_ :: IOError) ->
         pure False
 
     modeHasVTP :: Win32.DWORD -> Bool