diff options
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/GHCi/UI.hs | 10 | ||||
| -rw-r--r-- | ghc/Main.hs | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs index a028f4e479..a97200c5c3 100644 --- a/ghc/GHCi/UI.hs +++ b/ghc/GHCi/UI.hs @@ -577,10 +577,10 @@ resetLastErrorLocations = do ghciLogAction :: IORef [(FastString, Int)] -> LogAction -> LogAction ghciLogAction lastErrLocations old_log_action - dflags flag severity srcSpan msg = do - old_log_action dflags flag severity srcSpan msg - case severity of - SevError -> case srcSpan of + dflags msg_class srcSpan msg = do + old_log_action dflags msg_class srcSpan msg + case msg_class of + MCDiagnostic SevError _reason -> case srcSpan of RealSrcSpan rsp _ -> modifyIORef lastErrLocations (++ [(srcLocFile (realSrcSpanStart rsp), srcLocLine (realSrcSpanStart rsp))]) _ -> return () @@ -3188,7 +3188,7 @@ showCmd str = do , action "bindings" $ showBindings , action "linker" $ do msg <- liftIO $ Loader.showLoaderState (hscInterp hsc_env) - putLogMsgM NoReason SevDump noSrcSpan msg + putLogMsgM MCDump noSrcSpan msg , action "breaks" $ showBkptTable , action "context" $ showContext , action "packages" $ showUnits diff --git a/ghc/Main.hs b/ghc/Main.hs index 9da5469b8a..2873cba4ad 100644 --- a/ghc/Main.hs +++ b/ghc/Main.hs @@ -23,7 +23,7 @@ import GHC.Driver.CmdLine import GHC.Driver.Env import GHC.Driver.Errors import GHC.Driver.Phases -import GHC.Driver.Session hiding (WarnReason(..)) +import GHC.Driver.Session import GHC.Driver.Ppr import GHC.Driver.Pipeline ( oneShot, compileFile ) import GHC.Driver.MakeFile ( doMkDependHS ) |