[commit: ghc] master: Fix a bug in stack layout with safe foreign calls (#8083) (c234885)

[Simon Marlow]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/c23488590cd65fa584ddd648cdbab2fa13f5656b

>---------------------------------------------------------------

commit c23488590cd65fa584ddd648cdbab2fa13f5656b
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Jul 24 12:49:58 2013 +0100

    Fix a bug in stack layout with safe foreign calls (#8083)
    
    We weren't properly tracking the number of stack arguments in the
    continuation of a foreign call.  It happened to work when the
    continuation was not a join point, but when it was a join point we
    were using the wrong amount of stack fixup.

 compiler/cmm/CmmCommonBlockElim.hs |    2 +-
 compiler/cmm/CmmLayoutStack.hs     |   15 ++++++++-------
 compiler/cmm/CmmLint.hs            |    2 +-
 compiler/cmm/CmmNode.hs            |   11 ++++++-----
 compiler/cmm/CmmPipeline.hs        |    6 ++----
 compiler/cmm/PprCmm.hs             |    5 +++--
 compiler/codeGen/StgCmmForeign.hs  |    3 ++-
 7 files changed, 23 insertions(+), 21 deletions(-)


Diff suppressed because of size. To see it, use:

    git show c23488590cd65fa584ddd648cdbab2fa13f5656b