diff options
author | Viktor Dukhovni <ietf-dane@dukhovni.org> | 2021-01-02 01:00:51 -0500 |
---|---|---|
committer | Viktor Dukhovni <ietf-dane@dukhovni.org> | 2021-01-02 12:45:44 -0500 |
commit | 3e68f65645651313e9d31186af3fb48dc5f1de73 (patch) | |
tree | 9788ea7068eef5e0a67912c76ccd58e65c8abbbf | |
parent | 6db6db46af6f8e3e24d7d16b0b43a984a9a14677 (diff) | |
download | haskell-3e68f65645651313e9d31186af3fb48dc5f1de73.tar.gz |
Maintain invariant: MVars on mut_list are dirty
The fix for 18919 was somewhat incomplete: while the MVars were
correctly added to the mut_list via dirty_MVAR(), their info table
remained "clean".
While this is mostly harmless in non-debug builds, but trips an
assertion in the debug build, and may result in the MVar being
needlessly being added to the mut_list multiple times.
Resolves: #19145
-rw-r--r-- | rts/PrimOps.cmm | 2 | ||||
-rw-r--r-- | rts/Threads.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm index 2b32e12d2a..595377b225 100644 --- a/rts/PrimOps.cmm +++ b/rts/PrimOps.cmm @@ -1841,6 +1841,7 @@ loop: // Resolve #18919. ccall dirty_MVAR(BaseReg "ptr", mvar "ptr", StgMVar_value(mvar) "ptr"); + info = stg_MVAR_DIRTY_info; } } @@ -1931,6 +1932,7 @@ loop: // Resolve #18919. ccall dirty_MVAR(BaseReg "ptr", mvar "ptr", StgMVar_value(mvar) "ptr"); + info = stg_MVAR_DIRTY_info; } } diff --git a/rts/Threads.c b/rts/Threads.c index 97be179e85..e1a401c9b3 100644 --- a/rts/Threads.c +++ b/rts/Threads.c @@ -794,6 +794,7 @@ loop: if (info == &stg_MVAR_CLEAN_info) { // Resolve #18919. dirty_MVAR(&cap->r, (StgClosure*)mvar, mvar->value); + info = &stg_MVAR_DIRTY_info; } } |