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/Tidy.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/Tidy.hs')
-rw-r--r-- | compiler/GHC/Iface/Tidy.hs | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/compiler/GHC/Iface/Tidy.hs b/compiler/GHC/Iface/Tidy.hs index 82f1c18920..10d0eb1d04 100644 --- a/compiler/GHC/Iface/Tidy.hs +++ b/compiler/GHC/Iface/Tidy.hs @@ -17,10 +17,13 @@ module GHC.Iface.Tidy ( import GHC.Prelude -import GHC.Tc.Types import GHC.Driver.Session import GHC.Driver.Backend import GHC.Driver.Ppr +import GHC.Driver.Env + +import GHC.Tc.Types + import GHC.Core import GHC.Core.Unfold import GHC.Core.Unfold.Make @@ -34,36 +37,47 @@ import GHC.Core.Rules import GHC.Core.PatSyn import GHC.Core.ConLike import GHC.Core.Opt.Arity ( exprArity, exprBotStrictness_maybe ) +import GHC.Core.InstEnv +import GHC.Core.Type ( tidyTopType ) +import GHC.Core.DataCon +import GHC.Core.TyCon +import GHC.Core.Class + import GHC.Iface.Tidy.StaticPtrTable +import GHC.Iface.Env + +import GHC.Tc.Utils.Env +import GHC.Tc.Utils.Monad + +import GHC.Utils.Outputable +import GHC.Utils.Misc( filterOut ) +import GHC.Utils.Panic +import qualified GHC.Utils.Error as Err + +import GHC.Types.ForeignStubs import GHC.Types.Var.Env import GHC.Types.Var.Set import GHC.Types.Var import GHC.Types.Id import GHC.Types.Id.Make ( mkDictSelRhs ) import GHC.Types.Id.Info -import GHC.Core.InstEnv -import GHC.Core.Type ( tidyTopType ) import GHC.Types.Demand ( appIsDeadEnd, isTopSig, isDeadEndSig ) import GHC.Types.Cpr ( mkCprSig, botCpr ) import GHC.Types.Basic import GHC.Types.Name hiding (varName) import GHC.Types.Name.Set import GHC.Types.Name.Cache +import GHC.Types.Name.Ppr import GHC.Types.Avail -import GHC.Iface.Env -import GHC.Tc.Utils.Env -import GHC.Tc.Utils.Monad -import GHC.Core.DataCon -import GHC.Core.TyCon -import GHC.Core.Class +import GHC.Types.Unique.Supply +import GHC.Types.TypeEnv + import GHC.Unit.Module -import GHC.Driver.Types +import GHC.Unit.Module.ModGuts +import GHC.Unit.Module.ModDetails +import GHC.Unit.Module.Deps + import GHC.Data.Maybe -import GHC.Types.Unique.Supply -import GHC.Utils.Outputable -import GHC.Utils.Misc( filterOut ) -import GHC.Utils.Panic -import qualified GHC.Utils.Error as Err import Control.Monad import Data.Function |