diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-11-14 11:17:14 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-11-14 15:14:08 +0000 |
| commit | 652e3cb2fdd0f1670cf97c94dcc7a08477f5e5c5 (patch) | |
| tree | 7d03a7c459f0f16ab0d0fcebe0908667f4fa6078 /compiler/codeGen | |
| parent | e9449158567f44d909c184d0e666ec130978757f (diff) | |
| download | haskell-652e3cb2fdd0f1670cf97c94dcc7a08477f5e5c5.tar.gz | |
fix profiling bug in copyArray#/cloneArray# (cgrun068(profasm) segfault)
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/CgPrimOp.hs | 2 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmPrim.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/codeGen/CgPrimOp.hs b/compiler/codeGen/CgPrimOp.hs index 23708fe568..6fe934b54c 100644 --- a/compiler/codeGen/CgPrimOp.hs +++ b/compiler/codeGen/CgPrimOp.hs @@ -811,7 +811,7 @@ emitCloneArray info_p res_r src0 src_off0 n0 live = do (CmmLit $ mkIntCLit 0) let arr = CmmReg (CmmLocal arr_r) - emitSetDynHdr arr (CmmLit (CmmLabel info_p)) curCCSAddr + emitSetDynHdr arr (CmmLit (CmmLabel info_p)) curCCS stmtC $ CmmStore (cmmOffsetB arr (fixedHdrSize * wORD_SIZE + oFFSET_StgMutArrPtrs_ptrs)) n stmtC $ CmmStore (cmmOffsetB arr (fixedHdrSize * wORD_SIZE + diff --git a/compiler/codeGen/StgCmmPrim.hs b/compiler/codeGen/StgCmmPrim.hs index 8935d56537..f8cc4256f4 100644 --- a/compiler/codeGen/StgCmmPrim.hs +++ b/compiler/codeGen/StgCmmPrim.hs @@ -877,7 +877,7 @@ emitCloneArray info_p res_r src0 src_off0 n0 = do (CmmLit $ mkIntCLit 0) let arr = CmmReg (CmmLocal arr_r) - emitSetDynHdr arr (CmmLit (CmmLabel info_p)) curCCSAddr + emitSetDynHdr arr (CmmLit (CmmLabel info_p)) curCCS emit $ mkStore (cmmOffsetB arr (fixedHdrSize * wORD_SIZE + oFFSET_StgMutArrPtrs_ptrs)) n emit $ mkStore (cmmOffsetB arr (fixedHdrSize * wORD_SIZE + |