summaryrefslogtreecommitdiff
path: root/compiler/GHC/Cmm
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/GHC/Cmm')
-rw-r--r--compiler/GHC/Cmm/BlockId.hs8
-rw-r--r--compiler/GHC/Cmm/BlockId.hs-boot2
-rw-r--r--compiler/GHC/Cmm/CLabel.hs14
-rw-r--r--compiler/GHC/Cmm/CommonBlockElim.hs4
-rw-r--r--compiler/GHC/Cmm/Dataflow.hs2
-rw-r--r--compiler/GHC/Cmm/Dataflow/Label.hs2
-rw-r--r--compiler/GHC/Cmm/DebugBlock.hs4
-rw-r--r--compiler/GHC/Cmm/Expr.hs4
-rw-r--r--compiler/GHC/Cmm/Graph.hs4
-rw-r--r--compiler/GHC/Cmm/Info.hs2
-rw-r--r--compiler/GHC/Cmm/Info/Build.hs12
-rw-r--r--compiler/GHC/Cmm/LayoutStack.hs8
-rw-r--r--compiler/GHC/Cmm/Lexer.x4
-rw-r--r--compiler/GHC/Cmm/Node.hs6
-rw-r--r--compiler/GHC/Cmm/Parser.y18
-rw-r--r--compiler/GHC/Cmm/Pipeline.hs2
-rw-r--r--compiler/GHC/Cmm/Ppr.hs2
-rw-r--r--compiler/GHC/Cmm/ProcPoint.hs2
-rw-r--r--compiler/GHC/Cmm/Sink.hs4
-rw-r--r--compiler/GHC/Cmm/Switch/Implement.hs2
-rw-r--r--compiler/GHC/Cmm/Utils.hs2
21 files changed, 54 insertions, 54 deletions
diff --git a/compiler/GHC/Cmm/BlockId.hs b/compiler/GHC/Cmm/BlockId.hs
index f7f369551b..e458c29902 100644
--- a/compiler/GHC/Cmm/BlockId.hs
+++ b/compiler/GHC/Cmm/BlockId.hs
@@ -11,10 +11,10 @@ module GHC.Cmm.BlockId
import GhcPrelude
import GHC.Cmm.CLabel
-import IdInfo
-import Name
-import Unique
-import UniqSupply
+import GHC.Types.Id.Info
+import GHC.Types.Name
+import GHC.Types.Unique
+import GHC.Types.Unique.Supply
import GHC.Cmm.Dataflow.Label (Label, mkHooplLabel)
diff --git a/compiler/GHC/Cmm/BlockId.hs-boot b/compiler/GHC/Cmm/BlockId.hs-boot
index 76fd6180a9..4588ce1282 100644
--- a/compiler/GHC/Cmm/BlockId.hs-boot
+++ b/compiler/GHC/Cmm/BlockId.hs-boot
@@ -1,7 +1,7 @@
module GHC.Cmm.BlockId (BlockId, mkBlockId) where
import GHC.Cmm.Dataflow.Label (Label)
-import Unique (Unique)
+import GHC.Types.Unique (Unique)
type BlockId = Label
diff --git a/compiler/GHC/Cmm/CLabel.hs b/compiler/GHC/Cmm/CLabel.hs
index eea71d0ce9..89fa2f8867 100644
--- a/compiler/GHC/Cmm/CLabel.hs
+++ b/compiler/GHC/Cmm/CLabel.hs
@@ -115,20 +115,20 @@ module GHC.Cmm.CLabel (
import GhcPrelude
-import IdInfo
-import BasicTypes
+import GHC.Types.Id.Info
+import GHC.Types.Basic
import {-# SOURCE #-} GHC.Cmm.BlockId (BlockId, mkBlockId)
import GHC.Driver.Packages
-import Module
-import Name
-import Unique
+import GHC.Types.Module
+import GHC.Types.Name
+import GHC.Types.Unique
import PrimOp
-import CostCentre
+import GHC.Types.CostCentre
import Outputable
import FastString
import GHC.Driver.Session
import GHC.Platform
-import UniqSet
+import GHC.Types.Unique.Set
import Util
import GHC.Core.Ppr ( {- instances -} )
diff --git a/compiler/GHC/Cmm/CommonBlockElim.hs b/compiler/GHC/Cmm/CommonBlockElim.hs
index 29f019fa15..575e041e73 100644
--- a/compiler/GHC/Cmm/CommonBlockElim.hs
+++ b/compiler/GHC/Cmm/CommonBlockElim.hs
@@ -25,8 +25,8 @@ import Data.Word
import qualified Data.Map as M
import Outputable
import qualified TrieMap as TM
-import UniqFM
-import Unique
+import GHC.Types.Unique.FM
+import GHC.Types.Unique
import Control.Arrow (first, second)
-- -----------------------------------------------------------------------------
diff --git a/compiler/GHC/Cmm/Dataflow.hs b/compiler/GHC/Cmm/Dataflow.hs
index 4f900c32ac..d697240191 100644
--- a/compiler/GHC/Cmm/Dataflow.hs
+++ b/compiler/GHC/Cmm/Dataflow.hs
@@ -37,7 +37,7 @@ where
import GhcPrelude
import GHC.Cmm
-import UniqSupply
+import GHC.Types.Unique.Supply
import Data.Array
import Data.Maybe
diff --git a/compiler/GHC/Cmm/Dataflow/Label.hs b/compiler/GHC/Cmm/Dataflow/Label.hs
index b27ff341e5..70027570d3 100644
--- a/compiler/GHC/Cmm/Dataflow/Label.hs
+++ b/compiler/GHC/Cmm/Dataflow/Label.hs
@@ -20,7 +20,7 @@ import Outputable
-- TODO: This should really just use GHC's Unique and Uniq{Set,FM}
import GHC.Cmm.Dataflow.Collections
-import Unique (Uniquable(..))
+import GHC.Types.Unique (Uniquable(..))
import TrieMap
diff --git a/compiler/GHC/Cmm/DebugBlock.hs b/compiler/GHC/Cmm/DebugBlock.hs
index 9d2da26b93..2129b3e7aa 100644
--- a/compiler/GHC/Cmm/DebugBlock.hs
+++ b/compiler/GHC/Cmm/DebugBlock.hs
@@ -34,10 +34,10 @@ import GHC.Cmm
import GHC.Cmm.Utils
import GHC.Core
import FastString ( nilFS, mkFastString )
-import Module
+import GHC.Types.Module
import Outputable
import GHC.Cmm.Ppr.Expr ( pprExpr )
-import SrcLoc
+import GHC.Types.SrcLoc
import Util ( seqList )
import GHC.Cmm.Dataflow.Block
diff --git a/compiler/GHC/Cmm/Expr.hs b/compiler/GHC/Cmm/Expr.hs
index 3c92c1e61b..1600588e2c 100644
--- a/compiler/GHC/Cmm/Expr.hs
+++ b/compiler/GHC/Cmm/Expr.hs
@@ -40,12 +40,12 @@ import GHC.Cmm.MachOp
import GHC.Cmm.Type
import GHC.Driver.Session
import Outputable (panic)
-import Unique
+import GHC.Types.Unique
import Data.Set (Set)
import qualified Data.Set as Set
-import BasicTypes (Alignment, mkAlignment, alignmentOf)
+import GHC.Types.Basic (Alignment, mkAlignment, alignmentOf)
-----------------------------------------------------------------------------
-- CmmExpr
diff --git a/compiler/GHC/Cmm/Graph.hs b/compiler/GHC/Cmm/Graph.hs
index 413bce3f1e..01fa4dc955 100644
--- a/compiler/GHC/Cmm/Graph.hs
+++ b/compiler/GHC/Cmm/Graph.hs
@@ -33,10 +33,10 @@ import GHC.Cmm.Dataflow.Graph
import GHC.Cmm.Dataflow.Label
import GHC.Driver.Session
import FastString
-import ForeignCall
+import GHC.Types.ForeignCall
import OrdList
import GHC.Runtime.Heap.Layout (ByteOff)
-import UniqSupply
+import GHC.Types.Unique.Supply
import Util
import Panic
diff --git a/compiler/GHC/Cmm/Info.hs b/compiler/GHC/Cmm/Info.hs
index 7a1bc2d3d1..6da996ad45 100644
--- a/compiler/GHC/Cmm/Info.hs
+++ b/compiler/GHC/Cmm/Info.hs
@@ -49,7 +49,7 @@ import Maybes
import GHC.Driver.Session
import ErrUtils (withTimingSilent)
import Panic
-import UniqSupply
+import GHC.Types.Unique.Supply
import MonadUtils
import Util
import Outputable
diff --git a/compiler/GHC/Cmm/Info/Build.hs b/compiler/GHC/Cmm/Info/Build.hs
index 274345ab7a..6c8551587b 100644
--- a/compiler/GHC/Cmm/Info/Build.hs
+++ b/compiler/GHC/Cmm/Info/Build.hs
@@ -10,15 +10,15 @@ module GHC.Cmm.Info.Build
import GhcPrelude hiding (succ)
-import Id
-import IdInfo
+import GHC.Types.Id
+import GHC.Types.Id.Info
import GHC.Cmm.BlockId
import GHC.Cmm.Dataflow.Block
import GHC.Cmm.Dataflow.Graph
import GHC.Cmm.Dataflow.Label
import GHC.Cmm.Dataflow.Collections
import GHC.Cmm.Dataflow
-import Module
+import GHC.Types.Module
import GHC.Platform
import Digraph
import GHC.Cmm.CLabel
@@ -28,8 +28,8 @@ import GHC.Driver.Session
import Maybes
import Outputable
import GHC.Runtime.Heap.Layout
-import UniqSupply
-import CostCentre
+import GHC.Types.Unique.Supply
+import GHC.Types.CostCentre
import GHC.StgToCmm.Heap
import Control.Monad
@@ -41,7 +41,7 @@ import Control.Monad.Trans.State
import Control.Monad.Trans.Class
import Data.List (unzip4)
-import NameSet
+import GHC.Types.Name.Set
{- Note [SRTs]
diff --git a/compiler/GHC/Cmm/LayoutStack.hs b/compiler/GHC/Cmm/LayoutStack.hs
index ba480a25b7..4cf7fcfdc1 100644
--- a/compiler/GHC/Cmm/LayoutStack.hs
+++ b/compiler/GHC/Cmm/LayoutStack.hs
@@ -8,14 +8,14 @@ import GhcPrelude hiding ((<*>))
import GHC.StgToCmm.Utils ( callerSaveVolatileRegs, newTemp ) -- XXX layering violation
import GHC.StgToCmm.Foreign ( saveThreadState, loadThreadState ) -- XXX layering violation
-import BasicTypes
+import GHC.Types.Basic
import GHC.Cmm
import GHC.Cmm.Info
import GHC.Cmm.BlockId
import GHC.Cmm.CLabel
import GHC.Cmm.Utils
import GHC.Cmm.Graph
-import ForeignCall
+import GHC.Types.ForeignCall
import GHC.Cmm.Liveness
import GHC.Cmm.ProcPoint
import GHC.Runtime.Heap.Layout
@@ -24,9 +24,9 @@ import GHC.Cmm.Dataflow.Collections
import GHC.Cmm.Dataflow
import GHC.Cmm.Dataflow.Graph
import GHC.Cmm.Dataflow.Label
-import UniqSupply
+import GHC.Types.Unique.Supply
import Maybes
-import UniqFM
+import GHC.Types.Unique.FM
import Util
import GHC.Platform
diff --git a/compiler/GHC/Cmm/Lexer.x b/compiler/GHC/Cmm/Lexer.x
index be2f676608..a1aebc9fb9 100644
--- a/compiler/GHC/Cmm/Lexer.x
+++ b/compiler/GHC/Cmm/Lexer.x
@@ -21,8 +21,8 @@ import GHC.Cmm.Expr
import Lexer
import GHC.Cmm.Monad
-import SrcLoc
-import UniqFM
+import GHC.Types.SrcLoc
+import GHC.Types.Unique.FM
import StringBuffer
import FastString
import Ctype
diff --git a/compiler/GHC/Cmm/Node.hs b/compiler/GHC/Cmm/Node.hs
index c809a99136..98314a8da3 100644
--- a/compiler/GHC/Cmm/Node.hs
+++ b/compiler/GHC/Cmm/Node.hs
@@ -33,11 +33,11 @@ import GHC.Cmm.Expr
import GHC.Cmm.Switch
import GHC.Driver.Session
import FastString
-import ForeignCall
+import GHC.Types.ForeignCall
import Outputable
import GHC.Runtime.Heap.Layout
import GHC.Core (Tickish)
-import qualified Unique as U
+import qualified GHC.Types.Unique as U
import GHC.Cmm.Dataflow.Block
import GHC.Cmm.Dataflow.Graph
@@ -45,7 +45,7 @@ import GHC.Cmm.Dataflow.Collections
import GHC.Cmm.Dataflow.Label
import Data.Maybe
import Data.List (tails,sortBy)
-import Unique (nonDetCmpUnique)
+import GHC.Types.Unique (nonDetCmpUnique)
import Util
diff --git a/compiler/GHC/Cmm/Parser.y b/compiler/GHC/Cmm/Parser.y
index 6b07af8859..cb34fbc52f 100644
--- a/compiler/GHC/Cmm/Parser.y
+++ b/compiler/GHC/Cmm/Parser.y
@@ -234,14 +234,14 @@ import GHC.Cmm.Monad
import GHC.Runtime.Heap.Layout
import Lexer
-import CostCentre
-import ForeignCall
-import Module
+import GHC.Types.CostCentre
+import GHC.Types.ForeignCall
+import GHC.Types.Module
import GHC.Platform
-import Literal
-import Unique
-import UniqFM
-import SrcLoc
+import GHC.Types.Literal
+import GHC.Types.Unique
+import GHC.Types.Unique.FM
+import GHC.Types.SrcLoc
import GHC.Driver.Session
import ErrUtils
import StringBuffer
@@ -249,9 +249,9 @@ import FastString
import Panic
import Constants
import Outputable
-import BasicTypes
+import GHC.Types.Basic
import Bag ( emptyBag, unitBag )
-import Var
+import GHC.Types.Var
import Control.Monad
import Data.Array
diff --git a/compiler/GHC/Cmm/Pipeline.hs b/compiler/GHC/Cmm/Pipeline.hs
index a2d47b3d48..e730cfda40 100644
--- a/compiler/GHC/Cmm/Pipeline.hs
+++ b/compiler/GHC/Cmm/Pipeline.hs
@@ -22,7 +22,7 @@ import GHC.Cmm.LayoutStack
import GHC.Cmm.Sink
import GHC.Cmm.Dataflow.Collections
-import UniqSupply
+import GHC.Types.Unique.Supply
import GHC.Driver.Session
import ErrUtils
import GHC.Driver.Types
diff --git a/compiler/GHC/Cmm/Ppr.hs b/compiler/GHC/Cmm/Ppr.hs
index 324fc8f1b1..d37b960c80 100644
--- a/compiler/GHC/Cmm/Ppr.hs
+++ b/compiler/GHC/Cmm/Ppr.hs
@@ -54,7 +54,7 @@ import GHC.Cmm.Ppr.Decl
import GHC.Cmm.Ppr.Expr
import Util
-import BasicTypes
+import GHC.Types.Basic
import GHC.Cmm.Dataflow.Block
import GHC.Cmm.Dataflow.Graph
diff --git a/compiler/GHC/Cmm/ProcPoint.hs b/compiler/GHC/Cmm/ProcPoint.hs
index 42bd342e86..9017c0eb0c 100644
--- a/compiler/GHC/Cmm/ProcPoint.hs
+++ b/compiler/GHC/Cmm/ProcPoint.hs
@@ -25,7 +25,7 @@ import Maybes
import Control.Monad
import Outputable
import GHC.Platform
-import UniqSupply
+import GHC.Types.Unique.Supply
import GHC.Cmm.Dataflow.Block
import GHC.Cmm.Dataflow.Collections
import GHC.Cmm.Dataflow
diff --git a/compiler/GHC/Cmm/Sink.hs b/compiler/GHC/Cmm/Sink.hs
index 5dd7fac1d0..3ca4fe9c75 100644
--- a/compiler/GHC/Cmm/Sink.hs
+++ b/compiler/GHC/Cmm/Sink.hs
@@ -17,8 +17,8 @@ import GHC.Platform.Regs
import GHC.Platform
import GHC.Driver.Session
-import Unique
-import UniqFM
+import GHC.Types.Unique
+import GHC.Types.Unique.FM
import qualified Data.IntSet as IntSet
import Data.List (partition)
diff --git a/compiler/GHC/Cmm/Switch/Implement.hs b/compiler/GHC/Cmm/Switch/Implement.hs
index 7df32dd2e8..b098917711 100644
--- a/compiler/GHC/Cmm/Switch/Implement.hs
+++ b/compiler/GHC/Cmm/Switch/Implement.hs
@@ -12,7 +12,7 @@ import GHC.Cmm.BlockId
import GHC.Cmm
import GHC.Cmm.Utils
import GHC.Cmm.Switch
-import UniqSupply
+import GHC.Types.Unique.Supply
import GHC.Driver.Session
import MonadUtils (concatMapM)
diff --git a/compiler/GHC/Cmm/Utils.hs b/compiler/GHC/Cmm/Utils.hs
index 90cbaffd5f..82cb75a904 100644
--- a/compiler/GHC/Cmm/Utils.hs
+++ b/compiler/GHC/Cmm/Utils.hs
@@ -83,7 +83,7 @@ import GHC.Cmm.BlockId
import GHC.Cmm.CLabel
import Outputable
import GHC.Driver.Session
-import Unique
+import GHC.Types.Unique
import GHC.Platform.Regs
import Data.ByteString (ByteString)
View Lorry Controller Status