diff options
Diffstat (limited to 'compiler/GHC/Tc')
| -rw-r--r-- | compiler/GHC/Tc/Errors/Types.hs | 1 | ||||
| -rw-r--r-- | compiler/GHC/Tc/Module.hs | 8 | ||||
| -rw-r--r-- | compiler/GHC/Tc/Utils/Backpack.hs | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/compiler/GHC/Tc/Errors/Types.hs b/compiler/GHC/Tc/Errors/Types.hs index 62732ed8dd..1e52a526fe 100644 --- a/compiler/GHC/Tc/Errors/Types.hs +++ b/compiler/GHC/Tc/Errors/Types.hs @@ -104,7 +104,6 @@ import GHC.Core.TyCon (TyCon, TyConFlavour) import GHC.Core.Type (Kind, Type, ThetaType, PredType) import GHC.Driver.Backend (Backend) import GHC.Unit.State (UnitState) -import GHC.Unit.Module.Name (ModuleName) import GHC.Types.Basic import GHC.Utils.Misc (capitalise, filterOut) import qualified GHC.LanguageExtensions as LangExt diff --git a/compiler/GHC/Tc/Module.hs b/compiler/GHC/Tc/Module.hs index 7345638d2d..d23fad536c 100644 --- a/compiler/GHC/Tc/Module.hs +++ b/compiler/GHC/Tc/Module.hs @@ -239,12 +239,14 @@ tcRnModuleTcRnM :: HscEnv -> TcRn TcGblEnv -- Factored out separately from tcRnModule so that a Core plugin can -- call the type checker directly +tcRnModuleTcRnM _ _ + (HsParsedModule (L _ (XModule x)) _) + _ = dataConCantHappen x tcRnModuleTcRnM hsc_env mod_sum (HsParsedModule { hpm_module = - (L loc (HsModule _ _ maybe_mod export_ies - import_decls local_decls mod_deprec - maybe_doc_hdr)), + (L loc (HsModule (XModulePs _ _ mod_deprec maybe_doc_hdr) + maybe_mod export_ies import_decls local_decls)), hpm_src_files = src_files }) (this_mod, prel_imp_loc) diff --git a/compiler/GHC/Tc/Utils/Backpack.hs b/compiler/GHC/Tc/Utils/Backpack.hs index d553ec4fad..8758db5f47 100644 --- a/compiler/GHC/Tc/Utils/Backpack.hs +++ b/compiler/GHC/Tc/Utils/Backpack.hs @@ -521,6 +521,8 @@ merge_msg mod_name reqs = -- a final 'TcGblEnv' that matches the local signature and -- all required signatures. mergeSignatures :: HsParsedModule -> TcGblEnv -> ModIface -> TcRn TcGblEnv +mergeSignatures (HsParsedModule { hpm_module = L _ (XModule ext) }) _ _ + = dataConCantHappen ext mergeSignatures (HsParsedModule { hpm_module = L loc (HsModule { hsmodExports = mb_exports }), hpm_src_files = src_files }) |