Modules: Driver (#13009)

submodule updates: nofib, haddock

22 files changed, 24 insertions, 24 deletions

diff --git a/compiler/GHC/Cmm/CLabel.hs b/compiler/GHC/Cmm/CLabel.hs
index 8cac0aa5dd..f3cf8019d0 100644
--- a/compiler/GHC/Cmm/CLabel.hs
+++ b/compiler/GHC/Cmm/CLabel.hs
@@ -118,7 +118,7 @@ import GhcPrelude
 import IdInfo
 import BasicTypes
 import {-# SOURCE #-} GHC.Cmm.BlockId (BlockId, mkBlockId)
-import Packages
+import GHC.Driver.Packages
 import Module
 import Name
 import Unique
@@ -126,7 +126,7 @@ import PrimOp
 import CostCentre
 import Outputable
 import FastString
-import DynFlags
+import GHC.Driver.Session
 import GHC.Platform
 import UniqSet
 import Util
diff --git a/compiler/GHC/Cmm/CallConv.hs b/compiler/GHC/Cmm/CallConv.hs
index db9603c524..40f348f9e0 100644
--- a/compiler/GHC/Cmm/CallConv.hs
+++ b/compiler/GHC/Cmm/CallConv.hs
@@ -12,7 +12,7 @@ import GHC.Runtime.Heap.Layout
 import GHC.Cmm (Convention(..))
 import GHC.Cmm.Ppr () -- For Outputable instances
 
-import DynFlags
+import GHC.Driver.Session
 import GHC.Platform
 import Outputable
 
diff --git a/compiler/GHC/Cmm/Expr.hs b/compiler/GHC/Cmm/Expr.hs
index 3b4f0156a0..9be4200f85 100644
--- a/compiler/GHC/Cmm/Expr.hs
+++ b/compiler/GHC/Cmm/Expr.hs
@@ -36,7 +36,7 @@ import GHC.Cmm.BlockId
 import GHC.Cmm.CLabel
 import GHC.Cmm.MachOp
 import GHC.Cmm.Type
-import DynFlags
+import GHC.Driver.Session
 import Outputable (panic)
 import Unique
 
diff --git a/compiler/GHC/Cmm/Graph.hs b/compiler/GHC/Cmm/Graph.hs
index 1d8b44776d..c07f694897 100644
--- a/compiler/GHC/Cmm/Graph.hs
+++ b/compiler/GHC/Cmm/Graph.hs
@@ -31,7 +31,7 @@ import GHC.Cmm.Switch (SwitchTargets)
 import GHC.Cmm.Dataflow.Block
 import GHC.Cmm.Dataflow.Graph
 import GHC.Cmm.Dataflow.Label
-import DynFlags
+import GHC.Driver.Session
 import FastString
 import ForeignCall
 import OrdList
diff --git a/compiler/GHC/Cmm/Info.hs b/compiler/GHC/Cmm/Info.hs
index 6948f78969..6b2a3d82c6 100644
--- a/compiler/GHC/Cmm/Info.hs
+++ b/compiler/GHC/Cmm/Info.hs
@@ -46,7 +46,7 @@ import GHC.Cmm.Dataflow.Collections
 
 import GHC.Platform
 import Maybes
-import DynFlags
+import GHC.Driver.Session
 import ErrUtils (withTimingSilent)
 import Panic
 import UniqSupply
diff --git a/compiler/GHC/Cmm/Info/Build.hs b/compiler/GHC/Cmm/Info/Build.hs
index 92619b8959..54a7d8fb91 100644
--- a/compiler/GHC/Cmm/Info/Build.hs
+++ b/compiler/GHC/Cmm/Info/Build.hs
@@ -24,7 +24,7 @@ import Digraph
 import GHC.Cmm.CLabel
 import GHC.Cmm
 import GHC.Cmm.Utils
-import DynFlags
+import GHC.Driver.Session
 import Maybes
 import Outputable
 import GHC.Runtime.Heap.Layout
diff --git a/compiler/GHC/Cmm/LayoutStack.hs b/compiler/GHC/Cmm/LayoutStack.hs
index b34de95982..2b6051dd38 100644
--- a/compiler/GHC/Cmm/LayoutStack.hs
+++ b/compiler/GHC/Cmm/LayoutStack.hs
@@ -29,7 +29,7 @@ import Maybes
 import UniqFM
 import Util
 
-import DynFlags
+import GHC.Driver.Session
 import FastString
 import Outputable hiding ( isEmpty )
 import qualified Data.Set as Set
diff --git a/compiler/GHC/Cmm/Lint.hs b/compiler/GHC/Cmm/Lint.hs
index d70fed3b9e..a6bec1f187 100644
--- a/compiler/GHC/Cmm/Lint.hs
+++ b/compiler/GHC/Cmm/Lint.hs
@@ -23,7 +23,7 @@ import GHC.Cmm.Liveness
 import GHC.Cmm.Switch (switchTargetsToList)
 import GHC.Cmm.Ppr () -- For Outputable instances
 import Outputable
-import DynFlags
+import GHC.Driver.Session
 
 import Control.Monad (ap)
 
diff --git a/compiler/GHC/Cmm/Liveness.hs b/compiler/GHC/Cmm/Liveness.hs
index 2b598f52e5..10d4ca8dfd 100644
--- a/compiler/GHC/Cmm/Liveness.hs
+++ b/compiler/GHC/Cmm/Liveness.hs
@@ -14,7 +14,7 @@ where
 
 import GhcPrelude
 
-import DynFlags
+import GHC.Driver.Session
 import GHC.Cmm.BlockId
 import GHC.Cmm
 import GHC.Cmm.Ppr.Expr () -- For Outputable instances
diff --git a/compiler/GHC/Cmm/MachOp.hs b/compiler/GHC/Cmm/MachOp.hs
index a887477028..d811d4808f 100644
--- a/compiler/GHC/Cmm/MachOp.hs
+++ b/compiler/GHC/Cmm/MachOp.hs
@@ -32,7 +32,7 @@ import GhcPrelude
 
 import GHC.Cmm.Type
 import Outputable
-import DynFlags
+import GHC.Driver.Session
 
 -----------------------------------------------------------------------------
 --              MachOp
diff --git a/compiler/GHC/Cmm/Monad.hs b/compiler/GHC/Cmm/Monad.hs
index eccaf72676..d6c8a5b3cc 100644
--- a/compiler/GHC/Cmm/Monad.hs
+++ b/compiler/GHC/Cmm/Monad.hs
@@ -17,7 +17,7 @@ import GhcPrelude
 
 import Control.Monad
 
-import DynFlags
+import GHC.Driver.Session
 import Lexer
 
 newtype PD a = PD { unPD :: DynFlags -> PState -> ParseResult a }
diff --git a/compiler/GHC/Cmm/Node.hs b/compiler/GHC/Cmm/Node.hs
index f7cee80145..f26fb2c9d9 100644
--- a/compiler/GHC/Cmm/Node.hs
+++ b/compiler/GHC/Cmm/Node.hs
@@ -31,7 +31,7 @@ import GhcPrelude hiding (succ)
 import GHC.Platform.Regs
 import GHC.Cmm.Expr
 import GHC.Cmm.Switch
-import DynFlags
+import GHC.Driver.Session
 import FastString
 import ForeignCall
 import Outputable
diff --git a/compiler/GHC/Cmm/Opt.hs b/compiler/GHC/Cmm/Opt.hs
index 1db37ae58c..7dd43852a6 100644
--- a/compiler/GHC/Cmm/Opt.hs
+++ b/compiler/GHC/Cmm/Opt.hs
@@ -17,7 +17,7 @@ import GhcPrelude
 
 import GHC.Cmm.Utils
 import GHC.Cmm
-import DynFlags
+import GHC.Driver.Session
 import Util
 
 import Outputable
diff --git a/compiler/GHC/Cmm/Parser.y b/compiler/GHC/Cmm/Parser.y
index 2e6762e68a..69a2a9347e 100644
--- a/compiler/GHC/Cmm/Parser.y
+++ b/compiler/GHC/Cmm/Parser.y
@@ -242,7 +242,7 @@ import Literal
 import Unique
 import UniqFM
 import SrcLoc
-import DynFlags
+import GHC.Driver.Session
 import ErrUtils
 import StringBuffer
 import FastString
diff --git a/compiler/GHC/Cmm/Pipeline.hs b/compiler/GHC/Cmm/Pipeline.hs
index 9fd484fdb2..88db550d8a 100644
--- a/compiler/GHC/Cmm/Pipeline.hs
+++ b/compiler/GHC/Cmm/Pipeline.hs
@@ -23,9 +23,9 @@ import GHC.Cmm.Sink
 import GHC.Cmm.Dataflow.Collections
 
 import UniqSupply
-import DynFlags
+import GHC.Driver.Session
 import ErrUtils
-import HscTypes
+import GHC.Driver.Types
 import Control.Monad
 import Outputable
 import GHC.Platform
diff --git a/compiler/GHC/Cmm/Ppr/Decl.hs b/compiler/GHC/Cmm/Ppr/Decl.hs
index e91c4b6277..6c19d5f7a6 100644
--- a/compiler/GHC/Cmm/Ppr/Decl.hs
+++ b/compiler/GHC/Cmm/Ppr/Decl.hs
@@ -43,7 +43,7 @@ import GhcPrelude
 import GHC.Cmm.Ppr.Expr
 import GHC.Cmm
 
-import DynFlags
+import GHC.Driver.Session
 import Outputable
 import FastString
 
diff --git a/compiler/GHC/Cmm/ProcPoint.hs b/compiler/GHC/Cmm/ProcPoint.hs
index 1e4b70bd23..42bd342e86 100644
--- a/compiler/GHC/Cmm/ProcPoint.hs
+++ b/compiler/GHC/Cmm/ProcPoint.hs
@@ -11,7 +11,7 @@ where
 
 import GhcPrelude hiding (last, unzip, succ, zip)
 
-import DynFlags
+import GHC.Driver.Session
 import GHC.Cmm.BlockId
 import GHC.Cmm.CLabel
 import GHC.Cmm
diff --git a/compiler/GHC/Cmm/Sink.hs b/compiler/GHC/Cmm/Sink.hs
index 8e231df300..ceb4f874ee 100644
--- a/compiler/GHC/Cmm/Sink.hs
+++ b/compiler/GHC/Cmm/Sink.hs
@@ -16,7 +16,7 @@ import GHC.Cmm.Dataflow.Graph
 import GHC.Platform.Regs
 import GHC.Platform (isARM, platformArch)
 
-import DynFlags
+import GHC.Driver.Session
 import Unique
 import UniqFM
 
diff --git a/compiler/GHC/Cmm/Switch.hs b/compiler/GHC/Cmm/Switch.hs
index ea7932ca17..f297bd8b5e 100644
--- a/compiler/GHC/Cmm/Switch.hs
+++ b/compiler/GHC/Cmm/Switch.hs
@@ -15,7 +15,7 @@ module GHC.Cmm.Switch (
 import GhcPrelude
 
 import Outputable
-import DynFlags
+import GHC.Driver.Session
 import GHC.Cmm.Dataflow.Label (Label)
 
 import Data.Maybe
diff --git a/compiler/GHC/Cmm/Switch/Implement.hs b/compiler/GHC/Cmm/Switch/Implement.hs
index 859fe81b8d..2074c465ad 100644
--- a/compiler/GHC/Cmm/Switch/Implement.hs
+++ b/compiler/GHC/Cmm/Switch/Implement.hs
@@ -12,7 +12,7 @@ import GHC.Cmm
 import GHC.Cmm.Utils
 import GHC.Cmm.Switch
 import UniqSupply
-import DynFlags
+import GHC.Driver.Session
 import MonadUtils (concatMapM)
 
 --
diff --git a/compiler/GHC/Cmm/Type.hs b/compiler/GHC/Cmm/Type.hs
index 867a260078..2fb4ea61a7 100644
--- a/compiler/GHC/Cmm/Type.hs
+++ b/compiler/GHC/Cmm/Type.hs
@@ -31,7 +31,7 @@ where
 
 import GhcPrelude
 
-import DynFlags
+import GHC.Driver.Session
 import FastString
 import Outputable
 
diff --git a/compiler/GHC/Cmm/Utils.hs b/compiler/GHC/Cmm/Utils.hs
index c62f7eb3df..5a34ae45e2 100644
--- a/compiler/GHC/Cmm/Utils.hs
+++ b/compiler/GHC/Cmm/Utils.hs
@@ -80,7 +80,7 @@ import GHC.Cmm
 import GHC.Cmm.BlockId
 import GHC.Cmm.CLabel
 import Outputable
-import DynFlags
+import GHC.Driver.Session
 import Unique
 import GHC.Platform.Regs