Support building with GHC 9.0 #1559
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
robdockins
approved these changes
Jan 27, 2022
|
The diff in Speaking of which, I should probably give @eddywestbrook a heads-up on this just in case this touches on any in-flight Heapster work. |
This contains a variety of fixes needed to make the packages in the `saw-script` repo compile with GHC 9.0: * GHC 9.0 implements simplified subsumption (see [here](https://gitlab.haskell.org/ghc/ghc/-/wikis/migration/9.0?version_id=5fcd0a50e0872efb3c38a32db140506da8310d87#simplified-subsumption)). This requires manually eta expanding some function applications to accommodate (see, for instance, the expansions of `getAllLLVM` in `SAWScript.Crucible.LLVM.MethodSpecIR`. * GHC's constraint solver now solves constraints in each top-level group sooner (see [here](https://gitlab.haskell.org/ghc/ghc/-/wikis/migration/9.0?version_id=5fcd0a50e0872efb3c38a32db140506da8310d87#the-order-of-th-splices-is-more-important)). This affects `heapster-saw`, as it uses declaration splices extensively. I did some fairly involved rearranging of data type declarations and TH-generated instances to make everything typecheck. It's not exactly pretty, but it gets the job done. * GHC 9.0 now enables `-Wstar-is-type` in `-Wall`, so this patch replaces some uses of `*` with `Data.Kind.Type` in `saw-core-what4` and `crux-mir-comp`. `Data.Kind` requires the use of GHC 8.0 or later, so this patch also updates the lower bounds on `base` to `>= 4.9` in the appropriate `.cabal` files. (I'm fairly certain that this requirement was already present implicity, but better to be explicit about it.) * The upper version bounds on `base` in `saw-remote-api` were raised to allow it to build with `base-4.15.*`, which is bundled with GHC 9.0. * The `cryptol` submodule was bumped to incorporate the changes from GaloisInc/cryptol#1233, which allow it to build with GHC 9.0.
RyanGlScott
added
the
PR: 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.
This contains a variety of fixes needed to make the packages in the
saw-scriptrepo compile with GHC 9.0:getAllLLVMinSAWScript.Crucible.LLVM.MethodSpecIR.heapster-saw, as it uses declaration splices extensively. I did some fairly involved rearranging of data type declarations and TH-generated instances to make everything typecheck. It's not exactly pretty, but it gets the job done.-Wstar-is-typein-Wall, so this patch replaces some uses of*withData.Kind.Typeinsaw-core-what4andcrux-mir-comp.Data.Kindrequires the use of GHC 8.0 or later, so this patch also updates the lower bounds onbaseto>= 4.9in the appropriate.cabalfiles. (I'm fairly certain that this requirement was already present implicity, but better to be explicit about it.)baseinsaw-remote-apiwere raised to allow it to build withbase-4.15.*, which is bundled with GHC 9.0.cryptolsubmodule was bumped to incorporate the changes from GHC 9.* cryptol#1233, which allow it to build with GHC 9.0.