fix up Win32 build

[ghc-hetmet.git] / ghc / compiler / profiling / SCCfinal.lhs

diff --git a/ghc/compiler/profiling/SCCfinal.lhs b/ghc/compiler/profiling/SCCfinal.lhs
index 8c6bcf9..c95db9c 100644 (file)
--- a/ghc/compiler/profiling/SCCfinal.lhs
+++ b/ghc/compiler/profiling/SCCfinal.lhs
@@ -29,7 +29,7 @@ module SCCfinal ( stgMassageForProfiling ) where
 
 import StgSyn
 
-import DynFlags                ( DynFlags )
+import Packages                ( HomeModules )
 import StaticFlags     ( opt_AutoSccsOnIndividualCafs )
 import CostCentre      -- lots of things
 import Id              ( Id )
@@ -45,13 +45,13 @@ infixr 9 `thenMM`, `thenMM_`
 
 \begin{code}
 stgMassageForProfiling
-       :: DynFlags
+       :: HomeModules
        -> Module                       -- module name
        -> UniqSupply                   -- unique supply
        -> [StgBinding]                 -- input
        -> (CollectedCCs, [StgBinding])
 
-stgMassageForProfiling dflags mod_name us stg_binds
+stgMassageForProfiling pdeps mod_name us stg_binds
   = let
        ((local_ccs, extern_ccs, cc_stacks),
         stg_binds2)
@@ -102,7 +102,7 @@ stgMassageForProfiling dflags mod_name us stg_binds
     do_top_rhs :: Id -> StgRhs -> MassageM StgRhs
 
     do_top_rhs binder (StgRhsClosure _ bi fv u srt [] (StgSCC cc (StgConApp con args)))
-      | not (isSccCountCostCentre cc) && not (isDllConApp dflags con args)
+      | not (isSccCountCostCentre cc) && not (isDllConApp pdeps con args)
        -- Trivial _scc_ around nothing but static data
        -- Eliminate _scc_ ... and turn into StgRhsCon
 
@@ -230,14 +230,13 @@ stgMassageForProfiling dflags mod_name us stg_binds
 -}
 
     do_rhs (StgRhsClosure _ bi fv u srt args expr)
-      = slurpSCCs currentCCS expr              `thenMM` \ (expr', ccs) ->
-       do_expr expr'                           `thenMM` \ expr'' ->
+      = slurpSCCs currentCCS expr      `thenMM` \ (expr', ccs) ->
+       do_expr expr'                   `thenMM` \ expr'' ->
        returnMM (StgRhsClosure ccs bi fv u srt args expr'')
       where
        slurpSCCs ccs (StgSCC cc e) 
             = collectCC cc                     `thenMM_`
-              slurpSCCs ccs e                  `thenMM` \ (e', ccs')  ->
-              returnMM (e', pushCCOnCCS cc ccs')
+              slurpSCCs (cc `pushCCOnCCS` ccs) e
        slurpSCCs ccs e 
             = returnMM (e, ccs)