Merge remote-tracking branch 'github/master' into master

Control/Concurrent/STM/TMVar.hs

@@ -151,8 +151,10 @@ swapTMVar (TMVar t) new = do
 
 -- | Non-blocking write of a new value to a 'TMVar'
 -- Puts if empty. Replaces if populated.
+--
+-- @since 2.5.1
 writeTMVar :: TMVar a -> a -> STM ()
-writeTMVar t new = tryTakeTMVar t >> putTMVar t new
+writeTMVar (TMVar t) new = writeTVar t (Just new)
 
 -- |Check whether a given 'TMVar' is empty.
 isEmptyTMVar :: TMVar a -> STM Bool

tests/all.T

@@ -16,4 +16,4 @@ test('stm065', normal, compile_and_run, ['-package stm'])
 test('cloneTChan001', normal, compile_and_run, ['-package stm'])
 
 test('T15136', extra_run_opts('20'), compile_and_run, ['-package stm'])
-test('T16707', normal, compile_and_run, [''])
+test('T16707', js_broken(22576), compile_and_run, [''])