Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/652e3cb2fdd0f1670cf97c94dcc7a08477f5e5c5 >--------------------------------------------------------------- commit 652e3cb2fdd0f1670cf97c94dcc7a08477f5e5c5 Author: Simon Marlow <[email protected]> Date: Mon Nov 14 11:17:14 2011 +0000 fix profiling bug in copyArray#/cloneArray# (cgrun068(profasm) segfault) >--------------------------------------------------------------- compiler/codeGen/CgPrimOp.hs | 2 +- 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 23708fe..6fe934b 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 8935d56..f8cc425 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 + _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
