Support building with GHC 9.6

This patch contains a handful of small tweaks needed to make the libraries in the `semmc` repo build with GHC 9.6: * I have disambiguated a use of `Data.Parameterized.NatRepr.withKnownNat` in `semmc-aarch32` to avoid clashing with a newly exported function of the same name in `GHC.TypeNats`. * I have bumped `semmc`'s upper version bounds on `mtl` and `transformers` to allow building with `mtl-2.3.*` and `transformers-0.6.*`, which are bundled 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 * `elf-edit`: GaloisInc/elf-edit#38 * `llvm-pretty`: GaloisInc/llvm-pretty#112 * `what4`: GaloisInc/what4#235
GaloisInc · Aug 8, 2023 · 0aa2ae0 · 0aa2ae0
1 parent c02fe37
commit 0aa2ae0
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/semmc-aarch32/src/SemMC/Architecture/ARM/UF.hs b/semmc-aarch32/src/SemMC/Architecture/ARM/UF.hs
@@ -194,7 +194,7 @@ mkGlobalUF gb =
   let
     name = "INIT_GLOBAL_" ++ (T.unpack $ G.gbName gb)
   in case G.gbType gb of
-    BaseBVRepr (nr :: NatRepr n) -> withKnownNat nr $ Just $ A.mkUninterpFn @(EmptyCtx) @(BaseBVType n) name (\_ -> [])
+    BaseBVRepr (nr :: NatRepr n) -> NR.withKnownNat nr $ Just $ A.mkUninterpFn @(EmptyCtx) @(BaseBVType n) name (\_ -> [])
     BaseIntegerRepr -> Just $ A.mkUninterpFn @EmptyCtx @BaseIntegerType name (\_ -> [])
     BaseBoolRepr -> Just $ A.mkUninterpFn @EmptyCtx @BaseBoolType name (\_ -> [])
     BaseArrayRepr (Empty :> BaseIntegerRepr) (BaseBVRepr nr) |

diff --git a/semmc/semmc.cabal b/semmc/semmc.cabal
@@ -82,9 +82,9 @@ library
                        time,
                        parsec >= 3.1 && < 3.2,
                        megaparsec >= 7 && < 10,
-                       mtl >= 2.2 && < 2.3,
+                       mtl >= 2.2 && < 2.4,
                        hashtables >= 1.2 && < 1.4,
-                       transformers >= 0.5.2 && < 0.6,
+                       transformers >= 0.5.2 && < 0.7,
                        directory,
                        unliftio-core >= 0.2 && < 0.3,
                        unliftio,

diff --git a/submodules/asl-translator b/submodules/asl-translator
diff --git a/submodules/crucible b/submodules/crucible
diff --git a/submodules/elf-edit b/submodules/elf-edit
diff --git a/submodules/llvm-pretty b/submodules/llvm-pretty
diff --git a/submodules/what4 b/submodules/what4