Support building with GHC 9.6 #1987
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`sbv-10.*` brings in two changes to the SBV internals that affects SAW: 1. `sbv-10.0` removes the `generateSMTBenchmark` function in favor of two separate `generateSMTBenchmarkSat` and `generateSMTBenchmarkProof` functions. We use the `generateSMTBenchmarkSat` variant in `SAWScript.Prover.Exporter`. 2. `sbv-10.0` changes the `Maybe [String]` argument to `svUninterpreted` (which we use in `saw-core-sbv`'s `Verifier.SAW.Simulator.SBV`) to a `UICodeKind` argument, where `UINone` is now what used to be denoted with `Nothing`. We now use the appropriate CPP to make SAW compile before and after these changes. See also GaloisInc/cryptol#1513, which was in similar territory.
kquick
approved these changes
Nov 20, 2023
RyanGlScott
added
ready-to-merge
|
After the |
|
Oops, I think this is my fault. During a rebase, I think I accidentally rolled the |
Making SAW build with GHC 9.6 is almost entirely a matter of being more precise with `mtl`-related imports to account for `mtl-2.3.1` not re-exporting as many identifiers from `Control.Monad`, `Control.Monad.IO.Class`, etc. I have also bumped the following submodules and `source-repository-package`s to allow them to build with GHC 9.6: * `cryptol`: GaloisInc/cryptol#1572 * `hobbits`: eddywestbrook/hobbits#9
As of GHC 8.6, `TypeInType` is simply an alias for `DataKinds` + `PolyKinds`. And as of GHC 9.6, `TypeInType` is deprecated. Since we are already using `DataKinds` + `PolyKinds` in all of the places where we enable `TypeInType` in `heapster-saw`, let's just remove our use of `TypeInType` to avoid deprecation warnings.
`parseNamedShapeFromRustDecl` will produce an `-Woverlapping-patterns` warning with GHC 9.6 (but not in GHCi, see https://gitlab.haskell.org/ghc/ghc/-/issues/23915), but we can refactor the code slightly to avoid this issue.
Unfortunately, the upstream `language-rust` repo at https://github.com/harpocrates/language-rust no longer appears to be actively maintained, and without a fix for harpocrates/language-rust#44, it is impossible to build `language-rust` with GHC 9.6. This patch changes our `language-rust` submodule to instead use our fork of `language-rust` (at https://github.com/GaloisInc/language-rust). It is unclear if we will have to keep doing this in the long term, but this at least unblocks us in the short term.
RyanGlScott
added
the
ready-to-merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Making SAW build with GHC 9.6 is almost entirely a matter of being more precise with
mtl-related imports to account formtl-2.3.1not re-exporting as many identifiers fromControl.Monad,Control.Monad.IO.Class, etc.I have also bumped the following submodules and
source-repository-packages to allow them to build with GHC 9.6:cryptol: Support building with GHC 9.6 cryptol#1572hobbits: Support building withmtl-2.3.*(GHC 9.6) eddywestbrook/hobbits#9