summaryrefslogtreecommitdiff
path: root/compiler/GHC/HsToCore/Usage.hs
diff options
context:
space:
mode:
authorSylvain Henry <sylvain@haskus.fr>2020-10-15 17:55:34 +0200
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-10-29 03:53:52 -0400
commit0e9f6defbdc1f691ff7197b21e68ac16ffa4ab59 (patch)
tree1c9d9848db07596c19221fd195db81cdf6430385 /compiler/GHC/HsToCore/Usage.hs
parent795908dc4eab8e8b40cb318a2adbe4a4d4126c74 (diff)
downloadhaskell-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/HsToCore/Usage.hs')
-rw-r--r--compiler/GHC/HsToCore/Usage.hs31
1 files changed, 21 insertions, 10 deletions
diff --git a/compiler/GHC/HsToCore/Usage.hs b/compiler/GHC/HsToCore/Usage.hs
index 64c041902b..bf0e77911e 100644
--- a/compiler/GHC/HsToCore/Usage.hs
+++ b/compiler/GHC/HsToCore/Usage.hs
@@ -11,22 +11,33 @@ module GHC.HsToCore.Usage (
import GHC.Prelude
+import GHC.Driver.Env
import GHC.Driver.Session
+
+import GHC.Platform
import GHC.Platform.Ways
-import GHC.Driver.Types
+
import GHC.Tc.Types
-import GHC.Types.Name
-import GHC.Types.Name.Set
-import GHC.Unit
-import GHC.Unit.State
+
import GHC.Utils.Outputable
import GHC.Utils.Misc
-import GHC.Types.Unique.Set
-import GHC.Types.Unique.FM
import GHC.Utils.Fingerprint
import GHC.Utils.Panic
+
+import GHC.Types.Name
+import GHC.Types.Name.Set
+import GHC.Types.Unique.Set
+import GHC.Types.Unique.FM
+
+import GHC.Unit
+import GHC.Unit.External
+import GHC.Unit.State
+import GHC.Unit.Finder
+import GHC.Unit.Module.Imported
+import GHC.Unit.Module.ModIface
+import GHC.Unit.Module.Deps
+
import GHC.Data.Maybe
-import GHC.Driver.Finder
import Control.Monad (filterM)
import Data.List
@@ -175,7 +186,7 @@ mkPluginUsage hsc_env pluginModule
-- search for the library files containing the plugin.
let searchPaths = collectLibraryPaths (ways dflags) [pkg]
useDyn = WayDyn `elem` ways dflags
- suffix = if useDyn then soExt platform else "a"
+ suffix = if useDyn then platformSOExt platform else "a"
libLocs = [ searchPath </> "lib" ++ libLoc <.> suffix
| searchPath <- searchPaths
, libLoc <- packageHsLibs dflags pkg
@@ -187,7 +198,7 @@ mkPluginUsage hsc_env pluginModule
then libLocs
else
let dflags' = addWay' WayDyn dflags
- dlibLocs = [ searchPath </> mkHsSOName platform dlibLoc
+ dlibLocs = [ searchPath </> platformHsSOName platform dlibLoc
| searchPath <- searchPaths
, dlibLoc <- packageHsLibs dflags' pkg
]