STM fix from Tim Harris
authorSimon Marlow <simonmar@microsoft.com>
Fri, 10 Feb 2006 11:21:11 +0000 (11:21 +0000)
committerSimon Marlow <simonmar@microsoft.com>
Fri, 10 Feb 2006 11:21:11 +0000 (11:21 +0000)
commita5bd056033e0f81e4d8ca30aa7c26cde3a3a132b
tree0f51890f4fd6660f1f53f23442dcdc54bec5bc24
parent6ff106616c1c98542df0a1763f0f9f655b2c8dd5
STM fix from Tim Harris

Fixes assertion failures with STM and -debug.  Tim says:
Sorry, it's a problem in how nested transactions are handled in
non-SMP builds.  It'll bite when trying to commit a nested transaction
which has read from a TVar but not updated it.

The call to validate_and_acquire_ownership in
stmCommitNestedTransaction should be the same as that in
stmCommitNestedTransaction, i.e.:

  result = validate_and_acquire_ownership(trec, (!use_read_phase), TRUE);
ghc/rts/STM.c