Whitespace only in nativeGen/RegAlloc/Graph/TrivColorable.hs

[ghc-hetmet.git] / compiler / codeGen / CgLetNoEscape.lhs

diff --git a/compiler/codeGen/CgLetNoEscape.lhs b/compiler/codeGen/CgLetNoEscape.lhs
index dd25f55..ed21833 100644 (file)
--- a/compiler/codeGen/CgLetNoEscape.lhs
+++ b/compiler/codeGen/CgLetNoEscape.lhs
@@ -24,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}
@@ -137,7 +136,6 @@ cgLetNoEscapeClosure
        :: Id                   -- binder
        -> CostCentreStack      -- NB: *** NOT USED *** ToDo (WDP 94/06)
        -> StgBinderInfo        -- NB: ditto
-       -> SRT
        -> StgLiveVars          -- variables live in RHS, including the binders
                                -- themselves in the case of a recursive group
        -> EndOfBlockInfo       -- where are we going to?
@@ -150,8 +148,8 @@ cgLetNoEscapeClosure
 -- ToDo: deal with the cost-centre issues
 
 cgLetNoEscapeClosure 
-       bndr cc binder_info srt 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
@@ -169,7 +167,7 @@ cgLetNoEscapeClosure
 
                        -- Ignore the label that comes back from
                        -- mkRetDirectTarget.  It must be conjured up elswhere
-                   ; emitDirectReturnTarget (idName bndr) abs_c srt
+                   ; _ <- emitReturnTarget (idName bndr) abs_c
                    ; return () })
 
        ; returnFC (bndr, letNoEscapeIdInfo bndr vSp lf_info) }
@@ -183,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