diff options
Diffstat (limited to 'compiler/iface')
| -rw-r--r-- | compiler/iface/LoadIface.lhs | 3 | ||||
| -rw-r--r-- | compiler/iface/MkIface.lhs | 5 | ||||
| -rw-r--r-- | compiler/iface/TcIface.lhs | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/compiler/iface/LoadIface.lhs b/compiler/iface/LoadIface.lhs index eaf8ef56f8..4430b84760 100644 --- a/compiler/iface/LoadIface.lhs +++ b/compiler/iface/LoadIface.lhs @@ -162,8 +162,9 @@ loadUserInterface is_boot doc mod_name loadInterfaceWithException :: SDoc -> Module -> WhereFrom -> IfM lcl ModIface loadInterfaceWithException doc mod_name where_from = do { mb_iface <- loadInterface doc mod_name where_from + ; dflags <- getDynFlags ; case mb_iface of - Failed err -> ghcError (ProgramError (showSDoc err)) + Failed err -> ghcError (ProgramError (showSDoc dflags err)) Succeeded iface -> return iface } ------------------ diff --git a/compiler/iface/MkIface.lhs b/compiler/iface/MkIface.lhs index dd87cc74fa..3df54be1a7 100644 --- a/compiler/iface/MkIface.lhs +++ b/compiler/iface/MkIface.lhs @@ -1118,8 +1118,9 @@ checkOldIface :: HscEnv -> IO (RecompileRequired, Maybe ModIface) checkOldIface hsc_env mod_summary source_modified maybe_iface - = do showPass (hsc_dflags hsc_env) $ - "Checking old interface for " ++ (showSDoc $ ppr $ ms_mod mod_summary) + = do let dflags = hsc_dflags hsc_env + showPass dflags $ + "Checking old interface for " ++ (showPpr dflags $ ms_mod mod_summary) initIfaceCheck hsc_env $ check_old_iface hsc_env mod_summary source_modified maybe_iface diff --git a/compiler/iface/TcIface.lhs b/compiler/iface/TcIface.lhs index 6a5e423477..8f6ea05665 100644 --- a/compiler/iface/TcIface.lhs +++ b/compiler/iface/TcIface.lhs @@ -1001,7 +1001,8 @@ tcIfaceExpr (IfaceLit lit) tcIfaceExpr (IfaceFCall cc ty) = do ty' <- tcIfaceType ty u <- newUnique - return (Var (mkFCallId u cc ty')) + dflags <- getDynFlags + return (Var (mkFCallId dflags u cc ty')) tcIfaceExpr (IfaceTuple boxity args) = do args' <- mapM tcIfaceExpr args |
