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.

6 files changed, 6 insertions, 8 deletions

diff --git a/compiler/utils/GraphBase.hs b/compiler/utils/GraphBase.hs
index 3948c81a6a..04eda96120 100644
--- a/compiler/utils/GraphBase.hs
+++ b/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
diff --git a/compiler/utils/GraphColor.hs b/compiler/utils/GraphColor.hs
index e381fbf7f6..8e7989dc8c 100644
--- a/compiler/utils/GraphColor.hs
+++ b/compiler/utils/GraphColor.hs
@@ -19,7 +19,7 @@ import GraphOps
 import GraphPpr
 
 import Unique
-import LazyUniqFM
+import UniqFM
 import UniqSet
 import Outputable	
 
diff --git a/compiler/utils/GraphOps.hs b/compiler/utils/GraphOps.hs
index a82ff68629..880f3c65cd 100644
--- a/compiler/utils/GraphOps.hs
+++ b/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
diff --git a/compiler/utils/GraphPpr.hs b/compiler/utils/GraphPpr.hs
index 0e82b319eb..1df5158dc2 100644
--- a/compiler/utils/GraphPpr.hs
+++ b/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
diff --git a/compiler/utils/LazyUniqFM.lhs b/compiler/utils/LazyUniqFM.lhs
index b7ac15d2a1..d8132e3cd5 100644
--- a/compiler/utils/LazyUniqFM.lhs
+++ b/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,
diff --git a/compiler/utils/UniqSet.lhs b/compiler/utils/UniqSet.lhs
index 90e0c9f40b..9a0331547d 100644
--- a/compiler/utils/UniqSet.lhs
+++ b/compiler/utils/UniqSet.lhs
@@ -22,7 +22,7 @@ module UniqSet (
     ) where
 
 import Maybes
-import LazyUniqFM
+import UniqFM
 import Unique
 
 #if ! OMIT_NATIVE_CODEGEN