diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-09-15 08:09:56 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-09-15 08:09:56 +0100 |
| commit | cf02909e1fc10597c3291817ab905d426307405b (patch) | |
| tree | dea7dbee8ca23d57168ccedb1c5e2e92a2ef9b91 /compiler/codeGen/CgStackery.lhs | |
| parent | 7d83fdea229b940ae198ddc5c179ac449defd2ef (diff) | |
| parent | c3f4c6fa3228102eaada6efde8049724461a3bb0 (diff) | |
| download | haskell-cf02909e1fc10597c3291817ab905d426307405b.tar.gz | |
Merge remote branch 'origin/master'
Diffstat (limited to 'compiler/codeGen/CgStackery.lhs')
| -rw-r--r-- | compiler/codeGen/CgStackery.lhs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/codeGen/CgStackery.lhs b/compiler/codeGen/CgStackery.lhs index 217586a9d1..7c4caf4e1d 100644 --- a/compiler/codeGen/CgStackery.lhs +++ b/compiler/codeGen/CgStackery.lhs @@ -289,7 +289,7 @@ pushSpecUpdateFrame lbl updatee code ; MASSERT(case sequel of { OnStack -> True; _ -> False}) } ; dflags <- getDynFlags ; allocStackTop (fixedHdrSize dflags + - sIZEOF_StgUpdateFrame_NoHdr `quot` wORD_SIZE) + sIZEOF_StgUpdateFrame_NoHdr dflags `quot` wORD_SIZE) ; vsp <- getVirtSp ; setStackFrame vsp ; frame_addr <- getSpRelOffset vsp @@ -317,12 +317,12 @@ emitSpecPushUpdateFrame lbl frame_addr updatee = do stmtsC [ -- Set the info word CmmStore frame_addr (mkLblExpr lbl) , -- And the updatee - CmmStore (cmmOffsetB frame_addr (off_updatee dflags)) updatee ] + CmmStore (cmmOffsetB dflags frame_addr (off_updatee dflags)) updatee ] initUpdFrameProf frame_addr off_updatee :: DynFlags -> ByteOff off_updatee dflags - = fixedHdrSize dflags * wORD_SIZE + oFFSET_StgUpdateFrame_updatee + = fixedHdrSize dflags * wORD_SIZE + (oFFSET_StgUpdateFrame_updatee dflags) \end{code} |