Bump crucible and what4 to merge crucible #1260.

This is a cleanup change that breaks the API (though in a minor way) so we want to keep up with it. Apply the one-line fix to adjust to that change. Update what4 as well because crucible requires it.
GaloisInc · Oct 21, 2024 · 92f29e1 · 92f29e1
1 parent d2fb176
commit 92f29e1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/deps/crucible b/deps/crucible
diff --git a/deps/what4 b/deps/what4
diff --git a/src/SAWScript/Crucible/MIR/Builtins.hs b/src/SAWScript/Crucible/MIR/Builtins.hs
@@ -534,7 +534,7 @@ mir_load_module inputFile = do
 
    withImplicitParams opts $ do
      col <- io $ Mir.parseMIR inputFile b
-     io $ Mir.translateMIR mempty col halloc
+     io $ Mir.translateMIR col halloc
 
 mir_return :: SetupValue -> MIRSetupM ()
 mir_return retVal =
+17 −10		.github/Dockerfile-crux-llvm
+4 −1		.github/Dockerfile-crux-mir
+20 −6		.github/ci.sh
+3 −3		.github/workflows/crucible-go-build.yml
+3 −3		.github/workflows/crucible-jvm-build.yml
+3 −3		.github/workflows/crucible-wasm-build.yml
+4 −4		.github/workflows/crux-llvm-build.yml
+4 −4		.github/workflows/crux-mir-build.yml
+1 −1		.github/workflows/lint.yml
+1 −1		.github/workflows/uc-crux-llvm-lint.yaml
+1 −1		crucible-llvm/crucible-llvm.cabal
+3 −2		crucible-llvm/src/Lang/Crucible/LLVM/MemModel/Generic.hs
+10 −0		crucible-mir/CHANGELOG.md
+0 −13		crucible-mir/src/Mir/Generator.hs
+0 −12		crucible-mir/src/Mir/Mir.hs
+4 −4		crucible-mir/src/Mir/ParseTranslate.hs
+1 −1		crucible-mir/src/Mir/Pass.hs
+2 −2		crucible-mir/src/Mir/Pass/AllocateEnum.hs
+4 −4		crucible-mir/src/Mir/Trans.hs
+1 −1		crucible/crucible.cabal
+5 −7		crucible/src/Lang/Crucible/Backend.hs
+1 −1		crux-mir/src/Mir/Language.hs
+1 −1		dependencies/llvm-pretty
+1 −1		dependencies/what4
+1 −0		.github/workflows/gen_matrix.pl
+13 −6		.github/workflows/test.yml
+1 −1		dependencies/aig
+1 −1		what4-abc/what4-abc.cabal
+1 −1		what4-blt/what4-blt.cabal
+1 −1		what4-transition-system/what4-transition-system.cabal
+13 −0		what4/CHANGES.md
+2 −2		what4/src/What4/Expr/BoolMap.hs
+2 −2		what4/src/What4/Expr/WeightedSum.hs
+0 −1		what4/src/What4/Solver/CVC5.hs
+3 −4		what4/src/What4/Utils/AnnotatedMap.hs
+2 −2		what4/src/What4/Utils/Environment.hs
+4 −2		what4/src/What4/Utils/Word16String.hs
+0 −1		what4/test/InvariantSynthesis.hs
+2 −2		what4/what4.cabal