summaryrefslogtreecommitdiff
path: root/compiler/GHC/StgToCmm
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/GHC/StgToCmm')
-rw-r--r--compiler/GHC/StgToCmm/ArgRep.hs11
-rw-r--r--compiler/GHC/StgToCmm/Bind.hs14
-rw-r--r--compiler/GHC/StgToCmm/Closure.hs10
-rw-r--r--compiler/GHC/StgToCmm/DataCon.hs8
-rw-r--r--compiler/GHC/StgToCmm/Env.hs8
-rw-r--r--compiler/GHC/StgToCmm/Expr.hs10
-rw-r--r--compiler/GHC/StgToCmm/ExtCode.hs8
-rw-r--r--compiler/GHC/StgToCmm/Foreign.hs6
-rw-r--r--compiler/GHC/StgToCmm/Heap.hs8
-rw-r--r--compiler/GHC/StgToCmm/Hpc.hs2
-rw-r--r--compiler/GHC/StgToCmm/Layout.hs6
-rw-r--r--compiler/GHC/StgToCmm/Monad.hs12
-rw-r--r--compiler/GHC/StgToCmm/Prim.hs4
-rw-r--r--compiler/GHC/StgToCmm/Prof.hs4
-rw-r--r--compiler/GHC/StgToCmm/Ticky.hs8
-rw-r--r--compiler/GHC/StgToCmm/Utils.hs14
16 files changed, 66 insertions, 67 deletions
diff --git a/compiler/GHC/StgToCmm/ArgRep.hs b/compiler/GHC/StgToCmm/ArgRep.hs
index 2839a2ff56..a36aa4c268 100644
--- a/compiler/GHC/StgToCmm/ArgRep.hs
+++ b/compiler/GHC/StgToCmm/ArgRep.hs
@@ -20,13 +20,12 @@ module GHC.StgToCmm.ArgRep (
import GhcPrelude
import GHC.Platform
-import GHC.StgToCmm.Closure ( idPrimRep )
-
+import GHC.StgToCmm.Closure ( idPrimRep )
import GHC.Runtime.Heap.Layout ( WordOff )
-import Id ( Id )
-import GHC.Core.TyCon ( PrimRep(..), primElemRepSizeB )
-import BasicTypes ( RepArity )
-import Constants ( wORD64_SIZE, dOUBLE_SIZE )
+import GHC.Types.Id ( Id )
+import GHC.Core.TyCon ( PrimRep(..), primElemRepSizeB )
+import GHC.Types.Basic ( RepArity )
+import Constants ( wORD64_SIZE, dOUBLE_SIZE )
import Outputable
import FastString
diff --git a/compiler/GHC/StgToCmm/Bind.hs b/compiler/GHC/StgToCmm/Bind.hs
index d60e2805d4..8db97d8083 100644
--- a/compiler/GHC/StgToCmm/Bind.hs
+++ b/compiler/GHC/StgToCmm/Bind.hs
@@ -38,15 +38,15 @@ import GHC.Cmm.Info
import GHC.Cmm.Utils
import GHC.Cmm.CLabel
import GHC.Stg.Syntax
-import CostCentre
-import Id
-import IdInfo
-import Name
-import Module
+import GHC.Types.CostCentre
+import GHC.Types.Id
+import GHC.Types.Id.Info
+import GHC.Types.Name
+import GHC.Types.Module
import ListSetOps
import Util
-import VarSet
-import BasicTypes
+import GHC.Types.Var.Set
+import GHC.Types.Basic
import Outputable
import FastString
import GHC.Driver.Session
diff --git a/compiler/GHC/StgToCmm/Closure.hs b/compiler/GHC/StgToCmm/Closure.hs
index 7bb73111a9..3aa9dc8ef4 100644
--- a/compiler/GHC/StgToCmm/Closure.hs
+++ b/compiler/GHC/StgToCmm/Closure.hs
@@ -71,19 +71,19 @@ import GHC.Runtime.Heap.Layout
import GHC.Cmm
import GHC.Cmm.Ppr.Expr() -- For Outputable instances
-import CostCentre
+import GHC.Types.CostCentre
import GHC.Cmm.BlockId
import GHC.Cmm.CLabel
-import Id
-import IdInfo
+import GHC.Types.Id
+import GHC.Types.Id.Info
import GHC.Core.DataCon
-import Name
+import GHC.Types.Name
import GHC.Core.Type
import GHC.Core.TyCo.Rep
import TcType
import GHC.Core.TyCon
import GHC.Types.RepType
-import BasicTypes
+import GHC.Types.Basic
import Outputable
import GHC.Driver.Session
import Util
diff --git a/compiler/GHC/StgToCmm/DataCon.hs b/compiler/GHC/StgToCmm/DataCon.hs
index 2da91879b3..abf88ffbe3 100644
--- a/compiler/GHC/StgToCmm/DataCon.hs
+++ b/compiler/GHC/StgToCmm/DataCon.hs
@@ -34,14 +34,14 @@ import GHC.Cmm.Utils
import GHC.Cmm.CLabel
import GHC.Cmm.Graph
import GHC.Runtime.Heap.Layout
-import CostCentre
-import Module
+import GHC.Types.CostCentre
+import GHC.Types.Module
import GHC.Core.DataCon
import GHC.Driver.Session
import FastString
-import Id
+import GHC.Types.Id
import GHC.Types.RepType (countConRepArgs)
-import Literal
+import GHC.Types.Literal
import PrelInfo
import Outputable
import GHC.Platform
diff --git a/compiler/GHC/StgToCmm/Env.hs b/compiler/GHC/StgToCmm/Env.hs
index 47c46eed63..047353b89a 100644
--- a/compiler/GHC/StgToCmm/Env.hs
+++ b/compiler/GHC/StgToCmm/Env.hs
@@ -38,16 +38,16 @@ import GHC.Cmm.BlockId
import GHC.Cmm.Expr
import GHC.Cmm.Utils
import GHC.Driver.Session
-import Id
+import GHC.Types.Id
import GHC.Cmm.Graph
-import Name
+import GHC.Types.Name
import Outputable
import GHC.Stg.Syntax
import GHC.Core.Type
import TysPrim
-import UniqFM
+import GHC.Types.Unique.FM
import Util
-import VarEnv
+import GHC.Types.Var.Env
-------------------------------------
-- Manipulating CgIdInfo
diff --git a/compiler/GHC/StgToCmm/Expr.hs b/compiler/GHC/StgToCmm/Expr.hs
index f896b4d598..cb06799316 100644
--- a/compiler/GHC/StgToCmm/Expr.hs
+++ b/compiler/GHC/StgToCmm/Expr.hs
@@ -39,13 +39,13 @@ import GHC.Cmm.Info
import GHC.Core
import GHC.Core.DataCon
import GHC.Driver.Session ( mAX_PTR_TAG )
-import ForeignCall
-import Id
+import GHC.Types.ForeignCall
+import GHC.Types.Id
import PrimOp
import GHC.Core.TyCon
-import GHC.Core.Type ( isUnliftedType )
-import GHC.Types.RepType ( isVoidTy, countConRepArgs )
-import CostCentre ( CostCentreStack, currentCCS )
+import GHC.Core.Type ( isUnliftedType )
+import GHC.Types.RepType ( isVoidTy, countConRepArgs )
+import GHC.Types.CostCentre ( CostCentreStack, currentCCS )
import Maybes
import Util
import FastString
diff --git a/compiler/GHC/StgToCmm/ExtCode.hs b/compiler/GHC/StgToCmm/ExtCode.hs
index 40472245ed..84195a67d2 100644
--- a/compiler/GHC/StgToCmm/ExtCode.hs
+++ b/compiler/GHC/StgToCmm/ExtCode.hs
@@ -49,10 +49,10 @@ import GHC.Cmm.Graph
import GHC.Cmm.BlockId
import GHC.Driver.Session
import FastString
-import Module
-import UniqFM
-import Unique
-import UniqSupply
+import GHC.Types.Module
+import GHC.Types.Unique.FM
+import GHC.Types.Unique
+import GHC.Types.Unique.Supply
import Control.Monad (ap)
diff --git a/compiler/GHC/StgToCmm/Foreign.hs b/compiler/GHC/StgToCmm/Foreign.hs
index 767e70939b..2a0578327a 100644
--- a/compiler/GHC/StgToCmm/Foreign.hs
+++ b/compiler/GHC/StgToCmm/Foreign.hs
@@ -36,13 +36,13 @@ import GHC.Core.Type
import GHC.Types.RepType
import GHC.Cmm.CLabel
import GHC.Runtime.Heap.Layout
-import ForeignCall
+import GHC.Types.ForeignCall
import GHC.Driver.Session
import GHC.Platform
import Maybes
import Outputable
-import UniqSupply
-import BasicTypes
+import GHC.Types.Unique.Supply
+import GHC.Types.Basic
import GHC.Core.TyCo.Rep
import TysPrim
diff --git a/compiler/GHC/StgToCmm/Heap.hs b/compiler/GHC/StgToCmm/Heap.hs
index 740103e3b1..9a66d77c7f 100644
--- a/compiler/GHC/StgToCmm/Heap.hs
+++ b/compiler/GHC/StgToCmm/Heap.hs
@@ -41,10 +41,10 @@ import GHC.Runtime.Heap.Layout
import GHC.Cmm.BlockId
import GHC.Cmm
import GHC.Cmm.Utils
-import CostCentre
-import IdInfo( CafInfo(..), mayHaveCafRefs )
-import Id ( Id )
-import Module
+import GHC.Types.CostCentre
+import GHC.Types.Id.Info( CafInfo(..), mayHaveCafRefs )
+import GHC.Types.Id ( Id )
+import GHC.Types.Module
import GHC.Driver.Session
import GHC.Platform
import FastString( mkFastString, fsLit )
diff --git a/compiler/GHC/StgToCmm/Hpc.hs b/compiler/GHC/StgToCmm/Hpc.hs
index 886c0e12e8..1b7305da4e 100644
--- a/compiler/GHC/StgToCmm/Hpc.hs
+++ b/compiler/GHC/StgToCmm/Hpc.hs
@@ -16,7 +16,7 @@ import GHC.Platform
import GHC.Cmm.Graph
import GHC.Cmm.Expr
import GHC.Cmm.CLabel
-import Module
+import GHC.Types.Module
import GHC.Cmm.Utils
import GHC.StgToCmm.Utils
import GHC.Driver.Types
diff --git a/compiler/GHC/StgToCmm/Layout.hs b/compiler/GHC/StgToCmm/Layout.hs
index 08e83b84d3..14ec8445c5 100644
--- a/compiler/GHC/StgToCmm/Layout.hs
+++ b/compiler/GHC/StgToCmm/Layout.hs
@@ -49,12 +49,12 @@ import GHC.Cmm.Utils
import GHC.Cmm.Info
import GHC.Cmm.CLabel
import GHC.Stg.Syntax
-import Id
+import GHC.Types.Id
import GHC.Core.TyCon ( PrimRep(..), primRepSizeB )
-import BasicTypes ( RepArity )
+import GHC.Types.Basic ( RepArity )
import GHC.Driver.Session
import GHC.Platform
-import Module
+import GHC.Types.Module
import Util
import Data.List
diff --git a/compiler/GHC/StgToCmm/Monad.hs b/compiler/GHC/StgToCmm/Monad.hs
index 9edff8bd66..a23d942c60 100644
--- a/compiler/GHC/StgToCmm/Monad.hs
+++ b/compiler/GHC/StgToCmm/Monad.hs
@@ -70,13 +70,13 @@ import GHC.Cmm.Graph as CmmGraph
import GHC.Cmm.BlockId
import GHC.Cmm.CLabel
import GHC.Runtime.Heap.Layout
-import Module
-import Id
-import VarEnv
+import GHC.Types.Module
+import GHC.Types.Id
+import GHC.Types.Var.Env
import OrdList
-import BasicTypes( ConTagZ )
-import Unique
-import UniqSupply
+import GHC.Types.Basic( ConTagZ )
+import GHC.Types.Unique
+import GHC.Types.Unique.Supply
import FastString
import Outputable
import Util
diff --git a/compiler/GHC/StgToCmm/Prim.hs b/compiler/GHC/StgToCmm/Prim.hs
index 5b43837417..665fdeb21d 100644
--- a/compiler/GHC/StgToCmm/Prim.hs
+++ b/compiler/GHC/StgToCmm/Prim.hs
@@ -37,12 +37,12 @@ import GHC.StgToCmm.Prof ( costCentreFrom )
import GHC.Driver.Session
import GHC.Platform
-import BasicTypes
+import GHC.Types.Basic
import GHC.Cmm.BlockId
import GHC.Cmm.Graph
import GHC.Stg.Syntax
import GHC.Cmm
-import Module ( rtsUnitId )
+import GHC.Types.Module ( rtsUnitId )
import GHC.Core.Type ( Type, tyConAppTyCon )
import GHC.Core.TyCon
import GHC.Cmm.CLabel
diff --git a/compiler/GHC/StgToCmm/Prof.hs b/compiler/GHC/StgToCmm/Prof.hs
index c97bd793be..54e49eee87 100644
--- a/compiler/GHC/StgToCmm/Prof.hs
+++ b/compiler/GHC/StgToCmm/Prof.hs
@@ -36,10 +36,10 @@ import GHC.Cmm
import GHC.Cmm.Utils
import GHC.Cmm.CLabel
-import CostCentre
+import GHC.Types.CostCentre
import GHC.Driver.Session
import FastString
-import Module
+import GHC.Types.Module as Module
import Outputable
import Control.Monad
diff --git a/compiler/GHC/StgToCmm/Ticky.hs b/compiler/GHC/StgToCmm/Ticky.hs
index c472a2815b..d6cea4206c 100644
--- a/compiler/GHC/StgToCmm/Ticky.hs
+++ b/compiler/GHC/StgToCmm/Ticky.hs
@@ -120,10 +120,10 @@ import GHC.Cmm.Utils
import GHC.Cmm.CLabel
import GHC.Runtime.Heap.Layout
-import Module
-import Name
-import Id
-import BasicTypes
+import GHC.Types.Module
+import GHC.Types.Name
+import GHC.Types.Id
+import GHC.Types.Basic
import FastString
import Outputable
import Util
diff --git a/compiler/GHC/StgToCmm/Utils.hs b/compiler/GHC/StgToCmm/Utils.hs
index 178572eb64..1f439db546 100644
--- a/compiler/GHC/StgToCmm/Utils.hs
+++ b/compiler/GHC/StgToCmm/Utils.hs
@@ -64,22 +64,22 @@ import GHC.Cmm.Utils hiding (mkDataLits, mkRODataLits, mkByteStringCLit)
import GHC.Cmm.Switch
import GHC.StgToCmm.CgUtils
-import ForeignCall
-import IdInfo
+import GHC.Types.ForeignCall
+import GHC.Types.Id.Info
import GHC.Core.Type
import GHC.Core.TyCon
import GHC.Runtime.Heap.Layout
-import Module
-import Literal
+import GHC.Types.Module
+import GHC.Types.Literal
import Digraph
import Util
-import Unique
-import UniqSupply (MonadUnique(..))
+import GHC.Types.Unique
+import GHC.Types.Unique.Supply (MonadUnique(..))
import GHC.Driver.Session
import FastString
import Outputable
import GHC.Types.RepType
-import CostCentre
+import GHC.Types.CostCentre
import Data.ByteString (ByteString)
import qualified Data.ByteString.Char8 as BS8
View Lorry Controller Status