Remove code that is dead now that we need >= 6.12 to build

[ghc-hetmet.git] / compiler / cmm / CmmZipUtil.hs

diff --git a/compiler/cmm/CmmZipUtil.hs b/compiler/cmm/CmmZipUtil.hs
index aa547e9..a91d76f 100644 (file)
--- a/compiler/cmm/CmmZipUtil.hs
+++ b/compiler/cmm/CmmZipUtil.hs
@@ -9,9 +9,8 @@ import Prelude hiding (last, unzip)
 import ZipCfg
 
 import Maybes
-import UniqSet
 
--- | Compute the predecessors of each *reachable* block
+-- | 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 _) =
@@ -25,14 +24,14 @@ zipPreds g = foldl add emptyBlockEnv (postorder_dfs g)
 
 givesUniquePredecessorTo :: LastNode l => LGraph m l -> BlockId -> Bool
 givesUniquePredecessorTo g = \id -> elemBlockSet id singlePreds
-    -- | accumulates a pair of sets: the set of all blocks containing a single 
+    -- accumulates a pair of sets: the set of all blocks containing a single
     -- predecessor, and the set of all blocks containing at least two predecessors
     where (singlePreds, _) = fold_blocks add (emptyBlockSet, emptyBlockSet) g
           add b (single, multi) = foldl add_pred (single, multi) (succs b)
           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)