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/Driver/Pipeline.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/Driver/Pipeline.hs')
| -rw-r--r-- | compiler/GHC/Driver/Pipeline.hs | 73 |
1 files changed, 47 insertions, 26 deletions
diff --git a/compiler/GHC/Driver/Pipeline.hs b/compiler/GHC/Driver/Pipeline.hs index 7ca219bc48..5428c83b99 100644 --- a/compiler/GHC/Driver/Pipeline.hs +++ b/compiler/GHC/Driver/Pipeline.hs @@ -39,46 +39,67 @@ module GHC.Driver.Pipeline ( import GHC.Prelude +import GHC.Platform + +import GHC.Tc.Types + +import GHC.Driver.Main +import GHC.Driver.Env hiding ( Hsc ) import GHC.Driver.Pipeline.Monad -import GHC.Unit -import GHC.Unit.State +import GHC.Driver.Config +import GHC.Driver.Phases +import GHC.Driver.Session +import GHC.Driver.Backend +import GHC.Driver.Ppr +import GHC.Driver.Hooks + import GHC.Platform.Ways import GHC.Platform.ArchOS -import GHC.Driver.Config + import GHC.Parser.Header import GHC.Parser.Errors.Ppr -import GHC.Driver.Phases + import GHC.SysTools import GHC.SysTools.ExtraObj -import GHC.Driver.Main -import GHC.Driver.Finder -import GHC.Driver.Types hiding ( Hsc ) +import GHC.SysTools.FileCleanup +import GHC.SysTools.Ar + import GHC.Utils.Outputable import GHC.Utils.Error -import GHC.Driver.Session -import GHC.Driver.Backend -import GHC.Driver.Ppr import GHC.Utils.Panic import GHC.Utils.Misc -import GHC.Data.StringBuffer ( hGetStringBuffer, hPutStringBuffer ) -import GHC.Types.Basic ( SuccessFlag(..) ) -import GHC.Data.Maybe ( expectJust ) -import GHC.Types.SrcLoc -import GHC.CmmToLlvm ( llvmFixupAsm, llvmVersionList ) import GHC.Utils.Monad -import GHC.Platform -import GHC.Tc.Types -import GHC.Driver.Hooks +import GHC.Utils.Exception as Exception + +import GHC.CmmToLlvm ( llvmFixupAsm, llvmVersionList ) import qualified GHC.LanguageExtensions as LangExt -import GHC.SysTools.FileCleanup -import GHC.SysTools.Ar import GHC.Settings -import GHC.Data.Bag ( unitBag ) -import GHC.Data.FastString ( mkFastString ) -import GHC.Iface.Make ( mkFullIface ) -import GHC.Iface.UpdateIdInfos ( updateModDetailsIdInfos ) +import GHC.Runtime.Linker.Types + +import GHC.Data.Bag ( unitBag ) +import GHC.Data.FastString ( mkFastString ) +import GHC.Data.StringBuffer ( hGetStringBuffer, hPutStringBuffer ) +import GHC.Data.Maybe ( expectJust ) + +import GHC.Iface.Make ( mkFullIface ) +import GHC.Iface.UpdateIdInfos ( updateModDetailsIdInfos ) + +import GHC.Types.Basic ( SuccessFlag(..) ) +import GHC.Types.Target +import GHC.Types.SrcLoc +import GHC.Types.SourceFile +import GHC.Types.SourceError + +import GHC.Unit +import GHC.Unit.State +import GHC.Unit.Finder +import GHC.Unit.Module.ModSummary +import GHC.Unit.Module.ModDetails +import GHC.Unit.Module.ModIface +import GHC.Unit.Module.Graph (needsTemplateHaskellOrQQ) +import GHC.Unit.Module.Deps +import GHC.Unit.Home.ModInfo -import GHC.Utils.Exception as Exception import System.Directory import System.FilePath import System.IO @@ -594,7 +615,7 @@ findHSLib :: DynFlags -> [String] -> String -> IO (Maybe FilePath) findHSLib dflags dirs lib = do let batch_lib_file = if WayDyn `notElem` ways dflags then "lib" ++ lib <.> "a" - else mkSOName (targetPlatform dflags) lib + else platformSOName (targetPlatform dflags) lib found <- filterM doesFileExist (map (</> batch_lib_file) dirs) case found of [] -> return Nothing |
