summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compiler/basicTypes/NewDemand.lhs2
-rw-r--r--compiler/basicTypes/VarEnv.lhs2
-rw-r--r--compiler/coreSyn/CoreFVs.lhs2
-rw-r--r--compiler/coreSyn/CoreTidy.lhs2
-rw-r--r--compiler/nativeGen/AsmCodeGen.lhs2
-rw-r--r--compiler/nativeGen/MachRegs.lhs11
-rw-r--r--compiler/nativeGen/RegAllocColor.hs2
-rw-r--r--compiler/nativeGen/RegAllocLinear.hs2
-rw-r--r--compiler/nativeGen/RegAllocStats.hs2
-rw-r--r--compiler/nativeGen/RegLiveness.hs2
-rw-r--r--compiler/nativeGen/RegSpillCost.hs2
-rw-r--r--compiler/simplCore/OccurAnal.lhs2
-rw-r--r--compiler/stranal/DmdAnal.lhs2
-rw-r--r--compiler/typecheck/TcGadt.lhs2
-rw-r--r--compiler/utils/GraphBase.hs2
-rw-r--r--compiler/utils/GraphColor.hs2
-rw-r--r--compiler/utils/GraphOps.hs2
-rw-r--r--compiler/utils/GraphPpr.hs2
-rw-r--r--compiler/utils/LazyUniqFM.lhs4
-rw-r--r--compiler/utils/UniqSet.lhs2
-rw-r--r--compiler/vectorise/VectType.hs2
21 files changed, 28 insertions, 25 deletions
diff --git a/compiler/basicTypes/NewDemand.lhs b/compiler/basicTypes/NewDemand.lhs
index 062e25ff30..2361972037 100644
--- a/compiler/basicTypes/NewDemand.lhs
+++ b/compiler/basicTypes/NewDemand.lhs
@@ -35,7 +35,7 @@ module NewDemand(
import StaticFlags
import BasicTypes
import VarEnv
-import UniqFM
+import LazyUniqFM
import Util
import Outputable
\end{code}
diff --git a/compiler/basicTypes/VarEnv.lhs b/compiler/basicTypes/VarEnv.lhs
index 3b0be0bebf..dbef903de8 100644
--- a/compiler/basicTypes/VarEnv.lhs
+++ b/compiler/basicTypes/VarEnv.lhs
@@ -46,7 +46,7 @@ module VarEnv (
import OccName
import Var
import VarSet
-import UniqFM
+import LazyUniqFM
import Unique
import Util
import Maybes
diff --git a/compiler/coreSyn/CoreFVs.lhs b/compiler/coreSyn/CoreFVs.lhs
index 57316c7211..199cc694c7 100644
--- a/compiler/coreSyn/CoreFVs.lhs
+++ b/compiler/coreSyn/CoreFVs.lhs
@@ -38,7 +38,7 @@ import CoreSyn
import Id
import IdInfo
import NameSet
-import UniqFM
+import LazyUniqFM
import Name
import VarSet
import Var
diff --git a/compiler/coreSyn/CoreTidy.lhs b/compiler/coreSyn/CoreTidy.lhs
index 5acee51f42..4da1dc3350 100644
--- a/compiler/coreSyn/CoreTidy.lhs
+++ b/compiler/coreSyn/CoreTidy.lhs
@@ -22,7 +22,7 @@ import IdInfo
import Type
import Var
import VarEnv
-import UniqFM
+import LazyUniqFM
import Name hiding (tidyNameOcc)
import OccName
import SrcLoc
diff --git a/compiler/nativeGen/AsmCodeGen.lhs b/compiler/nativeGen/AsmCodeGen.lhs
index 6d3bf7ca75..e0608cb80c 100644
--- a/compiler/nativeGen/AsmCodeGen.lhs
+++ b/compiler/nativeGen/AsmCodeGen.lhs
@@ -40,7 +40,7 @@ import MachOp
import CLabel
import State
-import UniqFM
+import LazyUniqFM
import Unique ( Unique, getUnique )
import UniqSupply
import List ( groupBy, sortBy )
diff --git a/compiler/nativeGen/MachRegs.lhs b/compiler/nativeGen/MachRegs.lhs
index 85c88b2ed3..0174fac0ce 100644
--- a/compiler/nativeGen/MachRegs.lhs
+++ b/compiler/nativeGen/MachRegs.lhs
@@ -105,7 +105,8 @@ import UniqSet
import Constants
import FastTypes
import FastBool
-import UniqFM
+import qualified UniqFM as S
+import LazyUniqFM
#if powerpc_TARGET_ARCH
import Data.Word ( Word8, Word16, Word32 )
@@ -518,20 +519,20 @@ worst n classN classC
{-# INLINE regClass #-}
trivColorable :: RegClass -> UniqSet Reg -> UniqSet Reg -> Bool
-trivColorable classN conflicts exclusions
+trivColorable classN (MkUniqFM conflicts) (MkUniqFM exclusions)
= {-# SCC "trivColorable" #-}
let
{-# INLINE isSqueesed #-}
isSqueesed cI cF ufm
= case ufm of
- NodeUFM _ _ left right
+ S.NodeUFM _ _ left right
-> case isSqueesed cI cF right of
(# s, cI', cF' #)
-> case s of
False -> isSqueesed cI' cF' left
True -> (# True, cI', cF' #)
- LeafUFM _ reg
+ S.LeafUFM _ (Lazy reg)
-> case regClass reg of
RcInteger
-> case cI +# _ILIT(1) of
@@ -541,7 +542,7 @@ trivColorable classN conflicts exclusions
-> case cF +# _ILIT(1) of
cF' -> (# cF' >=# ALLOCATABLE_REGS_DOUBLE, cI, cF' #)
- EmptyUFM
+ S.EmptyUFM
-> (# False, cI, cF #)
in case isSqueesed (_ILIT(0)) (_ILIT(0)) conflicts of
diff --git a/compiler/nativeGen/RegAllocColor.hs b/compiler/nativeGen/RegAllocColor.hs
index 51a0bffbc6..e2e002af35 100644
--- a/compiler/nativeGen/RegAllocColor.hs
+++ b/compiler/nativeGen/RegAllocColor.hs
@@ -24,7 +24,7 @@ import PprMach
import UniqSupply
import UniqSet
-import UniqFM
+import LazyUniqFM
import Bag
import Outputable
import DynFlags
diff --git a/compiler/nativeGen/RegAllocLinear.hs b/compiler/nativeGen/RegAllocLinear.hs
index e6491b77ee..b333c68d5d 100644
--- a/compiler/nativeGen/RegAllocLinear.hs
+++ b/compiler/nativeGen/RegAllocLinear.hs
@@ -97,7 +97,7 @@ import Cmm hiding (RegSet)
import Digraph
import Unique ( Uniquable(getUnique), Unique )
import UniqSet
-import UniqFM
+import LazyUniqFM
import UniqSupply
import Outputable
import State
diff --git a/compiler/nativeGen/RegAllocStats.hs b/compiler/nativeGen/RegAllocStats.hs
index 8eb86605ab..9f8415f518 100644
--- a/compiler/nativeGen/RegAllocStats.hs
+++ b/compiler/nativeGen/RegAllocStats.hs
@@ -30,7 +30,7 @@ import MachInstrs
import Cmm
import Outputable
-import UniqFM
+import LazyUniqFM
import UniqSet
import State
diff --git a/compiler/nativeGen/RegLiveness.hs b/compiler/nativeGen/RegLiveness.hs
index 9ee98971ba..6f21db8b77 100644
--- a/compiler/nativeGen/RegLiveness.hs
+++ b/compiler/nativeGen/RegLiveness.hs
@@ -42,7 +42,7 @@ import Digraph
import Outputable
import Unique
import UniqSet
-import UniqFM
+import LazyUniqFM
import UniqSupply
import Bag
import State
diff --git a/compiler/nativeGen/RegSpillCost.hs b/compiler/nativeGen/RegSpillCost.hs
index d987937102..b492738238 100644
--- a/compiler/nativeGen/RegSpillCost.hs
+++ b/compiler/nativeGen/RegSpillCost.hs
@@ -23,7 +23,7 @@ import MachInstrs
import MachRegs
import Cmm
-import UniqFM
+import LazyUniqFM
import UniqSet
import Outputable
import State
diff --git a/compiler/simplCore/OccurAnal.lhs b/compiler/simplCore/OccurAnal.lhs
index bdf38ee406..efc51ba6a9 100644
--- a/compiler/simplCore/OccurAnal.lhs
+++ b/compiler/simplCore/OccurAnal.lhs
@@ -33,7 +33,7 @@ import Maybes ( orElse )
import Digraph ( stronglyConnCompR, SCC(..) )
import PrelNames ( buildIdKey, foldrIdKey, runSTRepIdKey, augmentIdKey )
import Unique ( Unique )
-import UniqFM ( keysUFM, intersectUFM_C, foldUFM_Directly )
+import LazyUniqFM ( keysUFM, intersectUFM_C, foldUFM_Directly )
import Util ( mapAndUnzip )
import Outputable
diff --git a/compiler/stranal/DmdAnal.lhs b/compiler/stranal/DmdAnal.lhs
index eec165a1a0..84c2968b11 100644
--- a/compiler/stranal/DmdAnal.lhs
+++ b/compiler/stranal/DmdAnal.lhs
@@ -45,7 +45,7 @@ import Var ( Var )
import VarEnv
import TysWiredIn ( unboxedPairDataCon )
import TysPrim ( realWorldStatePrimTy )
-import UniqFM ( plusUFM_C, addToUFM_Directly, lookupUFM_Directly,
+import LazyUniqFM ( plusUFM_C, addToUFM_Directly, lookupUFM_Directly,
keysUFM, minusUFM, ufmToList, filterUFM )
import Type ( isUnLiftedType, coreEqType, splitTyConApp_maybe )
import Coercion ( coercionKind )
diff --git a/compiler/typecheck/TcGadt.lhs b/compiler/typecheck/TcGadt.lhs
index b556e89e32..b3156ed747 100644
--- a/compiler/typecheck/TcGadt.lhs
+++ b/compiler/typecheck/TcGadt.lhs
@@ -40,7 +40,7 @@ import Control.Monad
import Outputable
import TcType
import Unique
-import UniqFM
+import LazyUniqFM
\end{code}
diff --git a/compiler/utils/GraphBase.hs b/compiler/utils/GraphBase.hs
index 04eda96120..3948c81a6a 100644
--- a/compiler/utils/GraphBase.hs
+++ b/compiler/utils/GraphBase.hs
@@ -14,7 +14,7 @@ module GraphBase (
where
import UniqSet
-import UniqFM
+import LazyUniqFM
-- | A fn to check if a node is trivially colorable
diff --git a/compiler/utils/GraphColor.hs b/compiler/utils/GraphColor.hs
index 8e7989dc8c..e381fbf7f6 100644
--- a/compiler/utils/GraphColor.hs
+++ b/compiler/utils/GraphColor.hs
@@ -19,7 +19,7 @@ import GraphOps
import GraphPpr
import Unique
-import UniqFM
+import LazyUniqFM
import UniqSet
import Outputable
diff --git a/compiler/utils/GraphOps.hs b/compiler/utils/GraphOps.hs
index 880f3c65cd..a82ff68629 100644
--- a/compiler/utils/GraphOps.hs
+++ b/compiler/utils/GraphOps.hs
@@ -24,7 +24,7 @@ import GraphBase
import Outputable
import Unique
import UniqSet
-import UniqFM
+import LazyUniqFM
import Data.List hiding (union)
import Data.Maybe
diff --git a/compiler/utils/GraphPpr.hs b/compiler/utils/GraphPpr.hs
index 1df5158dc2..0e82b319eb 100644
--- a/compiler/utils/GraphPpr.hs
+++ b/compiler/utils/GraphPpr.hs
@@ -12,7 +12,7 @@ import GraphBase
import Outputable
import Unique
import UniqSet
-import UniqFM
+import LazyUniqFM
import Data.List
import Data.Maybe
diff --git a/compiler/utils/LazyUniqFM.lhs b/compiler/utils/LazyUniqFM.lhs
index d8132e3cd5..b7ac15d2a1 100644
--- a/compiler/utils/LazyUniqFM.lhs
+++ b/compiler/utils/LazyUniqFM.lhs
@@ -13,7 +13,9 @@ Basically, the things need to be in class @Uniquable@, and we use the
\begin{code}
{-# OPTIONS -Wall -fno-warn-name-shadowing -Werror -fallow-undecidable-instances #-}
module LazyUniqFM (
- UniqFM, -- abstract type
+ UniqFM(..), -- abstract type
+ -- XXX Not actually abstract because of nativeGen/MachRegs; sigh
+ Lazy(Lazy), -- XXX Also for nativeGen/MachRegs; sigh
emptyUFM,
unitUFM,
diff --git a/compiler/utils/UniqSet.lhs b/compiler/utils/UniqSet.lhs
index 08d35758a5..ba312dd198 100644
--- a/compiler/utils/UniqSet.lhs
+++ b/compiler/utils/UniqSet.lhs
@@ -22,7 +22,7 @@ module UniqSet (
) where
import Maybes
-import UniqFM
+import LazyUniqFM
import Unique
#if ! OMIT_NATIVE_CODEGEN
diff --git a/compiler/vectorise/VectType.hs b/compiler/vectorise/VectType.hs
index 86dcaf236b..972aca1b7b 100644
--- a/compiler/vectorise/VectType.hs
+++ b/compiler/vectorise/VectType.hs
@@ -39,7 +39,7 @@ import TysWiredIn
import TysPrim ( intPrimTy )
import Unique
-import UniqFM
+import LazyUniqFM
import UniqSet
import Util ( singleton )
import Digraph ( SCC(..), stronglyConnComp )
View Lorry Controller Status