[commit: ghc] master: add a missing entryCode (a910970)

Simon Marlow <[email protected]>
Newsgroups gmane.comp.lang.haskell.cvs.ghc
Message-ID <[email protected]>
Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

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

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

commit a9109703c5994a0de97236184672095d4605ae7d
Author: Simon Marlow <[email protected]>
Date:   Thu Sep 20 15:55:07 2012 +0100

    add a missing entryCode

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

 compiler/cmm/CmmLayoutStack.hs |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/compiler/cmm/CmmLayoutStack.hs b/compiler/cmm/CmmLayoutStack.hs
index 5505b92..b4ca273 100644
--- a/compiler/cmm/CmmLayoutStack.hs
+++ b/compiler/cmm/CmmLayoutStack.hs
@@ -5,6 +5,7 @@ module CmmLayoutStack (
 
 import StgCmmUtils      ( callerSaveVolatileRegs ) -- XXX
 import StgCmmForeign    ( saveThreadState, loadThreadState ) -- XXX
+import StgCmmLayout     ( entryCode ) -- XXX
 
 import Cmm
 import BlockId
@@ -939,7 +940,8 @@ lowerSafeForeignCall dflags block
         -- received an exception during the call, then the stack might be
         -- different.  Hence we continue by jumping to the top stack frame,
         -- not by jumping to succ.
-        jump = CmmCall { cml_target    = CmmLoad (CmmReg spReg) (bWord dflags)
+        jump = CmmCall { cml_target    = entryCode dflags $
+                                         CmmLoad (CmmReg spReg) (bWord dflags)
                        , cml_cont      = Just succ
                        , cml_args_regs = regs
                        , cml_args      = widthInBytes (wordWidth dflags)
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.