[commit: ghc] master: Wibbles (merg-os) to ticky-ticky (6265312)

[Simon Peyton Jones]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/62653122f3cf2d48a475cadecc9b4483488c9769

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

commit 62653122f3cf2d48a475cadecc9b4483488c9769
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu May 9 18:10:39 2013 +0100

    Wibbles (merg-os) to ticky-ticky

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

 compiler/codeGen/StgCmmBind.hs  | 4 ++--
 compiler/codeGen/StgCmmTicky.hs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/codeGen/StgCmmBind.hs b/compiler/codeGen/StgCmmBind.hs
index 0cd9dd6..eb1bfe9 100644
--- a/compiler/codeGen/StgCmmBind.hs
+++ b/compiler/codeGen/StgCmmBind.hs
@@ -423,7 +423,7 @@ cgRhsStdThunk bndr lf_info payload
 --  ; (use_cc, blame_cc) <- chooseDynCostCentres cc [{- no args-}] body
   ; let use_cc = curCCS; blame_cc = curCCS
 
-  ; tickyEnterStdThunk
+  ; tickyEnterStdThunk closure_info
 
         -- BUILD THE OBJECT
   ; let info_tbl = mkCmmInfo closure_info
@@ -581,7 +581,7 @@ thunkCode cl_info fv_details _cc node arity body
             -- that cc of enclosing scope will be recorded
             -- in update frame CAF/DICT functions will be
             -- subsumed by this enclosing cc
-            do { tickyEnterThunk
+            do { tickyEnterThunk cl_info
                ; enterCostCentreThunk (CmmReg nodeReg)
                ; let lf_info = closureLFInfo cl_info
                ; fv_bindings <- mapM bind_fv fv_details
diff --git a/compiler/codeGen/StgCmmTicky.hs b/compiler/codeGen/StgCmmTicky.hs
index 6ac0fe3..6c60647 100644
--- a/compiler/codeGen/StgCmmTicky.hs
+++ b/compiler/codeGen/StgCmmTicky.hs
@@ -255,7 +255,7 @@ tickyEnterThunk cl_info
         | otherwise = if updatable then fsLit "ENT_DYN_THK_SINGLE_ctr"
                                    else fsLit "ENT_DYN_THK_MANY_ctr"
 
-tickyEnterStdThunk :: FCode ()
+tickyEnterStdThunk :: ClosureInfo -> FCode ()
 tickyEnterStdThunk = tickyEnterThunk
 
 tickyBlackHole :: Bool{-updatable-} -> FCode ()