Make some more modules use LazyUniqFM instead of UniqFM

If these modules use UniqFM then we get a stack overflow when compiling
modules that use fundeps. I haven't tracked down the actual cause.

compiler/basicTypes/NewDemand.lhs

@@ -35,7 +35,7 @@ module NewDemand(
 import StaticFlags
 import BasicTypes
 import VarEnv
-import LazyUniqFM
+import UniqFM
 import Util
 import Outputable
 \end{code}

compiler/basicTypes/VarEnv.lhs

@@ -46,7 +46,7 @@ module VarEnv (
 import OccName
 import Var
 import VarSet
-import LazyUniqFM
+import UniqFM
 import Unique
 import Util
 import Maybes

compiler/coreSyn/CoreFVs.lhs

@@ -38,7 +38,7 @@ import CoreSyn
 import Id
 import IdInfo
 import NameSet
-import LazyUniqFM
+import UniqFM
 import Name
 import VarSet
 import Var

compiler/coreSyn/CoreTidy.lhs

@@ -22,7 +22,7 @@ import IdInfo
 import Type
 import Var
 import VarEnv
-import LazyUniqFM
+import UniqFM
 import Name hiding (tidyNameOcc)
 import OccName
 import SrcLoc

compiler/nativeGen/AsmCodeGen.lhs

@@ -40,7 +40,7 @@ import MachOp
 import CLabel
 import State
 
-import LazyUniqFM
+import UniqFM
 import Unique		( Unique, getUnique )
 import UniqSupply
 import List		( groupBy, sortBy )

compiler/nativeGen/MachRegs.lhs

@@ -105,8 +105,7 @@ import UniqSet
 import Constants
 import FastTypes
 import FastBool
-import qualified UniqFM as S
-import LazyUniqFM
+import UniqFM
 
 #if powerpc_TARGET_ARCH
 import Data.Word	( Word8, Word16, Word32 )
@@ -520,20 +519,20 @@ worst n classN classC
 
 {-# INLINE regClass      #-}
 trivColorable :: RegClass -> UniqSet Reg -> UniqSet Reg -> Bool
-trivColorable classN (MkUniqFM conflicts) (MkUniqFM exclusions)
+trivColorable classN conflicts exclusions
  = {-# SCC "trivColorable" #-}
    let
 	{-# INLINE   isSqueesed    #-}
 	isSqueesed cI cF ufm
 	  = case ufm of
-		S.NodeUFM _ _ left right
+		NodeUFM _ _ left right
 		 -> case isSqueesed cI cF right of
 		 	(# s, cI', cF' #)
 			 -> case s of
 			 	False	-> isSqueesed cI' cF' left
 				True	-> (# True, cI', cF' #)
 
-		S.LeafUFM _ (Lazy reg)
+		LeafUFM _ reg
 		 -> case regClass reg of
 		 	RcInteger
 			 -> case cI +# _ILIT(1) of
@@ -543,7 +542,7 @@ trivColorable classN (MkUniqFM conflicts) (MkUniqFM exclusions)
 			 -> case cF +# _ILIT(1) of
 			 	cF' -> (# cF' >=# ALLOCATABLE_REGS_DOUBLE,  cI, cF' #)
 
-		S.EmptyUFM
+		EmptyUFM
 		 ->	(# False, cI, cF #)
 
    in case isSqueesed (_ILIT(0)) (_ILIT(0)) conflicts of

compiler/nativeGen/RegAllocColor.hs

@@ -24,7 +24,7 @@ import PprMach
 
 import UniqSupply
 import UniqSet
-import LazyUniqFM
+import UniqFM
 import Bag
 import Outputable
 import DynFlags

compiler/nativeGen/RegAllocLinear.hs

@@ -97,7 +97,7 @@ import Cmm hiding (RegSet)
 import Digraph
 import Unique		( Uniquable(getUnique), Unique )
 import UniqSet
-import LazyUniqFM
+import UniqFM
 import UniqSupply
 import Outputable
 import State

compiler/nativeGen/RegAllocStats.hs

@@ -30,7 +30,7 @@ import MachInstrs
 import Cmm
 
 import Outputable
-import LazyUniqFM
+import UniqFM
 import UniqSet
 import State
 

compiler/nativeGen/RegLiveness.hs

@@ -42,7 +42,7 @@ import Digraph
 import Outputable
 import Unique
 import UniqSet
-import LazyUniqFM
+import UniqFM
 import UniqSupply
 import Bag
 import State

compiler/nativeGen/RegSpillCost.hs

@@ -23,7 +23,7 @@ import MachInstrs
 import MachRegs
 import Cmm
 
-import LazyUniqFM
+import UniqFM
 import UniqSet
 import Outputable
 import State

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 LazyUniqFM		( keysUFM, intersectUFM_C, foldUFM_Directly )
+import UniqFM		( keysUFM, intersectUFM_C, foldUFM_Directly )
 import Util		( mapAndUnzip )
 import Outputable
 

compiler/stranal/DmdAnal.lhs

@@ -45,7 +45,7 @@ import Var		( Var )
 import VarEnv
 import TysWiredIn	( unboxedPairDataCon )
 import TysPrim		( realWorldStatePrimTy )
-import LazyUniqFM		( plusUFM_C, addToUFM_Directly, lookupUFM_Directly,
+import UniqFM		( plusUFM_C, addToUFM_Directly, lookupUFM_Directly,
 			  keysUFM, minusUFM, ufmToList, filterUFM )
 import Type		( isUnLiftedType, coreEqType, splitTyConApp_maybe )
 import Coercion         ( coercionKind )

compiler/typecheck/TcGadt.lhs

@@ -40,7 +40,7 @@ import Control.Monad
 import Outputable
 import TcType
 import Unique
-import LazyUniqFM
+import UniqFM
 \end{code}
 
 

compiler/utils/GraphBase.hs

@@ -14,7 +14,7 @@ module GraphBase (
 where
 
 import UniqSet
-import LazyUniqFM
+import UniqFM
 
 
 -- | A fn to check if a node is trivially colorable

compiler/utils/GraphColor.hs

@@ -19,7 +19,7 @@ import GraphOps
 import GraphPpr
 
 import Unique
-import LazyUniqFM
+import UniqFM
 import UniqSet
 import Outputable	
 

compiler/utils/GraphOps.hs

@@ -24,7 +24,7 @@ import GraphBase
 import Outputable
 import Unique
 import UniqSet
-import LazyUniqFM
+import UniqFM
 
 import Data.List	hiding (union)
 import Data.Maybe

compiler/utils/GraphPpr.hs

@@ -12,7 +12,7 @@ import GraphBase
 import Outputable
 import Unique
 import UniqSet
-import LazyUniqFM
+import UniqFM
 
 import Data.List
 import Data.Maybe

compiler/utils/LazyUniqFM.lhs

@@ -13,9 +13,7 @@ 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
-    -- XXX Not actually abstract because of nativeGen/MachRegs; sigh
-    Lazy(Lazy), -- XXX Also for nativeGen/MachRegs; sigh
+	UniqFM,   	-- abstract type
 
 	emptyUFM,
 	unitUFM,

compiler/utils/UniqSet.lhs

@@ -22,7 +22,7 @@ module UniqSet (
     ) where
 
 import Maybes
-import LazyUniqFM
+import UniqFM
 import Unique
 
 #if ! OMIT_NATIVE_CODEGEN