diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-11-08 09:29:16 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-11-08 09:29:16 -0500 |
| commit | 638f38c50e80a19275f3a06535a0dd8130a17a53 (patch) | |
| tree | ac18855cd2f39544e4841866fbabb3f86a4d1f35 /includes/rts/StablePtr.h | |
| parent | b1d2c1f3246b3740589a59bdf7648c13de47c32b (diff) | |
| parent | 07e82ba52228580cfbd90ff031e657acbecc715b (diff) | |
| download | haskell-638f38c50e80a19275f3a06535a0dd8130a17a53.tar.gz | |
Merge remote-tracking branch 'origin/wip/tsan/all'
Diffstat (limited to 'includes/rts/StablePtr.h')
| -rw-r--r-- | includes/rts/StablePtr.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/includes/rts/StablePtr.h b/includes/rts/StablePtr.h index f42c353d2b..56113b9f81 100644 --- a/includes/rts/StablePtr.h +++ b/includes/rts/StablePtr.h @@ -31,5 +31,9 @@ extern DLL_IMPORT_RTS spEntry *stable_ptr_table; EXTERN_INLINE StgPtr deRefStablePtr(StgStablePtr sp) { - return stable_ptr_table[(StgWord)sp].addr; + // acquire load to ensure that we see the new SPT if it has been recently + // enlarged. + const spEntry *spt = ACQUIRE_LOAD(&stable_ptr_table); + // acquire load to ensure that the referenced object is visible. + return ACQUIRE_LOAD(&spt[(StgWord)sp].addr); } |