Commit fe2433a2 authored by Simon Marlow's avatar Simon Marlow
Browse files

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)
parent 9186d92f
...@@ -881,7 +881,7 @@ INFO_TABLE_RET(stg_catch_stm_frame, CATCH_STM_FRAME, ...@@ -881,7 +881,7 @@ INFO_TABLE_RET(stg_catch_stm_frame, CATCH_STM_FRAME,
/* Commit succeeded */ /* Commit succeeded */
StgTSO_trec(CurrentTSO) = outer; StgTSO_trec(CurrentTSO) = outer;
Sp = Sp + SIZEOF_StgCatchSTMFrame; Sp = Sp + SIZEOF_StgCatchSTMFrame;
jump Sp(SP_OFF); jump %ENTRY_CODE(Sp(SP_OFF));
} else { } else {
/* Commit failed */ /* Commit failed */
W_ new_trec; W_ new_trec;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment