X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FZipCfgExtras.hs;h=660f8e5af322942f1c21d52282c7be230496be1a;hb=d8509623140a6423e1fca45a005efccee0489a46;hp=bd26aca9760991d31a61931c77af529ba9fae84e;hpb=0d80489c9b9f2421f65d8dd86c1e50c6bb429715;p=ghc-hetmet.git

diff --git a/compiler/cmm/ZipCfgExtras.hs b/compiler/cmm/ZipCfgExtras.hs
index bd26aca..660f8e5 100644
--- a/compiler/cmm/ZipCfgExtras.hs
+++ b/compiler/cmm/ZipCfgExtras.hs
@@ -24,7 +24,7 @@ exit    :: LGraph m l -> FGraph m l         -- focus on edge into default exit n
                                             -- (fails if there isn't one)
 focusp  :: (Block m l -> Bool) -> LGraph m l -> Maybe (FGraph m l)
                                       -- focus on start of block satisfying predicate
-unfocus :: FGraph m l -> LGraph m l            -- lose focus 
+-- unfocus :: FGraph m l -> LGraph m l            -- lose focus 
 
 -- | We can insert a single-entry, single-exit subgraph at
 -- the current focus.
@@ -37,16 +37,16 @@ splice_focus_exit  :: FGraph m l -> LGraph m l -> FGraph m l
 
 _unused :: ()
 _unused = all `seq` ()
-    where all = ( exit, focusp, unfocus {- , splice_focus_entry, splice_focus_exit -}
+    where all = ( exit, focusp --, unfocus {- , splice_focus_entry, splice_focus_exit -}
                 , foldM_fwd_block (\_ a -> Just a)
                 )
 
-unfocus (FGraph e bz bs) = LGraph e (insertBlock (zip bz) bs)
+--unfocus (FGraph e bz bs) = LGraph e (insertBlock (zip bz) bs)
 
-focusp p (LGraph entry blocks) =
+focusp p (LGraph entry _ blocks) =
     fmap (\(b, bs) -> FGraph entry (unzip b) bs) (splitp_blocks p blocks)
 
-exit g@(LGraph eid _) = FGraph eid (ZBlock h (ZLast l)) others
+exit g@(LGraph eid _ _) = FGraph eid (ZBlock h (ZLast l)) others
     where FGraph _ b others = focusp is_exit g `orElse` panic "no exit in flow graph"
           (h, l) = goto_end b
 
@@ -65,12 +65,12 @@ splice_focus_exit (FGraph eid (ZBlock head tail) blocks) g =
 foldM_fwd_block ::
   Monad m => (BlockId -> a -> m a) -> (mid -> a -> m a) -> (ZLast l -> a -> m a) ->
              Block mid l -> a -> m a
-foldM_fwd_block first middle last (Block id t) z = do { z <- first id z; tail t z }
+foldM_fwd_block first middle last (Block id _ t) z = do { z <- first id z; tail t z }
     where tail (ZTail m t) z = do { z <- middle m z; tail t z }
           tail (ZLast l)   z = last l z
 
 splitp_blocks :: (Block m l -> Bool) -> BlockEnv (Block m l) ->
                  Maybe (Block m l, BlockEnv (Block m l))
-splitp_blocks = undefined -- implemented in ZipCfg but not exported
+splitp_blocks = panic "splitp_blocks" -- implemented in ZipCfg but not exported
 is_exit :: Block m l -> Bool
-is_exit = undefined -- implemented in ZipCfg but not exported
+is_exit = panic "is_exit" -- implemented in ZipCfg but not exported