From 0e9f6defbdc1f691ff7197b21e68ac16ffa4ab59 Mon Sep 17 00:00:00 2001 From: Sylvain Henry Date: Thu, 15 Oct 2020 17:55:34 +0200 Subject: 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 --- compiler/GHC/ByteCode/Linker.hs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'compiler/GHC/ByteCode/Linker.hs') 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 -- cgit v1.2.1