diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-11-01 13:10:01 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-11-01 13:10:01 -0500 |
| commit | b8e66e0eecdc58ec5fea0b2c9a9454d38858886c (patch) | |
| tree | 7d25f3ee8f2b714175d1b5647d9aec1fdb550cc1 /rts/Updates.h | |
| parent | b4686bff56377a583f0605b81fae290d3fee4c4a (diff) | |
| parent | 3a18155331e07e53b9f3b1d987ed430066b17aa4 (diff) | |
| download | haskell-b8e66e0eecdc58ec5fea0b2c9a9454d38858886c.tar.gz | |
Merge branch 'wip/tsan/storage' into wip/tsan/all
Diffstat (limited to 'rts/Updates.h')
| -rw-r--r-- | rts/Updates.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/rts/Updates.h b/rts/Updates.h index 608aaff524..aa5fbe0133 100644 --- a/rts/Updates.h +++ b/rts/Updates.h @@ -76,7 +76,6 @@ INLINE_HEADER void updateWithIndirection (Capability *cap, /* not necessarily true: ASSERT( !closure_IND(p1) ); */ /* occurs in RaiseAsync.c:raiseAsync() */ /* See Note [Heap memory barriers] in SMP.h */ - write_barrier(); bdescr *bd = Bdescr((StgPtr)p1); if (bd->gen_no != 0) { IF_NONMOVING_WRITE_BARRIER_ENABLED { @@ -88,9 +87,8 @@ INLINE_HEADER void updateWithIndirection (Capability *cap, TICK_UPD_NEW_IND(); } OVERWRITING_CLOSURE(p1); - ((StgInd *)p1)->indirectee = p2; - write_barrier(); - SET_INFO(p1, &stg_BLACKHOLE_info); + RELEASE_STORE(&((StgInd *)p1)->indirectee, p2); + SET_INFO_RELEASE(p1, &stg_BLACKHOLE_info); LDV_RECORD_CREATE(p1); } |