Unit: split and rename modules

Introduce GHC.Unit.* hierarchy for everything concerning units, packages
and modules.

Update Haddock submodule

compiler/GHC.hs

@@ -312,7 +312,7 @@ import GHC.Tc.Utils.Monad    ( finalSafeMode, fixSafeInstances, initIfaceTcRn )
 import GHC.Iface.Load        ( loadSysInterface )
 import GHC.Tc.Types
 import GHC.Core.Predicate
-import GHC.Driver.Packages
+import GHC.Unit.State
 import GHC.Types.Name.Set
 import GHC.Types.Name.Reader
 import GHC.Hs
@@ -341,7 +341,7 @@ import GHC.Driver.Ways
 import GHC.SysTools
 import GHC.SysTools.BaseDir
 import GHC.Types.Annotations
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Utils.Panic
 import GHC.Platform
 import GHC.Data.Bag        ( listToBag )

compiler/GHC/Builtin/Names.hs

@@ -143,7 +143,8 @@ this constructor directly (see  CorePrep.lookupIntegerSDataConName)
 When GHC reads the package data base, it (internally only) pretends it has UnitId
 `integer-wired-in` instead of the actual UnitId (which includes the version
 number); just like for `base` and other packages, as described in
-Note [Wired-in packages] in GHC.Types.Module. This is done in Packages.findWiredInPackages.
+Note [Wired-in units] in GHC.Unit.Module. This is done in
+GHC.Unit.State.findWiredInPackages.
 -}
 
 {-# LANGUAGE CPP #-}
@@ -165,7 +166,8 @@ where
 
 import GHC.Prelude
 
-import GHC.Types.Module
+import GHC.Unit.Types
+import GHC.Unit.Module.Name
 import GHC.Types.Name.Occurrence
 import GHC.Types.Name.Reader
 import GHC.Types.Unique

compiler/GHC/Builtin/Names.hs-boot

 module GHC.Builtin.Names where
 
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Types.Unique
 
 mAIN :: Module

compiler/GHC/Builtin/Names/TH.hs

@@ -9,7 +9,7 @@ module GHC.Builtin.Names.TH where
 import GHC.Prelude ()
 
 import GHC.Builtin.Names( mk_known_key_name )
-import GHC.Types.Module( Module, mkModuleNameFS, mkModule, thUnitId )
+import GHC.Unit
 import GHC.Types.Name( Name )
 import GHC.Types.Name.Occurrence( tcName, clsName, dataName, varName )
 import GHC.Types.Name.Reader( RdrName, nameRdrName )

compiler/GHC/Builtin/PrimOps.hs

@@ -44,7 +44,7 @@ import GHC.Types.Basic   ( Arity, Fixity(..), FixityDirection(..), Boxity(..),
 import GHC.Types.SrcLoc  ( wiredInSrcSpan )
 import GHC.Types.ForeignCall ( CLabelString )
 import GHC.Types.Unique  ( Unique, mkPrimOpIdUnique, mkPrimOpWrapperUnique )
-import GHC.Types.Module  ( Unit )
+import GHC.Unit          ( Unit )
 import GHC.Utils.Outputable
 import GHC.Data.FastString
 

compiler/GHC/Builtin/Types.hs

@@ -143,7 +143,7 @@ import {-# SOURCE #-} GHC.Builtin.Uniques
 import GHC.Core.Coercion.Axiom
 import GHC.Types.Id
 import GHC.Settings.Constants ( mAX_TUPLE_SIZE, mAX_CTUPLE_SIZE, mAX_SUM_SIZE )
-import GHC.Types.Module ( Module )
+import GHC.Unit.Module        ( Module )
 import GHC.Core.Type
 import GHC.Types.RepType
 import GHC.Core.DataCon

compiler/GHC/ByteCode/Linker.hs

@@ -31,7 +31,7 @@ import GHC.Driver.Types
 import GHC.Types.Name
 import GHC.Types.Name.Env
 import GHC.Builtin.PrimOps
-import GHC.Types.Module
+import GHC.Unit
 import GHC.Data.FastString
 import GHC.Utils.Panic
 import GHC.Utils.Outputable

compiler/GHC/Cmm/CLabel.hs

@@ -119,8 +119,8 @@ import GHC.Prelude
 import GHC.Types.Id.Info
 import GHC.Types.Basic
 import {-# SOURCE #-} GHC.Cmm.BlockId (BlockId, mkBlockId)
-import GHC.Driver.Packages
-import GHC.Types.Module
+import GHC.Unit.State
+import GHC.Unit
 import GHC.Types.Name
 import GHC.Types.Unique
 import GHC.Builtin.PrimOps

compiler/GHC/Cmm/DebugBlock.hs

@@ -34,7 +34,7 @@ import GHC.Cmm
 import GHC.Cmm.Utils
 import GHC.Core
 import GHC.Data.FastString ( nilFS, mkFastString )
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Utils.Outputable
 import GHC.Cmm.Ppr.Expr ( pprExpr )
 import GHC.Types.SrcLoc

compiler/GHC/Cmm/Info/Build.hs

@@ -18,7 +18,7 @@ import GHC.Cmm.Dataflow.Graph
 import GHC.Cmm.Dataflow.Label
 import GHC.Cmm.Dataflow.Collections
 import GHC.Cmm.Dataflow
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Platform
 import GHC.Data.Graph.Directed
 import GHC.Cmm.CLabel

compiler/GHC/Cmm/Parser.y

@@ -236,7 +236,7 @@ import GHC.Parser.Lexer
 
 import GHC.Types.CostCentre
 import GHC.Types.ForeignCall
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Platform
 import GHC.Types.Literal
 import GHC.Types.Unique

compiler/GHC/CmmToAsm.hs

@@ -95,7 +95,7 @@ import GHC.Utils.Outputable as Outputable
 import GHC.Data.FastString
 import GHC.Types.Unique.Set
 import GHC.Utils.Error
-import GHC.Types.Module
+import GHC.Unit
 import GHC.Data.Stream (Stream)
 import qualified GHC.Data.Stream as Stream
 

compiler/GHC/CmmToAsm/Dwarf.hs

@@ -10,7 +10,7 @@ import Config          ( cProjectName, cProjectVersion )
 import GHC.Core        ( Tickish(..) )
 import GHC.Cmm.DebugBlock
 import GHC.Driver.Session
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Utils.Outputable
 import GHC.Platform
 import GHC.Types.Unique

compiler/GHC/CmmToAsm/Monad.hs

@@ -64,7 +64,7 @@ import GHC.Types.Unique.FM
 import GHC.Types.Unique.Supply
 import GHC.Types.Unique         ( Unique )
 import GHC.Driver.Session
-import GHC.Types.Module
+import GHC.Unit.Module
 
 import Control.Monad    ( ap )
 

compiler/GHC/CmmToAsm/PIC.hs

@@ -71,7 +71,7 @@ import GHC.Cmm.CLabel           ( mkForeignLabel )
 
 
 import GHC.Types.Basic
-import GHC.Types.Module
+import GHC.Unit.Module
 
 import GHC.Utils.Outputable
 

compiler/GHC/CmmToAsm/X86/CodeGen.hs

@@ -67,7 +67,7 @@ import GHC.Platform
 -- Our intermediate code:
 import GHC.Types.Basic
 import GHC.Cmm.BlockId
-import GHC.Types.Module ( primUnitId )
+import GHC.Unit ( primUnitId )
 import GHC.Cmm.Utils
 import GHC.Cmm.Switch
 import GHC.Cmm

compiler/GHC/Core.hs

@@ -112,7 +112,7 @@ import GHC.Types.Name.Set
 import GHC.Types.Name.Env( NameEnv, emptyNameEnv )
 import GHC.Types.Literal
 import GHC.Core.DataCon
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Types.Basic
 import GHC.Utils.Outputable
 import GHC.Utils.Misc

compiler/GHC/Core/DataCon.hs

@@ -78,7 +78,7 @@ import GHC.Utils.Outputable
 import GHC.Utils.Misc
 import GHC.Types.Basic
 import GHC.Data.FastString
-import GHC.Types.Module
+import GHC.Unit
 import GHC.Utils.Binary
 import GHC.Types.Unique.Set
 import GHC.Types.Unique( mkAlphaTyVarUnique )

compiler/GHC/Core/InstEnv.hs

@@ -36,7 +36,7 @@ import GHC.Prelude
 import GHC.Tc.Utils.TcType -- InstEnv is really part of the type checker,
               -- and depends on TcType in many ways
 import GHC.Core ( IsOrphan(..), isOrphan, chooseOrphanAnchor )
-import GHC.Types.Module
+import GHC.Unit
 import GHC.Core.Class
 import GHC.Types.Var
 import GHC.Types.Var.Set

compiler/GHC/Core/Opt/Driver.hs

@@ -51,7 +51,7 @@ import GHC.Core.Opt.Exitify      ( exitifyProgram )
 import GHC.Core.Opt.WorkWrap     ( wwTopBinds )
 import GHC.Types.SrcLoc
 import GHC.Utils.Misc
-import GHC.Types.Module
+import GHC.Unit.Module.Env
 import GHC.Driver.Plugins ( withPlugins, installCoreToDos )
 import GHC.Runtime.Loader -- ( initializePlugins )
 

compiler/GHC/Core/Opt/Monad.hs

@@ -52,7 +52,7 @@ import GHC.Prelude hiding ( read )
 
 import GHC.Core
 import GHC.Driver.Types
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Driver.Session
 import GHC.Types.Basic  ( CompilerPhase(..) )
 import GHC.Types.Annotations

compiler/GHC/Core/Opt/OccurAnal.hs

@@ -28,7 +28,7 @@ import GHC.Core.Arity   ( joinRhsArity )
 import GHC.Types.Id
 import GHC.Types.Id.Info
 import GHC.Types.Basic
-import GHC.Types.Module( Module )
+import GHC.Unit.Module( Module )
 import GHC.Core.Coercion
 import GHC.Core.Type
 

compiler/GHC/Core/Opt/Simplify.hs

@@ -57,7 +57,7 @@ import GHC.Utils.Outputable
 import GHC.Data.FastString
 import GHC.Utils.Misc
 import GHC.Utils.Error
-import GHC.Types.Module ( moduleName, pprModuleName )
+import GHC.Unit.Module ( moduleName, pprModuleName )
 import GHC.Builtin.PrimOps ( PrimOp (SeqOp) )
 
 

compiler/GHC/Core/Opt/SpecConstr.hs

@@ -60,7 +60,7 @@ import GHC.Utils.Monad
 import Control.Monad    ( zipWithM )
 import Data.List
 import GHC.Builtin.Names ( specTyConName )
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Core.TyCon ( TyCon )
 import GHC.Exts( SpecConstrAnnotation(..) )
 import Data.Ord( comparing )

compiler/GHC/Core/Opt/Specialise.hs

@@ -19,7 +19,7 @@ import GHC.Types.Id
 import GHC.Tc.Utils.TcType hiding( substTy )
 import GHC.Core.Type  hiding( substTy, extendTvSubstList )
 import GHC.Core.Predicate
-import GHC.Types.Module( Module, HasModule(..) )
+import GHC.Unit.Module( Module, HasModule(..) )
 import GHC.Core.Coercion( Coercion )
 import GHC.Core.Opt.Monad
 import qualified GHC.Core.Subst as Core

compiler/GHC/Core/Rules.hs

@@ -31,7 +31,8 @@ module GHC.Core.Rules (
 import GHC.Prelude
 
 import GHC.Core         -- All of it
-import GHC.Types.Module   ( Module, ModuleSet, elemModuleSet )
+import GHC.Unit.Module   ( Module )
+import GHC.Unit.Module.Env
 import GHC.Core.Subst
 import GHC.Core.SimpleOpt ( exprIsLambda_maybe )
 import GHC.Core.FVs       ( exprFreeVars, exprsFreeVars, bindFreeVars

compiler/GHC/Core/SimpleOpt.hs

@@ -48,7 +48,7 @@ import GHC.Core.TyCon ( tyConArity )
 import GHC.Builtin.Types
 import GHC.Builtin.Names
 import GHC.Types.Basic
-import GHC.Types.Module ( Module )
+import GHC.Unit.Module ( Module )
 import GHC.Utils.Error
 import GHC.Driver.Session
 import GHC.Utils.Outputable

compiler/GHC/Core/TyCon.hs

@@ -167,7 +167,7 @@ import GHC.Settings.Constants
 import GHC.Utils.Misc
 import GHC.Types.Unique( tyConRepNameUnique, dataConTyRepNameUnique )
 import GHC.Types.Unique.Set
-import GHC.Types.Module
+import GHC.Unit.Module
 
 import qualified Data.Data as Data
 

compiler/GHC/CoreToByteCode.hs

@@ -64,7 +64,7 @@ import Control.Monad
 import Data.Char
 
 import GHC.Types.Unique.Supply
-import GHC.Types.Module
+import GHC.Unit.Module
 
 import Control.Exception
 import Data.Array

compiler/GHC/CoreToStg.hs

@@ -32,7 +32,7 @@ import GHC.Types.Id.Info
 import GHC.Core.DataCon
 import GHC.Types.CostCentre
 import GHC.Types.Var.Env
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Types.Name   ( isExternalName, nameModule_maybe )
 import GHC.Types.Basic  ( Arity )
 import GHC.Builtin.Types ( unboxedUnitDataCon, unitDataConId )

compiler/GHC/CoreToStg/Prep.hs

@@ -46,7 +46,7 @@ import GHC.Types.Id.Info
 import GHC.Builtin.Types
 import GHC.Core.DataCon
 import GHC.Types.Basic
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Types.Unique.Supply
 import GHC.Data.Maybe
 import GHC.Data.OrdList

compiler/GHC/Data/IOEnv.hs

@@ -35,7 +35,7 @@ import GHC.Prelude
 
 import GHC.Driver.Session
 import GHC.Utils.Exception
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Utils.Panic
 
 import Data.IORef       ( IORef, newIORef, readIORef, writeIORef, modifyIORef,

compiler/GHC/Driver/Backpack.hs

@@ -25,14 +25,13 @@ import GHC.Driver.Backpack.Syntax
 
 import GHC.Parser.Annotation
 import GHC hiding (Failed, Succeeded)
-import GHC.Driver.Packages hiding (packageNameMap)
 import GHC.Parser
 import GHC.Parser.Lexer
 import GHC.Driver.Monad
 import GHC.Driver.Session
 import GHC.Tc.Utils.Monad
 import GHC.Tc.Module
-import GHC.Types.Module
+import GHC.Unit
 import GHC.Driver.Types
 import GHC.Data.StringBuffer
 import GHC.Data.FastString
@@ -88,7 +87,7 @@ doBackpack [src_filename] = do
             -- OK, so we have an LHsUnit PackageName, but we want an
             -- LHsUnit HsComponentId.  So let's rename it.
             let pkgstate = pkgState dflags
-            let bkp = renameHsUnits pkgstate (packageNameMap pkgstate pkgname_bkp) pkgname_bkp
+            let bkp = renameHsUnits pkgstate (bkpPackageNameMap pkgstate pkgname_bkp) pkgname_bkp
             initBkpM src_filename bkp $
                 forM_ (zip [1..] bkp) $ \(i, lunit) -> do
                     let comp_name = unLoc (hsunitName (unLoc lunit))
@@ -192,7 +191,7 @@ withBkpSession cid insts deps session_type do_this = do
         importPaths = [],
         -- Synthesized the flags
         packageFlags = packageFlags dflags ++ map (\(uid0, rn) ->
-          let uid = unwireUnit dflags (improveUnit (getUnitInfoMap dflags) $ renameHoleUnit dflags (listToUFM insts) uid0)
+          let uid = unwireUnit dflags (improveUnit (unitInfoMap (pkgState dflags)) $ renameHoleUnit (pkgState dflags) (listToUFM insts) uid0)
           in ExposePackage
             (showSDoc dflags
                 (text "-unit-id" <+> ppr uid <+> ppr rn))
@@ -260,7 +259,7 @@ buildUnit session cid insts lunit = do
     -- The compilation dependencies are just the appropriately filled
     -- in unit IDs which must be compiled before we can compile.
     let hsubst = listToUFM insts
-        deps0 = map (renameHoleUnit dflags hsubst) raw_deps
+        deps0 = map (renameHoleUnit (pkgState dflags) hsubst) raw_deps
 
     -- Build dependencies OR make sure they make sense. BUT NOTE,
     -- we can only check the ones that are fully filled; the rest
@@ -273,7 +272,7 @@ buildUnit session cid insts lunit = do
 
     dflags <- getDynFlags
     -- IMPROVE IT
-    let deps = map (improveUnit (getUnitInfoMap dflags)) deps0
+    let deps = map (improveUnit (unitInfoMap (pkgState dflags))) deps0
 
     mb_old_eps <- case session of
                     TcSession -> fmap Just getEpsGhc
@@ -562,8 +561,8 @@ unitDefines :: PackageState -> LHsUnit PackageName -> (PackageName, HsComponentI
 unitDefines pkgstate (L _ HsUnit{ hsunitName = L _ pn@(PackageName fs) })
     = (pn, HsComponentId pn (mkIndefUnitId pkgstate fs))
 
-packageNameMap :: PackageState -> [LHsUnit PackageName] -> PackageNameMap HsComponentId
-packageNameMap pkgstate units = Map.fromList (map (unitDefines pkgstate) units)
+bkpPackageNameMap :: PackageState -> [LHsUnit PackageName] -> PackageNameMap HsComponentId
+bkpPackageNameMap pkgstate units = Map.fromList (map (unitDefines pkgstate) units)
 
 renameHsUnits :: PackageState -> PackageNameMap HsComponentId -> [LHsUnit PackageName] -> [LHsUnit HsComponentId]
 renameHsUnits pkgstate m units = map (fmap renameHsUnit) units

compiler/GHC/Driver/Backpack/Syntax.hs

@@ -22,8 +22,7 @@ import GHC.Driver.Phases
 import GHC.Hs
 import GHC.Types.SrcLoc
 import GHC.Utils.Outputable
-import GHC.Types.Module
-import GHC.Unit.Info
+import GHC.Unit
 
 {-
 ************************************************************************

compiler/GHC/Driver/CodeOutput.hs

@@ -25,7 +25,6 @@ import GHC.Types.Unique.Supply ( mkSplitUniqSupply )
 import GHC.Driver.Finder    ( mkStubPaths )
 import GHC.CmmToC           ( writeC )
 import GHC.Cmm.Lint         ( cmmLint )
-import GHC.Driver.Packages
 import GHC.Cmm              ( RawCmmGroup )
 import GHC.Cmm.CLabel
 import GHC.Driver.Types
@@ -36,7 +35,7 @@ import GHC.SysTools.FileCleanup
 
 import GHC.Utils.Error
 import GHC.Utils.Outputable
-import GHC.Types.Module
+import GHC.Unit
 import GHC.Types.SrcLoc
 import GHC.Types.CostCentre
 

compiler/GHC/Driver/Finder.hs

@@ -36,9 +36,8 @@ module GHC.Driver.Finder (
 
 import GHC.Prelude
 
-import GHC.Types.Module
+import GHC.Unit
 import GHC.Driver.Types
-import GHC.Driver.Packages
 import GHC.Data.FastString
 import GHC.Utils.Misc
 import GHC.Builtin.Names ( gHC_PRIM )

compiler/GHC/Driver/Hooks.hs

@@ -48,7 +48,7 @@ import GHC.Types.SrcLoc
 import GHC.Core.Type
 import System.Process
 import GHC.Types.Basic
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Core.TyCon
 import GHC.Types.CostCentre
 import GHC.Stg.Syntax

compiler/GHC/Driver/Main.hs

@@ -101,8 +101,8 @@ import GHC.Utils.Panic
 import GHC.Core.ConLike
 
 import GHC.Parser.Annotation
-import GHC.Types.Module
-import GHC.Driver.Packages
+import GHC.Unit.Module
+import GHC.Unit.State
 import GHC.Types.Name.Reader
 import GHC.Hs
 import GHC.Hs.Dump

compiler/GHC/Driver/Make.hs

@@ -45,7 +45,7 @@ import GHC.Driver.Finder
 import GHC.Driver.Monad
 import GHC.Parser.Header
 import GHC.Driver.Types
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.IfaceToCore     ( typecheckIface )
 import GHC.Tc.Utils.Monad  ( initIfaceCheck )
 import GHC.Driver.Main
@@ -65,7 +65,7 @@ import GHC.Data.StringBuffer
 import GHC.Types.Unique.FM
 import GHC.Types.Unique.DSet
 import GHC.Tc.Utils.Backpack
-import GHC.Driver.Packages
+import GHC.Unit.State
 import GHC.Types.Unique.Set
 import GHC.Utils.Misc
 import qualified GHC.LanguageExtensions as LangExt

compiler/GHC/Driver/MakeFile.hs

@@ -24,7 +24,7 @@ import GHC.Driver.Ways
 import GHC.Utils.Misc
 import GHC.Driver.Types
 import qualified GHC.SysTools as SysTools
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Data.Graph.Directed ( SCC(..) )
 import GHC.Driver.Finder
 import GHC.Utils.Outputable

compiler/GHC/Driver/Pipeline.hs

@@ -39,7 +39,7 @@ module GHC.Driver.Pipeline (
 import GHC.Prelude
 
 import GHC.Driver.Pipeline.Monad
-import GHC.Driver.Packages
+import GHC.Unit.State
 import GHC.Driver.Ways
 import GHC.Parser.Header
 import GHC.Driver.Phases
@@ -49,7 +49,7 @@ import GHC.Driver.Main
 import GHC.Driver.Finder
 import GHC.Driver.Types hiding ( Hsc )
 import GHC.Utils.Outputable
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Utils.Error
 import GHC.Driver.Session
 import GHC.Utils.Panic

compiler/GHC/Driver/Pipeline/Monad.hs

@@ -18,7 +18,7 @@ import GHC.Utils.Outputable
 import GHC.Driver.Session
 import GHC.Driver.Phases
 import GHC.Driver.Types
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.SysTools.FileCleanup (TempFileLifetime)
 
 import Control.Monad

compiler/GHC/Driver/Plugins.hs

@@ -58,7 +58,7 @@ import GHC.Driver.Session
 import GHC.Driver.Types
 import GHC.Driver.Monad
 import GHC.Driver.Phases
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Utils.Fingerprint
 import Data.List (sort)
 import GHC.Utils.Outputable (Outputable(..), text, (<+>))

compiler/GHC/Driver/Session.hs

@@ -242,11 +242,13 @@ import GHC.Prelude
 
 import GHC.Platform
 import GHC.UniqueSubdir (uniqueSubdir)
-import GHC.Types.Module
+import GHC.Unit.Types
+import GHC.Unit.Parser
+import GHC.Unit.Module
 import {-# SOURCE #-} GHC.Driver.Plugins
 import {-# SOURCE #-} GHC.Driver.Hooks
 import {-# SOURCE #-} GHC.Builtin.Names ( mAIN )
-import {-# SOURCE #-} GHC.Driver.Packages (PackageState, emptyPackageState, PackageDatabase, mkIndefUnitId, updateIndefUnitId)
+import {-# SOURCE #-} GHC.Unit.State (PackageState, emptyPackageState, PackageDatabase, mkIndefUnitId, updateIndefUnitId)
 import GHC.Driver.Phases ( Phase(..), phaseInputExt )
 import GHC.Driver.Flags
 import GHC.Driver.Ways
@@ -630,7 +632,7 @@ data DynFlags = DynFlags {
         -- ^ Stack of package databases for the target platform.
         --
         -- A "package database" is a misleading name as it is really a Unit
-        -- database (cf Note [The identifier lexicon]).
+        -- database (cf Note [About Units]).
         --
         -- This field is populated by `initPackages`.
         --

compiler/GHC/Driver/Session.hs-boot

@@ -3,11 +3,13 @@ module GHC.Driver.Session where
 import GHC.Prelude
 import GHC.Platform
 import {-# SOURCE #-} GHC.Utils.Outputable
+import {-# SOURCE #-} GHC.Unit.State
 
 data DynFlags
 
 targetPlatform           :: DynFlags -> Platform
 pprUserLength            :: DynFlags -> Int
+pkgState                 :: DynFlags -> PackageState
 unsafeGlobalDynFlags     :: DynFlags
 hasPprDebug              :: DynFlags -> Bool
 hasNoDebugOutput         :: DynFlags -> Bool

compiler/GHC/Driver/Types.hs

@@ -170,7 +170,7 @@ import GHC.Types.Unique.FM
 import GHC.Hs
 import GHC.Types.Name.Reader
 import GHC.Types.Avail
-import GHC.Types.Module
+import GHC.Unit
 import GHC.Core.InstEnv ( InstEnv, ClsInst, identicalClsInstHead )
 import GHC.Core.FamInstEnv
 import GHC.Core         ( CoreProgram, RuleBase, CoreRule )
@@ -192,7 +192,6 @@ import GHC.Core.DataCon
 import GHC.Core.PatSyn
 import GHC.Builtin.Names ( gHC_PRIM, ioTyConName, printName, mkInteractiveModule )
 import GHC.Builtin.Types
-import GHC.Driver.Packages hiding  ( Version(..) )
 import GHC.Driver.CmdLine
 import GHC.Driver.Session
 import GHC.Runtime.Linker.Types ( DynLinker, Linkable(..), Unlinked(..), SptEntry(..) )

compiler/GHC/Hs.hs

@@ -53,7 +53,7 @@ import GHC.Hs.Instances () -- For Data instances
 -- others:
 import GHC.Utils.Outputable
 import GHC.Types.SrcLoc
-import GHC.Types.Module ( ModuleName )
+import GHC.Unit.Module ( ModuleName )
 
 -- libraries:
 import Data.Data hiding ( Fixity )

compiler/GHC/Hs/Dump.hs

@@ -27,7 +27,7 @@ import GHC.Core.DataCon
 import GHC.Types.SrcLoc
 import GHC.Hs
 import GHC.Types.Var
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Utils.Outputable
 
 import qualified Data.ByteString as B

compiler/GHC/Hs/ImpExp.hs

@@ -18,7 +18,7 @@ module GHC.Hs.ImpExp where
 
 import GHC.Prelude
 
-import GHC.Types.Module       ( ModuleName )
+import GHC.Unit.Module       ( ModuleName )
 import GHC.Hs.Doc             ( HsDocString )
 import GHC.Types.Name.Occurrence ( HasOccName(..), isTcOcc, isSymOcc )
 import GHC.Types.Basic        ( SourceText(..), StringLiteral(..), pprWithSourceText )

compiler/GHC/HsToCore.hs

@@ -49,7 +49,7 @@ import GHC.Core.Coercion
 import GHC.Builtin.Types
 import GHC.Core.DataCon ( dataConWrapId )
 import GHC.Core.Make
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Types.Name.Set
 import GHC.Types.Name.Env
 import GHC.Core.Rules

compiler/GHC/HsToCore/Binds.hs

@@ -62,7 +62,7 @@ import GHC.Core.Rules
 import GHC.Types.Var.Env
 import GHC.Types.Var( EvVar )
 import GHC.Utils.Outputable
-import GHC.Types.Module
+import GHC.Unit.Module
 import GHC.Types.SrcLoc
 import GHC.Data.Maybe
 import GHC.Data.OrdList

compiler/GHC/HsToCore/Coverage.hs

@@ -21,7 +21,7 @@ import GHC.ByteCode.Types
 import GHC.Stack.CCS
 import GHC.Core.Type
 import GHC.Hs
-import GHC.Types.Module as Module
+import GHC.Unit
 import GHC.Utils.Outputable as Outputable
 import GHC.Driver.Session
 import GHC.Core.ConLike
@@ -1334,7 +1334,7 @@ hpcInitCode this_mod (HpcInfo tickCount hashNo)
     tickboxes = ppr (mkHpcTicksLabel $ this_mod)
 
     module_name  = hcat (map (text.charToC) $ BS.unpack $