[commit: ghc] wip/libdw-unwind: StgCmmForeign: Kill erroneous dereference (ad2a0a2)

git at git.haskell.org git at git.haskell.org
Mon Jan 4 22:20:45 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/libdw-unwind
Link       : http://ghc.haskell.org/trac/ghc/changeset/ad2a0a2ed1723bf7e7c758733c8b0f676de139eb/ghc

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

commit ad2a0a2ed1723bf7e7c758733c8b0f676de139eb
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Jan 4 17:21:50 2016 +0100

    StgCmmForeign: Kill erroneous dereference


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

ad2a0a2ed1723bf7e7c758733c8b0f676de139eb
 compiler/codeGen/StgCmmForeign.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/codeGen/StgCmmForeign.hs b/compiler/codeGen/StgCmmForeign.hs
index cb185ea..0b870ec 100644
--- a/compiler/codeGen/StgCmmForeign.hs
+++ b/compiler/codeGen/StgCmmForeign.hs
@@ -309,7 +309,7 @@ saveThreadState dflags initialSp = do
               CmmLoad (cmmOffset dflags stgCurrentTSO (tso_stackobj dflags))
                       (bWord dflags)
             spValue = cmmOffset dflags tsoValue (stack_SP dflags)
-        in mkUnwind (NewLabel lbl) Sp (initial $ CmmLoad spValue (bWord dflags))
+        in mkUnwind (NewLabel lbl) Sp (initial spValue)
       _ -> mkNop,
     close_nursery,
     -- and save the current cost centre stack in the TSO when profiling:



More information about the ghc-commits mailing list