diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-10-15 17:55:34 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-10-29 03:53:52 -0400 |
| commit | 0e9f6defbdc1f691ff7197b21e68ac16ffa4ab59 (patch) | |
| tree | 1c9d9848db07596c19221fd195db81cdf6430385 /compiler/GHC/Iface/Load.hs | |
| parent | 795908dc4eab8e8b40cb318a2adbe4a4d4126c74 (diff) | |
| download | haskell-0e9f6defbdc1f691ff7197b21e68ac16ffa4ab59.tar.gz | |
Split GHC.Driver.Types
I was working on making DynFlags stateless (#17957), especially by
storing loaded plugins into HscEnv instead of DynFlags. It turned out to
be complicated because HscEnv is in GHC.Driver.Types but LoadedPlugin
isn't: it is in GHC.Driver.Plugins which depends on GHC.Driver.Types. I
didn't feel like introducing yet another hs-boot file to break the loop.
Additionally I remember that while we introduced the module hierarchy
(#13009) we talked about splitting GHC.Driver.Types because it contained
various unrelated types and functions, but we never executed. I didn't
feel like making GHC.Driver.Types bigger with more unrelated Plugins
related types, so finally I bit the bullet and split GHC.Driver.Types.
As a consequence this patch moves a lot of things. I've tried to put
them into appropriate modules but nothing is set in stone.
Several other things moved to avoid loops.
* Removed Binary instances from GHC.Utils.Binary for random compiler
things
* Moved Typeable Binary instances into GHC.Utils.Binary.Typeable: they
import a lot of things that users of GHC.Utils.Binary don't want to
depend on.
* put everything related to Units/Modules under GHC.Unit:
GHC.Unit.Finder, GHC.Unit.Module.{ModGuts,ModIface,Deps,etc.}
* Created several modules under GHC.Types: GHC.Types.Fixity, SourceText,
etc.
* Split GHC.Utils.Error (into GHC.Types.Error)
* Finally removed GHC.Driver.Types
Note that this patch doesn't put loaded plugins into HscEnv. It's left
for another patch.
Bump haddock submodule
Diffstat (limited to 'compiler/GHC/Iface/Load.hs')
| -rw-r--r-- | compiler/GHC/Iface/Load.hs | 60 |
1 files changed, 40 insertions, 20 deletions
diff --git a/compiler/GHC/Iface/Load.hs b/compiler/GHC/Iface/Load.hs index 212bcb78ac..ed8ecf0e08 100644 --- a/compiler/GHC/Iface/Load.hs +++ b/compiler/GHC/Iface/Load.hs @@ -40,49 +40,69 @@ import {-# SOURCE #-} GHC.IfaceToCore ( tcIfaceDecl, tcIfaceRules, tcIfaceInst, tcIfaceFamInst , tcIfaceAnnotations, tcIfaceCompleteMatches ) +import GHC.Driver.Env import GHC.Driver.Session import GHC.Driver.Backend import GHC.Driver.Ppr +import GHC.Driver.Hooks +import GHC.Driver.Plugins + import GHC.Iface.Syntax import GHC.Iface.Env -import GHC.Driver.Types +import GHC.Iface.Ext.Fields +import GHC.Iface.Binary +import GHC.Iface.Rename -import GHC.Types.Basic hiding (SuccessFlag(..)) import GHC.Tc.Utils.Monad import GHC.Utils.Binary ( BinData(..) ) +import GHC.Utils.Error +import GHC.Utils.Outputable as Outputable +import GHC.Utils.Panic +import GHC.Utils.Misc +import GHC.Utils.Fingerprint + import GHC.Settings.Constants + import GHC.Builtin.Names import GHC.Builtin.Utils import GHC.Builtin.PrimOps ( allThePrimOps, primOpFixity, primOpOcc ) -import GHC.Types.Id.Make ( seqId, EnableBignumRules(..) ) + import GHC.Core.Rules import GHC.Core.TyCon -import GHC.Types.Annotations import GHC.Core.InstEnv import GHC.Core.FamInstEnv + +import GHC.Types.Id.Make ( seqId, EnableBignumRules(..) ) +import GHC.Types.Annotations import GHC.Types.Name import GHC.Types.Name.Env import GHC.Types.Avail -import GHC.Unit.Module -import GHC.Unit.State -import GHC.Data.Maybe -import GHC.Utils.Error -import GHC.Driver.Finder +import GHC.Types.Fixity +import GHC.Types.Fixity.Env +import GHC.Types.SourceError +import GHC.Types.SourceText +import GHC.Types.SourceFile +import GHC.Types.SafeHaskell +import GHC.Types.TypeEnv import GHC.Types.Unique.FM +import GHC.Types.Unique.DSet import GHC.Types.SrcLoc -import GHC.Utils.Outputable as Outputable -import GHC.Iface.Binary -import GHC.Utils.Panic -import GHC.Utils.Misc -import GHC.Data.FastString -import GHC.Utils.Fingerprint -import GHC.Driver.Hooks import GHC.Types.FieldLabel -import GHC.Iface.Rename -import GHC.Types.Unique.DSet -import GHC.Driver.Plugins +import GHC.Types.TyThing + +import GHC.Unit.External +import GHC.Unit.Module +import GHC.Unit.Module.Warnings +import GHC.Unit.Module.ModIface +import GHC.Unit.Module.Deps +import GHC.Unit.State import GHC.Unit.Home +import GHC.Unit.Home.ModInfo +import GHC.Unit.Finder + +import GHC.Data.Maybe +import GHC.Data.FastString import Control.Monad import Control.Exception @@ -873,7 +893,7 @@ Note [Home module load error] If the sought-for interface is in the current package (as determined by -package-name flag) then it jolly well should already be in the HPT because we process home-package modules in dependency order. (Except -in one-shot mode; see notes with hsc_HPT decl in GHC.Driver.Types). +in one-shot mode; see notes with hsc_HPT decl in GHC.Driver.Env). It is possible (though hard) to get this error through user behaviour. * Suppose package P (modules P1, P2) depends on package Q (modules Q1, |
