summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-08-21 11:55:43 -0400
committerBen Gamari <ben@smart-cactus.org>2020-09-14 18:59:08 -0400
commita64e94f98ca18e53ecc13f736d50b9cb2d156b05 (patch)
treee36ec55af7e3e3ceee00d689162b8b4dbe6bdf6f
parentfd5d622a5ee283d3c1f1ccd28b4f73aab30d7d9f (diff)
downloadhaskell-a64e94f98ca18e53ecc13f736d50b9cb2d156b05.tar.gz
rts/nonmoving: Add missing STM write barrierwip/T18587
When updating a TRec for a TVar already part of a transaction we previously neglected to add the old value to the update remembered set. I suspect this was the cause of #18587.
-rw-r--r--rts/STM.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/rts/STM.c b/rts/STM.c
index 5f72c0ebfb..cff0d55082 100644
--- a/rts/STM.c
+++ b/rts/STM.c
@@ -1342,6 +1342,9 @@ void stmWriteTVar(Capability *cap,
if (entry != NULL) {
if (entry_in == trec) {
// Entry found in our trec
+ IF_NONMOVING_WRITE_BARRIER_ENABLED {
+ updateRemembSetPushClosure(cap, (StgClosure *) entry->new_value);
+ }
entry -> new_value = new_value;
} else {
// Entry found in another trec