[commit: ghc] master: fix warnings (8b31090)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8b31090cad4d67fe92ba15209180d871f6355f49

>---------------------------------------------------------------

commit 8b31090cad4d67fe92ba15209180d871f6355f49
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Mon Jul 30 13:21:59 2012 +0100

    fix warnings

>---------------------------------------------------------------

 compiler/cmm/CmmBuildInfoTables.hs |    2 +-
 compiler/cmm/CmmPipeline.hs        |    1 -
 compiler/cmm/CmmSink.hs            |    2 ++
 compiler/nativeGen/X86/Ppr.hs      |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/cmm/CmmBuildInfoTables.hs b/compiler/cmm/CmmBuildInfoTables.hs
index a916db1..309536b 100644
--- a/compiler/cmm/CmmBuildInfoTables.hs
+++ b/compiler/cmm/CmmBuildInfoTables.hs
@@ -308,7 +308,7 @@ bundle flatmap (env, decl@(CmmProc infos lbl g)) (closure_cafs, mb_lbl)
                       then pprPanic "bundle" (ppr l <+> ppr lbl <+> ppr (info_tbls infos))
                       else flatten flatmap $ expectJust "bundle" $ mapLookup l env
 
-bundle flatmap (_, decl) _
+bundle _flatmap (_, decl) _
   = ( mapEmpty, decl )
 
 
diff --git a/compiler/cmm/CmmPipeline.hs b/compiler/cmm/CmmPipeline.hs
index 211e8cc..6042a08 100644
--- a/compiler/cmm/CmmPipeline.hs
+++ b/compiler/cmm/CmmPipeline.hs
@@ -10,7 +10,6 @@ module CmmPipeline (
 ) where
 
 import Cmm
-import CmmUtils
 import CmmLint
 import CmmBuildInfoTables
 import CmmCommonBlockElim
diff --git a/compiler/cmm/CmmSink.hs b/compiler/cmm/CmmSink.hs
index 033a8f6..2d97ba5 100644
--- a/compiler/cmm/CmmSink.hs
+++ b/compiler/cmm/CmmSink.hs
@@ -136,11 +136,13 @@ cmmSink graph = ofBlockList (g_entry graph) $ sink mapEmpty $ blocks
                  mapFromList [ (l, filterAssignments (getLive l) assigs')
                              | l <- succs ]
 
+{-
 -- tiny: an expression we don't mind duplicating
 isTiny :: CmmExpr -> Bool
 isTiny (CmmReg _) = True
 isTiny (CmmLit _) = True
 isTiny _other     = False
+-}
 
 -- annotate each node with the set of registers live *after* the node
 annotate :: RegSet -> [CmmNode O O] -> [(RegSet, CmmNode O O)]
diff --git a/compiler/nativeGen/X86/Ppr.hs b/compiler/nativeGen/X86/Ppr.hs
index 743d79c..7a40e6b 100644
--- a/compiler/nativeGen/X86/Ppr.hs
+++ b/compiler/nativeGen/X86/Ppr.hs
@@ -64,7 +64,7 @@ pprNatCmmDecl proc@(CmmProc top_info lbl (ListGraph blocks)) =
            vcat (map (pprBasicBlock top_info) blocks) $$
            pprSizeDecl lbl
 
-    Just (Statics info_lbl info) ->
+    Just (Statics info_lbl _) ->
       sdocWithPlatform $ \platform ->
       (if platformHasSubsectionsViaSymbols platform
           then ppr (mkDeadStripPreventer info_lbl) <> char ':'