Early support for GHC 9.4.2

We still need:
* cborg
* serialise
which support 9.4.2.  Both are addressed in
well-typed/cborg#298

Author: coot

cabal.project

@@ -1,4 +1,4 @@
-index-state: 2022-02-18T00:00:00Z
+index-state: 2022-09-01T00:00:00Z
 
 packages: ./io-sim
           ./io-classes

io-classes/io-classes.cabal

@@ -51,13 +51,13 @@ library
                        FlexibleContexts
                        ScopedTypeVariables
                        RankNTypes
-  build-depends:       base  >=4.9 && <4.17,
+  build-depends:       base  >=4.9 && <4.18,
                        async >=2.1,
                        bytestring,
                        deque,
-                       mtl   >=2.2 && <2.3,
+                       mtl   >=2.2 && <2.4,
                        stm   >=2.5 && <2.6,
-                       time  >=1.9.1 && <1.11
+                       time  >=1.9.1 && <1.13
   ghc-options:         -Wall
                        -Wno-unticked-promoted-constructors
                        -Wcompat

io-classes/src/Control/Monad/Class/MonadMVar.hs

@@ -1,6 +1,7 @@
 {-# LANGUAGE DefaultSignatures      #-}
 {-# LANGUAGE QuantifiedConstraints  #-}
 {-# LANGUAGE TypeFamilyDependencies #-}
+{-# LANGUAGE TypeOperators          #-}
 
 module Control.Monad.Class.MonadMVar
   ( MonadMVar (..)

io-classes/src/Control/Monad/Class/MonadSTM.hs

@@ -12,9 +12,11 @@
 {-# LANGUAGE StandaloneDeriving         #-}
 {-# LANGUAGE TypeFamilies               #-}
 {-# LANGUAGE TypeFamilyDependencies     #-}
+{-# LANGUAGE TypeOperators              #-}
 -- undecidable instances needed for 'WrappedSTM' instances of 'MonadThrow' and
 -- 'MonadCatch' type classes.
 {-# LANGUAGE UndecidableInstances       #-}
+
 module Control.Monad.Class.MonadSTM
   ( MonadSTM (..)
   , MonadLabelledSTM (..)

io-sim/io-sim.cabal

@@ -49,7 +49,7 @@ library
                        RankNTypes,
                        ScopedTypeVariables,
                        TypeFamilies
-  build-depends:       base              >=4.9 && <4.17,
+  build-depends:       base              >=4.9 && <4.18,
                        io-classes        >=0.2 && <0.3,
                        exceptions        >=0.10,
                        containers,
@@ -58,7 +58,7 @@ library
                        pretty-simple,
                        psqueues          >=0.2 && <0.3,
                        text,
-                       time              >=1.9.1 && <1.11,
+                       time              >=1.9.1 && <1.13,
                        quiet,
                        QuickCheck,
                        syb
@@ -94,7 +94,7 @@ test-suite test
                        tasty,
                        tasty-quickcheck,
                        tasty-hunit,
-                       time               >= 1.9.1
+                       time
 
   ghc-options:         -Wall
                        -fno-ignore-asserts

io-sim/src/Control/Monad/IOSim/Internal.hs

@@ -1046,17 +1046,17 @@ saveTVar TVar{tvarCurrent, tvarUndo} = do
 revertTVar :: TVar s a -> ST s ()
 revertTVar TVar{tvarCurrent, tvarUndo} = do
     -- pop the undo stack, and revert the current value
-    (v:vs) <- readSTRef tvarUndo
-    !_ <- writeSTRef tvarCurrent v
-    !_ <- writeSTRef tvarUndo    vs
+    vs <- readSTRef tvarUndo
+    !_ <- writeSTRef tvarCurrent (head vs)
+    !_ <- writeSTRef tvarUndo    (tail vs)
     return ()
 {-# INLINE revertTVar #-}
 
 commitTVar :: TVar s a -> ST s ()
 commitTVar TVar{tvarUndo} = do
+    vs <- readSTRef tvarUndo
     -- pop the undo stack, leaving the current value unchanged
-    (_:vs) <- readSTRef tvarUndo
-    !_ <- writeSTRef tvarUndo vs
+    !_ <- writeSTRef tvarUndo (tail vs)
     return ()
 {-# INLINE commitTVar #-}
 

io-sim/src/Control/Monad/IOSimPOR/Internal.hs

@@ -1264,16 +1264,16 @@ saveTVar TVar{tvarCurrent, tvarUndo} = do
 revertTVar :: TVar s a -> ST s ()
 revertTVar TVar{tvarCurrent, tvarUndo} = do
     -- pop the undo stack, and revert the current value
-    (v:vs) <- readSTRef tvarUndo
-    writeSTRef tvarCurrent v
-    writeSTRef tvarUndo    vs
+    vs <- readSTRef tvarUndo
+    writeSTRef tvarCurrent (head vs)
+    writeSTRef tvarUndo    (tail vs)
 {-# INLINE revertTVar #-}
 
 commitTVar :: TVar s a -> ST s ()
 commitTVar TVar{tvarUndo} = do
+    vs <- readSTRef tvarUndo
     -- pop the undo stack, leaving the current value unchanged
-    (_:vs) <- readSTRef tvarUndo
-    writeSTRef tvarUndo vs
+    writeSTRef tvarUndo (tail vs)
 {-# INLINE commitTVar #-}
 
 readTVarUndos :: TVar s a -> ST s [a]

strict-stm/src/Control/Monad/Class/MonadSTM/Strict.hs

@@ -4,6 +4,7 @@
 {-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE NamedFieldPuns        #-}
 {-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE TypeOperators         #-}
 
 -- to preserve 'HasCallstack' constraint on 'checkInvariant'
 {-# OPTIONS_GHC -Wno-redundant-constraints #-}

strict-stm/strict-stm.cabal

@@ -14,6 +14,7 @@ maintainer:
 category:            Control
 build-type:          Simple
 cabal-version:       >=1.10
+tested-with:         GHC == 8.10.7, GHC == 9.2.2
 
 source-repository head
   type:     git
@@ -35,7 +36,7 @@ library
 
   exposed-modules:     Control.Monad.Class.MonadSTM.Strict
   default-language:    Haskell2010
-  build-depends:       base  >=4.9 && <4.17,
+  build-depends:       base  >=4.9 && <4.18,
                        stm   >=2.5 && <2.6,
                        io-classes
   ghc-options:         -Wall