[commit: ghc] master: Fix a crash in STM when unregisterised (fe2433a)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

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

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

commit fe2433a2a35e5b520a5e63d6cc437efc3c2b97cf
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Fri Jan 6 10:42:35 2012 +0000

    Fix a crash in STM when unregisterised
    
    Fixes several test failures:
       ../../libraries/stm/tests       2411 [bad exit code] (normal,hpc,profasm,ghci,optllvm)
       ../../libraries/stm/tests       stm046 [bad exit code] (normal,hpc,profasm,ghci,optllvm)
       ../../libraries/stm/tests       stm061 [bad exit code] (normal,hpc,profasm,ghci,optllvm)

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

 rts/PrimOps.cmm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm
index 8475555..7811af1 100644
--- a/rts/PrimOps.cmm
+++ b/rts/PrimOps.cmm
@@ -881,7 +881,7 @@ INFO_TABLE_RET(stg_catch_stm_frame, CATCH_STM_FRAME,
         /* Commit succeeded */
         StgTSO_trec(CurrentTSO) = outer;
         Sp = Sp + SIZEOF_StgCatchSTMFrame;
-        jump Sp(SP_OFF);
+        jump %ENTRY_CODE(Sp(SP_OFF));
       } else {
         /* Commit failed */
         W_ new_trec;