X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmZipUtil.hs;h=a91d76f31d1b4c7033e3a8a9eebf73de707c9110;hb=7fc01c4671980ea3c66d549c0ece4d82fd3f5ade;hp=9f0993dc49e8aa07c6a0f89d57c205487fd5ec4d;hpb=176fa33f17dd78355cc572e006d2ab26898e2c69;p=ghc-hetmet.git

diff --git a/compiler/cmm/CmmZipUtil.hs b/compiler/cmm/CmmZipUtil.hs
index 9f0993d..a91d76f 100644
--- a/compiler/cmm/CmmZipUtil.hs
+++ b/compiler/cmm/CmmZipUtil.hs
@@ -9,12 +9,11 @@ import Prelude hiding (last, unzip)
 import ZipCfg
 
 import Maybes
-import UniqSet
 
 -- | Compute the predecessors of each /reachable/ block
 zipPreds :: LastNode l => LGraph m l -> BlockEnv BlockSet
 zipPreds g = foldl add emptyBlockEnv (postorder_dfs g)
-    where add env block@(Block id _ _) =
+    where add env block@(Block id _) =
             foldl (\env sid ->
                        let preds = lookupBlockEnv env sid `orElse` emptyBlockSet
                        in  extendBlockEnv env sid (extendBlockSet preds id))
@@ -32,7 +31,7 @@ givesUniquePredecessorTo g = \id -> elemBlockSet id singlePreds
           add_pred pair@(single, multi) id =
               if elemBlockSet id multi then pair
               else if elemBlockSet id single then
-                       (delOneFromUniqSet single id, extendBlockSet multi id)
+                       (removeBlockSet single id, extendBlockSet multi id)
                    else
                        (extendBlockSet single id, multi)