diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-01-06 10:42:35 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-01-06 11:31:34 +0000 |
| commit | fe2433a2a35e5b520a5e63d6cc437efc3c2b97cf (patch) | |
| tree | 984f8ac725c9d37be2e628bfb7d7eea7f7c78ae4 /rts/PrimOps.cmm | |
| parent | 9186d92f381c49720da96b8fc59339af7be951bd (diff) | |
| download | haskell-fe2433a2a35e5b520a5e63d6cc437efc3c2b97cf.tar.gz | |
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)
Diffstat (limited to 'rts/PrimOps.cmm')
| -rw-r--r-- | rts/PrimOps.cmm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm index 84755552f6..7811af1966 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; |