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/Runtime/Interpreter.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/Runtime/Interpreter.hs')
| -rw-r--r-- | compiler/GHC/Runtime/Interpreter.hs | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/compiler/GHC/Runtime/Interpreter.hs b/compiler/GHC/Runtime/Interpreter.hs index bcfd34ee15..b2df09f35f 100644 --- a/compiler/GHC/Runtime/Interpreter.hs +++ b/compiler/GHC/Runtime/Interpreter.hs @@ -55,28 +55,36 @@ module GHC.Runtime.Interpreter import GHC.Prelude +import GHC.Driver.Ppr (showSDoc) +import GHC.Driver.Env +import GHC.Driver.Session + import GHC.Runtime.Interpreter.Types import GHCi.Message import GHCi.RemoteTypes import GHCi.ResolvedBCO import GHCi.BreakArray (BreakArray) -import GHC.Utils.Fingerprint -import GHC.Driver.Types +import GHC.Runtime.Eval.Types(BreakInfo(..)) +import GHC.Runtime.Linker.Types +import GHC.ByteCode.Types + +import GHC.Data.Maybe +import GHC.Data.FastString + +import GHC.Types.Unique +import GHC.Types.SrcLoc import GHC.Types.Unique.FM +import GHC.Types.Basic + import GHC.Utils.Panic -import GHC.Driver.Session import GHC.Utils.Exception as Ex -import GHC.Types.Basic -import GHC.Data.FastString -import GHC.Utils.Misc -import GHC.Runtime.Eval.Types(BreakInfo(..)) import GHC.Utils.Outputable(brackets, ppr) -import GHC.Driver.Ppr (showSDoc) -import GHC.Types.SrcLoc -import GHC.Data.Maybe +import GHC.Utils.Fingerprint +import GHC.Utils.Misc + import GHC.Unit.Module -import GHC.ByteCode.Types -import GHC.Types.Unique +import GHC.Unit.Module.ModIface +import GHC.Unit.Home.ModInfo #if defined(HAVE_INTERNAL_INTERPRETER) import GHCi.Run |