diff options
| author | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2011-12-29 16:45:30 -0800 |
|---|---|---|
| committer | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2011-12-29 16:45:30 -0800 |
| commit | 896d20fabdf0087e8dd33cc419a377b7a9adee88 (patch) | |
| tree | 6acfc745bb5d75ccc921af6521e5294d2d69da3f /compiler/codeGen/CgProf.hs | |
| parent | 42186dd64c22f23bbdb15a27e608cb52ba7d617f (diff) | |
| parent | b0c0205e3c0dfefc3ffbd49d22160ad5d624ee1f (diff) | |
| download | haskell-896d20fabdf0087e8dd33cc419a377b7a9adee88.tar.gz | |
Merge branch 'master' into type-nats
Conflicts:
compiler/typecheck/TcCanonical.lhs
compiler/typecheck/TcSMonad.lhs
Diffstat (limited to 'compiler/codeGen/CgProf.hs')
| -rw-r--r-- | compiler/codeGen/CgProf.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/codeGen/CgProf.hs b/compiler/codeGen/CgProf.hs index a2e40d0f78..296dd62818 100644 --- a/compiler/codeGen/CgProf.hs +++ b/compiler/codeGen/CgProf.hs @@ -178,8 +178,8 @@ emitCostCentreDecl cc = do label, -- char *label, modl, -- char *module, loc, -- char *srcloc, + zero64, -- StgWord64 mem_alloc zero, -- StgWord time_ticks - zero64, -- StgWord64 mem_alloc is_caf, -- StgInt is_caf zero -- struct _CostCentre *link ] |