X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcodeGen%2FCgLetNoEscape.lhs;h=ed21833f8c3725eab599101cfdf5be8699b8480e;hp=a39e76b61fe3c0cc7c7d6160af75066c293fc456;hb=f537dd87c4a07526e2b1fc1bd1c125d652833641;hpb=6084fb5517da34f65034370a3695e2af3b85ce2b

diff --git a/compiler/codeGen/CgLetNoEscape.lhs b/compiler/codeGen/CgLetNoEscape.lhs
index a39e76b..ed21833 100644
--- a/compiler/codeGen/CgLetNoEscape.lhs
+++ b/compiler/codeGen/CgLetNoEscape.lhs
@@ -9,13 +9,6 @@
 %********************************************************
 
 \begin{code}
-{-# OPTIONS -w #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and fix
--- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
--- for details
-
 module CgLetNoEscape ( cgLetNoEscapeClosure ) where
 
 #include "HsVersions.h"
@@ -31,13 +24,12 @@ import CgCon
 import CgHeapery
 import CgInfoTbls
 import CgStackery
-import Cmm
-import CmmUtils
+import OldCmm
+import OldCmmUtils
 import CLabel
 import ClosureInfo
 import CostCentre
 import Id
-import Var
 import SMRep
 import BasicTypes
 \end{code}
@@ -156,8 +148,8 @@ cgLetNoEscapeClosure
 -- ToDo: deal with the cost-centre issues
 
 cgLetNoEscapeClosure 
-	bndr cc binder_info full_live_in_rhss 
-	rhs_eob_info cc_slot rec args body
+	bndr cc _ full_live_in_rhss 
+	rhs_eob_info cc_slot _ args body
   = let
 	arity   = length args
 	lf_info = mkLFLetNoEscape arity
@@ -175,7 +167,7 @@ cgLetNoEscapeClosure
 
 			-- Ignore the label that comes back from
 			-- mkRetDirectTarget.  It must be conjured up elswhere
-		    ; emitReturnTarget (idName bndr) abs_c
+		    ; _ <- emitReturnTarget (idName bndr) abs_c
 		    ; return () })
 
 	; returnFC (bndr, letNoEscapeIdInfo bndr vSp lf_info) }
@@ -189,7 +181,7 @@ cgLetNoEscapeBody :: Id		-- Name of the joint point
 		  -> StgExpr	-- Body
 		  -> Code
 
-cgLetNoEscapeBody bndr cc cc_slot all_args body = do
+cgLetNoEscapeBody bndr _ cc_slot all_args body = do
   { (arg_regs, ptrs, nptrs, ret_slot) <- bindUnboxedTupleComponents all_args
 
      -- restore the saved cost centre.  BUT: we must not free the stack slot