Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/bad0252da05e2ff4a48257509de56d2b32b89a3c

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

commit bad0252da05e2ff4a48257509de56d2b32b89a3c
Author: Simon Peyton Jones <[email protected]>
Date:   Wed Sep 7 09:33:08 2011 +0100

    Wibble in tickyDynAlloc (only affects -ticky)
    
    Fall-out from codegen refactoring, undiscovered because
    we don't usually build with -ticky

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

 compiler/codeGen/CgTicky.hs |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/compiler/codeGen/CgTicky.hs b/compiler/codeGen/CgTicky.hs
index ef6d301..1e814fe 100644
--- a/compiler/codeGen/CgTicky.hs
+++ b/compiler/codeGen/CgTicky.hs
@@ -245,12 +245,15 @@ tickyDynAlloc :: ClosureInfo -> Code
 -- Called when doing a dynamic heap allocation
 tickyDynAlloc cl_info
   = ifTicky $
-    case closureLFInfo cl_info of
+    case cl_info of {
+      ConInfo {} -> tick_alloc_con ;
+      ClosureInfo { closureLFInfo = lf_info } -> 
+    case lf_info of
        LFCon {}        -> tick_alloc_con
        LFReEntrant {}  -> tick_alloc_fun
        LFThunk {}      -> tick_alloc_thk
         -- black hole
-        _               -> return ()
+        _               -> return () }
   where
        -- will be needed when we fill in stubs
     _cl_size   = closureSize cl_info



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to