[commit: ghc] master: Ticky: Do not count every entry twice (38c7714)

git at git.haskell.org git at git.haskell.org
Tue Mar 29 14:50:45 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/38c7714b334a28cdc10febd7763eef2a7ddd4413/ghc

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

commit 38c7714b334a28cdc10febd7763eef2a7ddd4413
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Mar 17 17:25:36 2016 +0100

    Ticky: Do not count every entry twice
    
    (likely introduced by 99d4e5b4a0bd32813ff8c74e91d2dcf6b3555176, possibly
    due to a merge mistake).


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

38c7714b334a28cdc10febd7763eef2a7ddd4413
 compiler/codeGen/StgCmmBind.hs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/compiler/codeGen/StgCmmBind.hs b/compiler/codeGen/StgCmmBind.hs
index d5a3be9..8adf3b0 100644
--- a/compiler/codeGen/StgCmmBind.hs
+++ b/compiler/codeGen/StgCmmBind.hs
@@ -581,8 +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 cl_info
-               ; enterCostCentreThunk (CmmReg nodeReg)
+            do { enterCostCentreThunk (CmmReg nodeReg)
                ; let lf_info = closureLFInfo cl_info
                ; fv_bindings <- mapM bind_fv fv_details
                ; load_fvs node lf_info fv_bindings



More information about the ghc-commits mailing list