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/ByteCode | |
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/ByteCode')
-rw-r--r-- | compiler/GHC/ByteCode/Asm.hs | 19 | ||||
-rw-r--r-- | compiler/GHC/ByteCode/InfoTable.hs | 11 | ||||
-rw-r--r-- | compiler/GHC/ByteCode/Linker.hs | 15 |
3 files changed, 29 insertions, 16 deletions
diff --git a/compiler/GHC/ByteCode/Asm.hs b/compiler/GHC/ByteCode/Asm.hs index c344823ccb..92255f9ea0 100644 --- a/compiler/GHC/ByteCode/Asm.hs +++ b/compiler/GHC/ByteCode/Asm.hs @@ -19,27 +19,30 @@ module GHC.ByteCode.Asm ( import GHC.Prelude +import GHC.Driver.Env +import GHC.Driver.Session + import GHC.ByteCode.Instr import GHC.ByteCode.InfoTable import GHC.ByteCode.Types import GHCi.RemoteTypes import GHC.Runtime.Interpreter +import GHC.Runtime.Heap.Layout -import GHC.Driver.Types import GHC.Types.Name import GHC.Types.Name.Set import GHC.Types.Literal +import GHC.Types.Unique +import GHC.Types.Unique.DSet + +import GHC.Utils.Outputable +import GHC.Utils.Panic +import GHC.Utils.Misc + import GHC.Core.TyCon import GHC.Data.FastString import GHC.StgToCmm.Layout ( ArgRep(..) ) -import GHC.Runtime.Heap.Layout -import GHC.Driver.Session -import GHC.Utils.Outputable -import GHC.Utils.Panic import GHC.Platform -import GHC.Utils.Misc -import GHC.Types.Unique -import GHC.Types.Unique.DSet -- From iserv import SizedSeq diff --git a/compiler/GHC/ByteCode/InfoTable.hs b/compiler/GHC/ByteCode/InfoTable.hs index 567209adda..594a68c12b 100644 --- a/compiler/GHC/ByteCode/InfoTable.hs +++ b/compiler/GHC/ByteCode/InfoTable.hs @@ -12,21 +12,26 @@ module GHC.ByteCode.InfoTable ( mkITbls ) where import GHC.Prelude +import GHC.Driver.Session +import GHC.Driver.Env + import GHC.Platform import GHC.Platform.Profile import GHC.ByteCode.Types import GHC.Runtime.Interpreter -import GHC.Driver.Session -import GHC.Driver.Types + import GHC.Types.Name ( Name, getName ) import GHC.Types.Name.Env +import GHC.Types.RepType + import GHC.Core.DataCon ( DataCon, dataConRepArgTys, dataConIdentity ) import GHC.Core.TyCon ( TyCon, tyConFamilySize, isDataTyCon, tyConDataCons ) import GHC.Core.Multiplicity ( scaledThing ) -import GHC.Types.RepType + import GHC.StgToCmm.Layout ( mkVirtConstrSizes ) import GHC.StgToCmm.Closure ( tagForCon, NonVoid (..) ) + import GHC.Utils.Misc import GHC.Utils.Panic diff --git a/compiler/GHC/ByteCode/Linker.hs b/compiler/GHC/ByteCode/Linker.hs index a158886369..7b532b96d5 100644 --- a/compiler/GHC/ByteCode/Linker.hs +++ b/compiler/GHC/ByteCode/Linker.hs @@ -19,24 +19,29 @@ module GHC.ByteCode.Linker ( import GHC.Prelude +import GHC.Driver.Env + +import GHC.Runtime.Interpreter +import GHC.ByteCode.Types import GHCi.RemoteTypes import GHCi.ResolvedBCO import GHCi.BreakArray import SizedSeq -import GHC.Runtime.Interpreter -import GHC.ByteCode.Types -import GHC.Driver.Types -import GHC.Types.Name -import GHC.Types.Name.Env import GHC.Builtin.PrimOps + import GHC.Unit.Types import GHC.Unit.Module.Name + import GHC.Data.FastString + import GHC.Utils.Panic import GHC.Utils.Outputable import GHC.Utils.Misc +import GHC.Types.Name +import GHC.Types.Name.Env + -- Standard libraries import Data.Array.Unboxed import Foreign.Ptr |