Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support building with GHC 9.4 #17

Merged
merged 4 commits into from
Apr 18, 2023
Merged

Support building with GHC 9.4 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53de1d0
Support building with GHC 9.4
RyanGlScott Apr 1, 2023
09c835c
Fix -Wtype-equality-requires-operators warnings
RyanGlScott Apr 1, 2023
c08f070
CI: Test GHC 9.2.7 and 9.4.4, drop 8.8.4 and 9.0.2
RyanGlScott Apr 18, 2023
f480d70
CI: Always save cache, even on failure
RyanGlScott Apr 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ghc-ver: ["8.8.4", "8.10.7", "9.0.2", "9.2.2"]
cabal: ["3.6.2.0"]
ghc-ver: ["8.10.7", "9.2.7", "9.4.4"]
cabal: ["3.8.1.0"]
# complete all jobs
fail-fast: false
name: macaw-loader - GHC v${{ matrix.ghc-ver }} - ubuntu-latest
Expand All @@ -26,8 +26,8 @@ jobs:
with:
ghc-version: ${{ matrix.ghc-ver }}
cabal-version: ${{ matrix.cabal }}
- name: Cache
uses: actions/cache@v1
- uses: actions/cache/restore@v3
name: Restore cabal store cache
with:
path: /home/runner/.cabal/store/ghc-${{ matrix.ghc-ver }}
# Prefer previous SHA hash if it is still cached
Expand All @@ -50,3 +50,10 @@ jobs:
- name: macaw-loader-ppc
run: |
cabal build pkg:macaw-loader-ppc
- uses: actions/cache/save@v3
name: Save cabal store cache
if: always()
with:
path: /home/runner/.cabal/store/ghc-${{ matrix.ghc-ver }}
# Prefer previous SHA hash if it is still cached
key: linux-${{ matrix.ghc-ver }}-${{ hashFiles('cabal.project.freeze') }}-${{ github.sha }}
1 change: 1 addition & 0 deletions macaw-loader-ppc/src/Data/Macaw/BinaryLoader/PPC.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE StandaloneDeriving #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}

module Data.Macaw.BinaryLoader.PPC
Expand Down
1 change: 1 addition & 0 deletions macaw-loader/src/Data/Macaw/BinaryLoader.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
{-# LANGUAGE GADTs #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE UndecidableSuperClasses #-}

module Data.Macaw.BinaryLoader (
BinaryLoader(..),
Expand Down
2 changes: 1 addition & 1 deletion submodules/asl-translator
Open in desktop
Submodule asl-translator updated 7 files
+15 −7 .github/workflows/ci-matrix.yml
+2 −2 asl-translator.cabal
+1 −0 lib/Language/ASL/Formulas.hs
+1 −0 lib/Language/ASL/Globals.hs
+1 −0 lib/Language/ASL/Translation/Driver.hs
+1 −1 submodules/crucible
+1 −1 submodules/dismantle
2 changes: 1 addition & 1 deletion submodules/crucible
Open in desktop
Submodule crucible updated 65 files
+11 −5 .github/workflows/crucible-go-build.yml
+11 −5 .github/workflows/crucible-jvm-build.yml
+11 −5 .github/workflows/crucible-wasm-build.yml
+14 −7 .github/workflows/crux-llvm-build.yml
+8 −3 .github/workflows/crux-mir-build.yml
+38 −34 cabal.GHC-8.10.7.config
+38 −34 cabal.GHC-8.8.4.config
+0 −295 cabal.GHC-9.2.2.config
+0 −294 cabal.GHC-9.2.3.config
+42 −38 cabal.GHC-9.2.7.config
+58 −54 cabal.GHC-9.4.4.config
+1 −0 crucible-concurrency/src/Cruces/ExploreCrux.hs
+2 −2 crucible-llvm/crucible-llvm.cabal
+7 −12 crucible-llvm/src/Lang/Crucible/LLVM/Translation/Instruction.hs
+2 −0 crucible-llvm/src/Lang/Crucible/LLVM/TypeContext.hs
+1 −0 crucible-llvm/test/TestMemory.hs
+1 −1 crucible-mir/crucible-mir.cabal
+1 −1 crucible-mir/src/Mir/Generator.hs
+28 −14 crucible-mir/src/Mir/Trans.hs
+7 −3 crucible-mir/src/Mir/TransCustom.hs
+2 −2 crucible-symio/crucible-symio.cabal
+0 −3 crucible-symio/src/Data/Parameterized/IntervalsMap.hs
+0 −3 crucible-symio/src/What4/CachedArray.hs
+2 −2 crucible-syntax/crucible-syntax.cabal
+1 −0 crucible-syntax/src/Lang/Crucible/Syntax/Prog.hs
+1 −1 crucible-wasm/crucible-wasm.cabal
+1 −1 crucible-wasm/src/Lang/Crucible/Wasm.hs
+1 −1 crucible-wasm/src/Lang/Crucible/Wasm/Instantiate.hs
+34 −6 crucible-wasm/src/Lang/Crucible/Wasm/Main.hs
+74 −23 crucible-wasm/src/Lang/Crucible/Wasm/Translate.hs
+1 −0 crucible-wasm/test-data/.gitignore
+0 −0 crucible-wasm/test-data/basic-binary.good
+ − crucible-wasm/test-data/basic-binary.wasm
+1 −0 crucible-wasm/test-data/basic-script.good
+6 −0 crucible-wasm/test-data/basic-script.wast
+0 −2 crucible-wasm/test-data/basic.config
+0 −0 crucible-wasm/test-data/basic.z3.result.out
+1 −0 crucible-wasm/test-data/multi-value.good
+39 −0 crucible-wasm/test-data/multi-value.wast
+1 −0 crucible-wasm/test-data/sign-extend.good
+57 −0 crucible-wasm/test-data/sign-extend.wast
+13 −14 crucible-wasm/test/Test.hs
+1 −1 crucible/crucible.cabal
+2 −2 crux-llvm/README.md
+2 −2 crux-llvm/crux-llvm.cabal
+1 −1 crux-mir/README.md
+1 −1 crux-mir/crux-mir.cabal
+1 −1 crux/crux.cabal
+10 −2 crux/src/Crux.hs
+1 −0 crux/src/Crux/Goal.hs
+1 −1 dependencies/aig
+1 −1 dependencies/haskell-wasm
+1 −1 dependencies/llvm-pretty
+1 −1 dependencies/llvm-pretty-bc-parser
+1 −1 dependencies/what4
+1 −0 uc-crux-llvm/src/UCCrux/LLVM/Overrides/Skip.hs
+1 −0 uc-crux-llvm/src/UCCrux/LLVM/Overrides/Spec.hs
+1 −0 uc-crux-llvm/src/UCCrux/LLVM/Overrides/Unsound.hs
+1 −0 uc-crux-llvm/src/UCCrux/LLVM/Postcondition/Apply.hs
+1 −0 uc-crux-llvm/src/UCCrux/LLVM/Run/Simulate.hs
+1 −0 uc-crux-llvm/src/UCCrux/LLVM/Specs/Type.hs
+1 −0 uc-crux-llvm/src/UCCrux/LLVM/View/Postcond.hs
+1 −0 uc-crux-llvm/src/UCCrux/LLVM/View/Precond.hs
+1 −0 uc-crux-llvm/src/UCCrux/LLVM/View/Specs.hs
+3 −3 uc-crux-llvm/uc-crux-llvm.cabal
2 changes: 1 addition & 1 deletion submodules/dismantle
Open in desktop
Submodule dismantle updated from 48433e to 82849d
2 changes: 1 addition & 1 deletion submodules/llvm-pretty
Open in desktop
Submodule llvm-pretty updated from 64d43d to b13493
2 changes: 1 addition & 1 deletion submodules/llvm-pretty-bc-parser
Open in desktop
Submodule llvm-pretty-bc-parser updated 24 files
+41 −7 .github/workflows/build.yml
+53 −21 .github/workflows/llvm-quick-fuzz.yml
+2 −0 .gitignore
+49 −31 README.md
+286 −129 disasm-test/Main.hs
+9 −0 disasm-test/tests/T189.c
+29 −0 disasm-test/tests/T189.ll
+43 −0 disasm-test/tests/di-arg-list.at-least-llvm13.ll
+4 −0 disasm-test/tests/di-arg-list.c
+3 −0 disasm-test/tests/poison.at-least-llvm12.ll
+14 −0 doc/developing.md
+1 −1 llvm-pretty
+15 −3 llvm-pretty-bc-parser.cabal
+17 −20 regression-test/Main.hs
+134 −42 src/Data/LLVM/BitCode/BitString.hs
+53 −67 src/Data/LLVM/BitCode/Bitstream.hs
+309 −98 src/Data/LLVM/BitCode/GetBits.hs
+3 −1 src/Data/LLVM/BitCode/IR.hs
+82 −40 src/Data/LLVM/BitCode/IR/Constants.hs
+40 −3 src/Data/LLVM/BitCode/IR/Function.hs
+50 −8 src/Data/LLVM/BitCode/IR/Metadata.hs
+8 −2 src/Data/LLVM/BitCode/IR/Module.hs
+7 −7 src/Data/LLVM/BitCode/Record.hs
+10 −0 unit-test/Tests/Instances.hs
2 changes: 1 addition & 1 deletion submodules/macaw
Open in desktop
Submodule macaw updated 26 files
+12 −4 .github/workflows/ci.yaml
+1 −0 base/src/Data/Macaw/CFG/Core.hs
+2 −2 base/src/Data/Macaw/CFG/Rewriter.hs
+1 −0 base/src/Data/Macaw/Memory.hs
+6 −0 cabal.project.dist
+25 −25 cabal.project.freeze.ghc-8.10.7
+0 −283 cabal.project.freeze.ghc-8.8.4
+35 −33 cabal.project.freeze.ghc-9.2.7
+52 −50 cabal.project.freeze.ghc-9.4.4
+1 −1 deps/asl-translator
+1 −1 deps/bv-sized
+1 −1 deps/bv-sized-float
+1 −1 deps/crucible
+1 −1 deps/dismantle
+1 −1 deps/grift
+1 −1 deps/macaw-loader
+1 −1 deps/semmc
+1 −0 macaw-aarch32-symbolic/src/Data/Macaw/AArch32/Symbolic/Functions.hs
+1 −0 macaw-ppc/src/Data/Macaw/PPC/Disassemble.hs
+1 −0 macaw-ppc/src/Data/Macaw/PPC/Identify.hs
+1 −0 macaw-ppc/tests/PPC64InstructionCoverage.hs
+1 −0 macaw-ppc/tests/PPCTests.hs
+1 −0 macaw-ppc/tests/Shared.hs
+1 −0 macaw-semmc/src/Data/Macaw/SemMC/Operands.hs
+1 −0 macaw-semmc/src/Data/Macaw/SemMC/Simplify.hs
+1 −0 refinement/src/Data/Macaw/Refinement/Solver.hs
2 changes: 1 addition & 1 deletion submodules/parameterized-utils
Open in desktop
Submodule parameterized-utils updated 19 files
+8 −5 .github/workflows/test.yml
+13 −0 Changelog.md
+13 −7 parameterized-utils.cabal
+1 −1 src/Data/Parameterized/Classes.hs
+1 −1 src/Data/Parameterized/ClassesC.hs
+2 −2 src/Data/Parameterized/Context/Safe.hs
+2 −2 src/Data/Parameterized/Context/Unsafe.hs
+37 −0 src/Data/Parameterized/Fin.hs
+79 −0 src/Data/Parameterized/FinMap.hs
+248 −0 src/Data/Parameterized/FinMap/Safe.hs
+249 −0 src/Data/Parameterized/FinMap/Unsafe.hs
+28 −3 src/Data/Parameterized/NatRepr.hs
+8 −1 src/Data/Parameterized/Some.hs
+1 −4 src/Data/Parameterized/Vector.hs
+22 −3 test/Test/Fin.hs
+393 −0 test/Test/FinMap.hs
+74 −0 test/Test/Some.hs
+14 −3 test/Test/Vector.hs
+4 −0 test/UnitTest.hs
2 changes: 1 addition & 1 deletion submodules/semmc
Open in desktop
Submodule semmc updated 35 files
+15 −3 .github/workflows/ci.yml
+31 −31 cabal.GHC-8.10.7.config
+0 −267 cabal.GHC-8.8.4.config
+37 −35 cabal.GHC-9.2.7.config
+52 −51 cabal.GHC-9.4.4.config
+1 −0 semmc-arm/src/SemMC/Architecture/ARM/Eval.hs
+1 −0 semmc-arm/test/TestFormulas.hs
+1 −0 semmc-arm/tools/GenBase.hs
+1 −1 semmc-learning/semmc-learning.cabal
+1 −0 semmc-learning/src/SemMC/Stochastic/CandidateProgram.hs
+1 −0 semmc-ppc/src/SemMC/Architecture/PPC.hs
+1 −0 semmc-ppc/src/SemMC/Architecture/PPC/Eval.hs
+1 −0 semmc-ppc/src/SemMC/Architecture/PPC/Pseudo.hs
+1 −0 semmc-ppc/tests/Main.hs
+2 −1 semmc-ppc/tools/GenBase.hs
+1 −0 semmc-ppc/tools/SynthDemo.hs
+1 −0 semmc-synthesis/src/SemMC/Synthesis.hs
+1 −1 semmc-synthesis/src/SemMC/Synthesis/Cegis/EvalFormula.hs
+3 −3 semmc-synthesis/src/SemMC/Synthesis/Cegis/Types.hs
+1 −0 semmc-synthesis/src/SemMC/Synthesis/Core.hs
+1 −0 semmc-synthesis/src/SemMC/Synthesis/DivideAndConquer.hs
+1 −0 semmc-synthesis/src/SemMC/Synthesis/Testing.hs
+1 −1 semmc-toy/semmc-toy.cabal
+1 −0 semmc-toy/src/SemMC/Toy/Tests.hs
+2 −2 semmc/semmc.cabal
+6 −5 semmc/src/SemMC/Architecture.hs
+1 −0 semmc/src/SemMC/Architecture/AllocatedOperand.hs
+1 −0 semmc/src/SemMC/Architecture/Concrete.hs
+1 −0 semmc/src/SemMC/Architecture/Pseudo.hs
+1 −0 semmc/src/SemMC/Formula/Equivalence.hs
+2 −2 semmc/tests/semstore/ParamFormulaTests.hs
+1 −1 submodules/asl-translator
+1 −1 submodules/crucible
+1 −1 submodules/dismantle
+1 −1 submodules/llvm-pretty
2 changes: 1 addition & 1 deletion submodules/what4
Open in desktop
Submodule what4 updated 6 files
+22 −0 what4/doc/arithdomain.cry
+8 −0 what4/src/What4/Expr/Builder.hs
+6 −0 what4/src/What4/Utils/BVDomain.hs
+55 −0 what4/src/What4/Utils/BVDomain/Arith.hs
+3 −0 what4/test/BVDomTests.hs
+1 −1 what4/what4.cabal