Support building with GHC 9.6

This patch contains a handful of tweaks needed to make the libraries in the
`macaw` repo build with GHC 9.6:

* GHC 9.6 bundles `mtl-2.3.*`, which no longer re-exports `Control.Monad`,
  `Control.Monad.Trans`, and similar modules from `mtl`-related modules. To
  accommodate this, various imports have been made more explicit.
* I have disambiguated a use of `Data.Parameterized.NatRepr.withKnownNat` in
  `macaw-aarch32` to avoid clashing with a newly exported function of the same
  name in `GHC.TypeNats`.
* I have bumped various upper version bounds on `doctest`,
  `optparse-applicative`, and `what4` to allow building these libraries with
  GHC 9.6.
* I have bumped the following submodules to bring in GHC 9.6–related changes:
  * `asl-translator`: GaloisInc/asl-translator#53
  * `crucible`: GaloisInc/crucible#1102
  * `dwarf`: GaloisInc/dwarf#6
  * `elf-edit`: GaloisInc/elf-edit#38
  * `flexdis86`: GaloisInc/flexdis86#54
  * `grift`: GaloisInc/grift#9
  * `llvm-pretty`: GaloisInc/llvm-pretty#112
  * `llvm-pretty-bc-parser`: GaloisInc/llvm-pretty-bc-parser#225
  * `semmc`: GaloisInc/semmc#80
  * `what4`: GaloisInc/what4#235

base/src/Data/Macaw/AbsDomain/AbsState.hs

@@ -61,7 +61,8 @@ module Data.Macaw.AbsDomain.AbsState
 
 import           Control.Exception (assert)
 import           Control.Lens
-import           Control.Monad.State.Strict
+import           Control.Monad (guard)
+import           Control.Monad.State.Strict (MonadState(..), State, modify, runState)
 import           Data.Bits
 import           Data.Foldable
 import           Data.Int

base/src/Data/Macaw/AbsDomain/JumpBounds.hs

@@ -36,7 +36,7 @@ module Data.Macaw.AbsDomain.JumpBounds
   , IntraJumpTarget
   ) where
 
-import           Control.Monad.Reader
+import           Control.Monad (unless, when)
 import           Data.Bits
 import           Data.Foldable
 import           Data.Map.Strict (Map)

base/src/Data/Macaw/AbsDomain/StackAnalysis.hs

@@ -105,8 +105,8 @@ module Data.Macaw.AbsDomain.StackAnalysis
   , MemVal(..)
   ) where
 
-import           Control.Monad.Reader
-import           Control.Monad.State
+import           Control.Monad (unless)
+import           Control.Monad.State (MonadState(..), State, evalState, gets)
 import           Data.Kind
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map

base/src/Data/Macaw/Analysis/FunctionArgs.hs

@@ -31,9 +31,10 @@ module Data.Macaw.Analysis.FunctionArgs
   ) where
 
 import           Control.Lens
-import           Control.Monad.Except
-import           Control.Monad.Reader
-import           Control.Monad.State.Strict
+import           Control.Monad (when)
+import           Control.Monad.Except (Except, MonadError(..), runExcept)
+import           Control.Monad.Reader (MonadReader(..), ReaderT(..), asks)
+import           Control.Monad.State.Strict (State, StateT, evalStateT, gets, modify', runState)
 import           Data.Foldable
 import qualified Data.Kind as Kind
 import           Data.Map.Strict (Map)

base/src/Data/Macaw/Analysis/RegisterUse.hs

@@ -67,9 +67,10 @@ module Data.Macaw.Analysis.RegisterUse
   ) where
 
 import           Control.Lens
-import           Control.Monad.Except
-import           Control.Monad.Reader
-import           Control.Monad.State.Strict
+import           Control.Monad (unless, when, zipWithM_)
+import           Control.Monad.Except (MonadError(..), Except)
+import           Control.Monad.Reader (MonadReader(..), ReaderT(..), asks)
+import           Control.Monad.State.Strict (MonadState(..), State, StateT, execStateT, evalState, gets, modify)
 import qualified Data.ByteString.Char8 as BSC
 import qualified Data.ByteString as BS
 import           Data.Foldable

base/src/Data/Macaw/CFG/Core.hs

@@ -96,7 +96,8 @@ module Data.Macaw.CFG.Core
   ) where
 
 import           Control.Lens
-import           Control.Monad.State.Strict
+import           Control.Monad (when)
+import           Control.Monad.State.Strict (MonadState(..), State, gets, modify, runState)
 import           Data.Bits
 import           Data.Int (Int64)
 import qualified Data.Kind as Kind

base/src/Data/Macaw/CFG/DemandSet.hs

@@ -20,7 +20,8 @@ module Data.Macaw.CFG.DemandSet
   , stmtNeeded
   ) where
 
-import           Control.Monad.State.Strict
+import           Control.Monad (when)
+import           Control.Monad.State.Strict (MonadState(..), State, execState, gets)
 import           Data.Parameterized.Some
 import           Data.Parameterized.TraversableF
 import           Data.Parameterized.TraversableFC

base/src/Data/Macaw/CFG/Rewriter.hs

@@ -34,8 +34,10 @@ module Data.Macaw.CFG.Rewriter
   ) where
 
 import           Control.Lens
+import           Control.Monad (when)
 import           Control.Monad.ST
-import           Control.Monad.State.Strict
+import           Control.Monad.State.Strict (StateT(..), gets)
+import           Control.Monad.Trans (MonadTrans(..))
 import           Data.BinarySymbols
 import           Data.Bits
 import           Data.List (find)

base/src/Data/Macaw/Memory/ElfLoader.hs

@@ -41,8 +41,9 @@ module Data.Macaw.Memory.ElfLoader
   ) where
 
 import           Control.Lens
-import           Control.Monad.Except
-import           Control.Monad.State.Strict
+import           Control.Monad (when)
+import           Control.Monad.Except (Except, ExceptT, MonadError(..), runExcept, runExceptT)
+import           Control.Monad.State.Strict (State, StateT(..), execStateT, gets, modify, runState)
 import           Data.Bits
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Char8 as BSC

macaw-aarch32/src/Data/Macaw/ARM/Semantics/TH.hs

@@ -45,7 +45,7 @@ import           Data.Parameterized.Classes
 import qualified Data.Parameterized.Context as Ctx
 import qualified Data.Parameterized.TraversableFC as FC
 import           Data.Parameterized.NatRepr
-import           GHC.TypeLits as TL
+import qualified GHC.TypeLits as TL
 import qualified What4.Expr.Builder as WEB
 import           Language.Haskell.TH
 import qualified SemMC.Architecture.AArch32 as ARM

macaw-semmc/macaw-semmc.cabal

@@ -39,7 +39,7 @@ library
                        semmc,
                        bv-sized >= 1 && < 1.1,
                        libBF >= 0.6 && < 0.7,
-                       what4 >= 1.1 && < 1.5
+                       what4 >= 1.1 && < 1.6
   hs-source-dirs:      src
   default-language:    Haskell2010
   ghc-options:         -Wall -Wcompat

refinement/macaw-refinement.cabal

@@ -152,7 +152,7 @@ test-suite test-refinements
                , crucible
                , crucible-llvm
                , what4
-               , optparse-applicative >= 0.13 && < 0.17
+               , optparse-applicative >= 0.13 && < 0.19
                , parameterized-utils
                , QuickCheck >= 2.7
                , semmc-ppc

symbolic/macaw-symbolic.cabal

@@ -27,7 +27,7 @@ library
     text,
     vector,
     bytestring,
-    what4 >= 1.1 && < 1.5
+    what4 >= 1.1 && < 1.6
 
   hs-source-dirs: src
 
@@ -56,6 +56,6 @@ test-suite doctests
   hs-source-dirs: test
   main-is: doctest.hs
   ghc-options: -Wall -Wcompat -threaded
-  build-depends: base, macaw-base, macaw-symbolic, doctest >= 0.10 && < 0.21
+  build-depends: base, macaw-base, macaw-symbolic, doctest >= 0.10 && < 0.23
 
 

symbolic/src/Data/Macaw/Symbolic/CrucGen.hs

@@ -84,11 +84,14 @@ module Data.Macaw.Symbolic.CrucGen
   ) where
 
 import           Control.Lens hiding (Empty, (:>))
-import           Control.Monad.Except
+import           Control.Monad (foldM, forM, unless)
+import           Control.Monad.Except (MonadError(..), ExceptT, runExceptT)
 import qualified Control.Monad.Fail as MF
-import           Control.Monad.State.Strict
+import           Control.Monad.State.Strict (MonadState(..), StateT(..), gets, modify')
+import           Control.Monad.Trans (MonadTrans(..))
 import qualified Data.BitVector.Sized as BV
 import qualified Data.Foldable as F
+import           Data.Functor (void)
 import qualified Data.Kind as K
 import qualified Data.Macaw.CFG as M
 import qualified Data.Macaw.CFG.Block as M

x86/src/Data/Macaw/X86.hs

@@ -51,9 +51,10 @@ module Data.Macaw.X86
        ) where
 
 import           Control.Lens
-import           Control.Monad.Cont
-import           Control.Monad.Except
+import           Control.Monad (when)
+import           Control.Monad.Except (ExceptT, MonadError(..), runExceptT, withExceptT)
 import           Control.Monad.ST
+import           Control.Monad.Trans (MonadTrans(..))
 import qualified Data.ElfEdit as EE
 import           Data.Foldable
 import qualified Data.Map as Map

x86/src/Data/Macaw/X86/Flexdis.hs

@@ -15,9 +15,10 @@ module Data.Macaw.X86.Flexdis
   , RelocPos(..)
   ) where
 
-import           Control.Monad.Except
+import           Control.Monad (when)
+import           Control.Monad.Except (ExceptT, MonadError(..), runExceptT)
 import qualified Control.Monad.Fail as MF
-import           Control.Monad.State.Strict
+import           Control.Monad.State.Strict (MonadState(..), State, gets, runState)
 import           Data.Bits
 import qualified Data.ByteString as BS
 import           Data.Int

x86/src/Data/Macaw/X86/Generator.hs

@@ -63,11 +63,13 @@ module Data.Macaw.X86.Generator
   ) where
 
 import           Control.Lens
-import           Control.Monad.Cont
-import           Control.Monad.Except
-import           Control.Monad.Reader
+import           Control.Monad (liftM)
+import           Control.Monad.Cont (ContT(..))
+import           Control.Monad.Except (MonadError(..), ExceptT)
+import           Control.Monad.Reader (MonadReader(..), ReaderT(..))
 import           Control.Monad.ST
-import           Control.Monad.State.Strict
+import           Control.Monad.State.Strict (State, modify, runState)
+import           Control.Monad.Trans (MonadTrans(..))
 import           Data.Bits
 import           Data.Foldable
 import           Data.Macaw.CFG.App