Support building with GHC 9.4

This contains a variety of tweaks needed to make the libraries in the `macaw-loader` repo build with GHC 9.4: * GHC 9.4 is pickier about undecidable superclass checking. As such, I needed to explicitly enable `UndecidableSuperClasses` in one place. * The following submodule changes were brought in to support building with GHC 9.4: * `asl-translator`: GaloisInc/asl-translator#51 * `bv-sized`: GaloisInc/bv-sized#27 * `bv-sized-float`: GaloisInc/bv-sized-float#4 * `crucible`: GaloisInc/crucible#1073 (This also requires bumping the `llvm-pretty`, `llvm-pretty-bc-parser`, and `what4` submodules as a side effect) * `dismantle`: GaloisInc/dismantle#40 * `grift`: GaloisInc/grift#8 * `macaw`: GaloisInc/macaw#330 * `parameterized-utils`: GaloisInc/parameterized-utils#146 * `semmc`: GaloisInc/semmc#79
GaloisInc · Apr 18, 2023 · 53de1d0 · 53de1d0
1 parent a615460
commit 53de1d0
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/macaw-loader/src/Data/Macaw/BinaryLoader.hs b/macaw-loader/src/Data/Macaw/BinaryLoader.hs
@@ -3,6 +3,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE UndecidableSuperClasses #-}
 
 module Data.Macaw.BinaryLoader (
   BinaryLoader(..),

diff --git a/submodules/asl-translator b/submodules/asl-translator
diff --git a/submodules/crucible b/submodules/crucible
diff --git a/submodules/dismantle b/submodules/dismantle
diff --git a/submodules/llvm-pretty b/submodules/llvm-pretty
diff --git a/submodules/llvm-pretty-bc-parser b/submodules/llvm-pretty-bc-parser
diff --git a/submodules/macaw b/submodules/macaw
diff --git a/submodules/parameterized-utils b/submodules/parameterized-utils
diff --git a/submodules/semmc b/submodules/semmc
diff --git a/submodules/what4 b/submodules/what4
+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
+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
+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
+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
+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
+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
+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