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/HsToCore.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/HsToCore.hs')
-rw-r--r-- | compiler/GHC/HsToCore.hs | 60 |
1 files changed, 38 insertions, 22 deletions
diff --git a/compiler/GHC/HsToCore.hs b/compiler/GHC/HsToCore.hs index ac9adfac22..9954c204dc 100644 --- a/compiler/GHC/HsToCore.hs +++ b/compiler/GHC/HsToCore.hs @@ -20,55 +20,71 @@ module GHC.HsToCore ( import GHC.Prelude -import GHC.HsToCore.Usage import GHC.Driver.Session import GHC.Driver.Config -import GHC.Driver.Types +import GHC.Driver.Env import GHC.Driver.Backend + import GHC.Hs + +import GHC.HsToCore.Usage +import GHC.HsToCore.Monad +import GHC.HsToCore.Expr +import GHC.HsToCore.Binds +import GHC.HsToCore.Foreign.Decl +import GHC.HsToCore.Coverage +import GHC.HsToCore.Docs + import GHC.Tc.Types import GHC.Tc.Utils.Monad ( finalSafeMode, fixSafeInstances ) import GHC.Tc.Module ( runTcInteractive ) -import GHC.Types.Id -import GHC.Types.Id.Info -import GHC.Types.Name + import GHC.Core.Type import GHC.Core.TyCon ( tyConDataCons ) -import GHC.Types.Avail import GHC.Core import GHC.Core.FVs ( exprsSomeFreeVarsList ) import GHC.Core.SimpleOpt ( simpleOptPgm, simpleOptExpr ) import GHC.Core.Utils import GHC.Core.Unfold.Make import GHC.Core.Ppr -import GHC.HsToCore.Monad -import GHC.HsToCore.Expr -import GHC.HsToCore.Binds -import GHC.HsToCore.Foreign.Decl -import GHC.Builtin.Names -import GHC.Builtin.Types.Prim import GHC.Core.Coercion -import GHC.Builtin.Types import GHC.Core.DataCon ( dataConWrapId ) import GHC.Core.Make -import GHC.Unit -import GHC.Types.Name.Set -import GHC.Types.Name.Env import GHC.Core.Rules -import GHC.Types.Basic import GHC.Core.Opt.Monad ( CoreToDo(..) ) import GHC.Core.Lint ( endPassIO ) -import GHC.Types.Var.Set + +import GHC.Builtin.Names +import GHC.Builtin.Types.Prim +import GHC.Builtin.Types + import GHC.Data.FastString +import GHC.Data.OrdList + import GHC.Utils.Error import GHC.Utils.Outputable import GHC.Utils.Panic -import GHC.Types.SrcLoc -import GHC.HsToCore.Coverage import GHC.Utils.Misc import GHC.Utils.Monad -import GHC.Data.OrdList -import GHC.HsToCore.Docs + +import GHC.Types.Id +import GHC.Types.Id.Info +import GHC.Types.ForeignStubs +import GHC.Types.Avail +import GHC.Types.Basic +import GHC.Types.Var.Set +import GHC.Types.SrcLoc +import GHC.Types.SourceFile +import GHC.Types.TypeEnv +import GHC.Types.Name +import GHC.Types.Name.Set +import GHC.Types.Name.Env +import GHC.Types.Name.Ppr +import GHC.Types.HpcInfo + +import GHC.Unit +import GHC.Unit.Module.ModGuts +import GHC.Unit.Module.ModIface import Data.List import Data.IORef |