diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-09-28 15:53:45 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-09-28 15:53:45 +0100 |
| commit | 6e3e64aeda1add215ffccca87931a60e4f8b53e5 (patch) | |
| tree | a8cc5dd835ed86fb02f746969cf0cb376942f6b2 /compiler/codeGen/CgTicky.hs | |
| parent | 9a058b173a6e12296ac302a6ccd22d9c8f0a09d0 (diff) | |
| parent | 42cb30bd2c00705da598cc8d4170b41fb5693166 (diff) | |
| download | haskell-6e3e64aeda1add215ffccca87931a60e4f8b53e5.tar.gz | |
Merge remote-tracking branch 'origin/master' into tc-untouchables
Diffstat (limited to 'compiler/codeGen/CgTicky.hs')
| -rw-r--r-- | compiler/codeGen/CgTicky.hs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/compiler/codeGen/CgTicky.hs b/compiler/codeGen/CgTicky.hs index 79215f6582..21837e787b 100644 --- a/compiler/codeGen/CgTicky.hs +++ b/compiler/codeGen/CgTicky.hs @@ -43,9 +43,6 @@ module CgTicky ( staticTickyHdr, ) where -#include "../includes/dist-derivedconstants/header/DerivedConstants.h" - -- For REP_xxx constants, which are MachReps - import ClosureInfo import CgUtils import CgMonad @@ -298,7 +295,7 @@ tickyAllocHeap hp if hp == 0 then [] -- Inside the stmtC to avoid control else [ -- dependency on the argument -- Bump the allcoation count in the StgEntCounter - addToMem (typeWidth REP_StgEntCounter_allocs) + addToMem (typeWidth (rEP_StgEntCounter_allocs dflags)) (CmmLit (cmmLabelOffB ticky_ctr (oFFSET_StgEntCounter_allocs dflags))) hp, -- Bump ALLOC_HEAP_ctr |