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/Plugins.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/Plugins.hs')
-rw-r--r-- | compiler/GHC/Plugins.hs | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/compiler/GHC/Plugins.hs b/compiler/GHC/Plugins.hs index 87363c3a89..8af39b5743 100644 --- a/compiler/GHC/Plugins.hs +++ b/compiler/GHC/Plugins.hs @@ -33,7 +33,7 @@ module GHC.Plugins , module GHC.Core.TyCon , module GHC.Core.Coercion , module GHC.Builtin.Types - , module GHC.Driver.Types + , module GHC.Driver.Env , module GHC.Types.Basic , module GHC.Types.Var.Set , module GHC.Types.Var.Env @@ -51,6 +51,11 @@ module GHC.Plugins , module GHC.Types.Unique.Supply , module GHC.Data.FastString , module GHC.Tc.Errors.Hole.FitTypes -- for hole-fit plugins + , module GHC.Unit.Module.ModGuts + , module GHC.Unit.Module.ModSummary + , module GHC.Unit.Module.ModIface + , module GHC.Types.Meta + , module GHC.Types.SourceError , -- * Getting 'Name's thNameToGhcName ) @@ -60,6 +65,8 @@ where import GHC.Driver.Plugins -- Variable naming +import GHC.Types.TyThing +import GHC.Types.SourceError import GHC.Types.Name.Reader import GHC.Types.Name.Occurrence hiding ( varName {- conflicts with Var.varName -} ) import GHC.Types.Name hiding ( varName {- reexport from OccName, conflicts with Var.varName -} ) @@ -78,23 +85,24 @@ import GHC.Core.FVs import GHC.Core.Subst hiding( substTyVarBndr, substCoVarBndr, extendCvSubst ) -- These names are also exported by Type --- Core "extras" import GHC.Core.Rules import GHC.Types.Annotations +import GHC.Types.Meta --- Pipeline-related stuff import GHC.Driver.Session import GHC.Unit.State --- Important GHC types import GHC.Unit.Module +import GHC.Unit.Module.ModGuts +import GHC.Unit.Module.ModSummary +import GHC.Unit.Module.ModIface import GHC.Core.Type hiding {- conflict with GHC.Core.Subst -} ( substTy, extendTvSubst, extendTvSubstList, isInScope ) import GHC.Core.Coercion hiding {- conflict with GHC.Core.Subst -} ( substCo ) import GHC.Core.TyCon import GHC.Builtin.Types -import GHC.Driver.Types +import GHC.Driver.Env import GHC.Types.Basic -- Collections and maps |