diff --git a/cabal.GHC-8.10.7.config b/cabal.GHC-8.10.7.config index ce6b316da..b91d23172 100644 --- a/cabal.GHC-8.10.7.config +++ b/cabal.GHC-8.10.7.config @@ -15,10 +15,11 @@ constraints: any.BoundedChan ==1.0.3.0, any.adjunctions ==4.4.2, any.aeson ==2.0.3.0, aeson -cffi +ordered-keymap, - any.aeson-typescript ==0.4.2.0, + any.aeson-typescript ==0.5.0.0, any.alex ==3.2.7.1, - any.ansi-terminal ==0.11.4, + any.ansi-terminal ==0.11.5, ansi-terminal -example, + any.ansi-terminal-types ==0.11.5, any.ansi-wl-pprint ==0.6.9, ansi-wl-pprint -example, any.array ==0.5.4.0, @@ -40,7 +41,7 @@ constraints: any.BoundedChan ==1.0.3.0, bifunctors +semigroups +tagged, any.bimap ==0.5.0, any.binary ==0.8.8.0, - any.bitvec ==1.1.3.0, + any.bitvec ==1.1.4.0, bitvec -libgmp, any.bitwise ==1.0.0.1, any.blaze-builder ==0.4.2.2, @@ -90,14 +91,14 @@ constraints: any.BoundedChan ==1.0.3.0, any.erf ==2.0.0.0, any.exceptions ==0.10.4, any.executable-path ==0.0.3.1, - any.extra ==1.7.12, + any.extra ==1.7.13, any.fgl ==5.8.1.1, fgl +containers042, any.fgl-visualize ==0.1.0.1, any.filemanip ==0.3.6.3, any.filepath ==1.4.2.1, any.fingertree ==0.1.5.0, - any.free ==5.1.10, + any.free ==5.2, any.generic-deriving ==1.14.3, generic-deriving +base-4-9, any.generic-lens ==2.2.1.0, @@ -116,7 +117,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.haskeline ==0.8.2, any.haskell-lexer ==1.1.1, any.haskell-src-exts ==1.23.1, - any.haskell-src-meta ==0.8.11, + any.haskell-src-meta ==0.8.12, any.hedgehog ==1.1.1, any.hsc2hs ==0.68.9, hsc2hs -in-ghc-tree, @@ -134,18 +135,18 @@ constraints: any.BoundedChan ==1.0.3.0, any.invariant ==0.6.1, any.io-streams ==1.5.2.2, io-streams +network -nointeractivetests +zlib, - any.itanium-abi ==0.1.1.1, + any.itanium-abi ==0.1.2, any.json ==0.10, json +generic -mapdict +parsec +pretty +split-base, any.kan-extensions ==5.2.5, - any.kvitable ==1.0.2.0, - any.lens ==5.2.1, + any.kvitable ==1.0.2.1, + any.lens ==5.2.2, lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, any.libBF ==0.6.5.1, libBF -system-libbf, any.libyaml ==0.1.2, libyaml -no-unicode -system-libyaml, - any.lifted-async ==0.10.2.3, + any.lifted-async ==0.10.2.4, any.lifted-base ==0.2.3.12, llvm-pretty-bc-parser -fuzz -regressions, any.logict ==0.8.0.0, @@ -154,7 +155,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.megaparsec ==9.0.1, megaparsec -dev, any.microlens ==0.4.13.1, - any.microlens-th ==0.4.3.11, + any.microlens-th ==0.4.3.12, any.mmorph ==1.2.0, any.monad-control ==1.0.3.1, any.monadLib ==3.10.1, @@ -214,19 +215,19 @@ constraints: any.BoundedChan ==1.0.3.0, any.splitmix ==0.1.0.4, splitmix -optimised-mixer, any.stm ==2.5.0.1, - any.streaming-commons ==0.2.2.5, + any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, any.strict ==0.4.0.1, strict +assoc, any.string-interpolate ==0.3.2.0, string-interpolate -bytestring-builder -extended-benchmarks -text-builder, - any.syb ==0.7.2.2, + any.syb ==0.7.2.3, any.tagged ==0.8.7, tagged +deepseq +transformers, any.tasty ==1.4.3, tasty +unix, any.tasty-ant-xml ==1.1.8, - any.tasty-checklist ==1.0.5.0, + any.tasty-checklist ==1.0.5.1, any.tasty-expected-failure ==0.12.3, any.tasty-golden ==2.3.5, tasty-golden -build-example, @@ -235,7 +236,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.tasty-hunit ==0.10.0.3, any.tasty-quickcheck ==0.10.2, any.tasty-smallcheck ==0.8.2, - any.tasty-sugar ==2.0.1.0, + any.tasty-sugar ==2.1.0.0, any.template-haskell ==2.16.0.0, any.temporary ==1.3, any.terminal-size ==0.3.3, @@ -267,7 +268,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.unbounded-delays ==0.1.1.1, any.uniplate ==1.6.13, any.unix ==2.7.2.2, - any.unix-compat ==0.6, + any.unix-compat ==0.7, unix-compat -old-time, any.unliftio ==0.2.24.0, any.unliftio-core ==0.2.1.0, @@ -275,11 +276,12 @@ constraints: any.BoundedChan ==1.0.3.0, unordered-containers -debug, any.utf8-string ==1.0.2, any.uuid-types ==1.0.5, - any.vector ==0.12.3.1, + any.vector ==0.13.0.0, vector +boundschecks -internalchecks -unsafechecks -wall, any.vector-algorithms ==0.9.0.1, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, - any.versions ==5.0.4, + any.vector-stream ==0.1.0.0, + any.versions ==5.0.5, any.void ==0.7.3, void -safe, any.websockets ==0.12.7.3, @@ -294,4 +296,4 @@ constraints: any.BoundedChan ==1.0.3.0, any.zlib ==0.6.3.0, zlib -bundled-c-zlib -non-blocking-ffi -pkg-config, any.zlib-bindings ==0.1.1.5 -index-state: hackage.haskell.org 2023-03-13T12:18:58Z +index-state: hackage.haskell.org 2023-04-03T13:41:27Z diff --git a/cabal.GHC-8.8.4.config b/cabal.GHC-8.8.4.config index 07d4f641c..a64086897 100644 --- a/cabal.GHC-8.8.4.config +++ b/cabal.GHC-8.8.4.config @@ -15,10 +15,11 @@ constraints: any.BoundedChan ==1.0.3.0, any.adjunctions ==4.4.2, any.aeson ==2.0.3.0, aeson -cffi +ordered-keymap, - any.aeson-typescript ==0.4.2.0, + any.aeson-typescript ==0.5.0.0, any.alex ==3.2.7.1, - any.ansi-terminal ==0.11.4, + any.ansi-terminal ==0.11.5, ansi-terminal -example, + any.ansi-terminal-types ==0.11.5, any.ansi-wl-pprint ==0.6.9, ansi-wl-pprint -example, any.array ==0.5.4.0, @@ -40,7 +41,7 @@ constraints: any.BoundedChan ==1.0.3.0, bifunctors +semigroups +tagged, any.bimap ==0.5.0, any.binary ==0.8.7.0, - any.bitvec ==1.1.3.0, + any.bitvec ==1.1.4.0, bitvec -libgmp, any.bitwise ==1.0.0.1, any.blaze-builder ==0.4.2.2, @@ -91,14 +92,14 @@ constraints: any.BoundedChan ==1.0.3.0, any.exceptions ==0.10.7, exceptions +transformers-0-4, any.executable-path ==0.0.3.1, - any.extra ==1.7.12, + any.extra ==1.7.13, any.fgl ==5.8.1.1, fgl +containers042, any.fgl-visualize ==0.1.0.1, any.filemanip ==0.3.6.3, any.filepath ==1.4.2.1, any.fingertree ==0.1.5.0, - any.free ==5.1.10, + any.free ==5.2, any.generic-deriving ==1.14.3, generic-deriving +base-4-9, any.generic-lens ==2.2.1.0, @@ -117,7 +118,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.haskeline ==0.7.5.0, any.haskell-lexer ==1.1.1, any.haskell-src-exts ==1.23.1, - any.haskell-src-meta ==0.8.11, + any.haskell-src-meta ==0.8.12, any.hedgehog ==1.1.1, any.hsc2hs ==0.68.9, hsc2hs -in-ghc-tree, @@ -135,18 +136,18 @@ constraints: any.BoundedChan ==1.0.3.0, any.invariant ==0.6.1, any.io-streams ==1.5.2.2, io-streams +network -nointeractivetests +zlib, - any.itanium-abi ==0.1.1.1, + any.itanium-abi ==0.1.2, any.json ==0.10, json +generic -mapdict +parsec +pretty +split-base, any.kan-extensions ==5.2.5, - any.kvitable ==1.0.2.0, - any.lens ==5.2.1, + any.kvitable ==1.0.2.1, + any.lens ==5.2.2, lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, any.libBF ==0.6.5.1, libBF -system-libbf, any.libyaml ==0.1.2, libyaml -no-unicode -system-libyaml, - any.lifted-async ==0.10.2.3, + any.lifted-async ==0.10.2.4, any.lifted-base ==0.2.3.12, llvm-pretty-bc-parser -fuzz -regressions, any.logict ==0.8.0.0, @@ -155,7 +156,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.megaparsec ==9.0.1, megaparsec -dev, any.microlens ==0.4.13.1, - any.microlens-th ==0.4.3.11, + any.microlens-th ==0.4.3.12, any.mmorph ==1.2.0, any.monad-control ==1.0.3.1, any.monadLib ==3.10.1, @@ -215,19 +216,19 @@ constraints: any.BoundedChan ==1.0.3.0, any.splitmix ==0.1.0.4, splitmix -optimised-mixer, any.stm ==2.5.0.0, - any.streaming-commons ==0.2.2.5, + any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, any.strict ==0.4.0.1, strict +assoc, any.string-interpolate ==0.3.2.0, string-interpolate -bytestring-builder -extended-benchmarks -text-builder, - any.syb ==0.7.2.2, + any.syb ==0.7.2.3, any.tagged ==0.8.7, tagged +deepseq +transformers, any.tasty ==1.4.3, tasty +unix, any.tasty-ant-xml ==1.1.8, - any.tasty-checklist ==1.0.5.0, + any.tasty-checklist ==1.0.5.1, any.tasty-expected-failure ==0.12.3, any.tasty-golden ==2.3.5, tasty-golden -build-example, @@ -236,7 +237,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.tasty-hunit ==0.10.0.3, any.tasty-quickcheck ==0.10.2, any.tasty-smallcheck ==0.8.2, - any.tasty-sugar ==2.0.1.0, + any.tasty-sugar ==2.1.0.0, any.template-haskell ==2.15.0.0, any.temporary ==1.3, any.terminal-size ==0.3.3, @@ -268,7 +269,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.unbounded-delays ==0.1.1.1, any.uniplate ==1.6.13, any.unix ==2.7.2.2, - any.unix-compat ==0.6, + any.unix-compat ==0.7, unix-compat -old-time, any.unliftio ==0.2.24.0, any.unliftio-core ==0.2.1.0, @@ -276,11 +277,12 @@ constraints: any.BoundedChan ==1.0.3.0, unordered-containers -debug, any.utf8-string ==1.0.2, any.uuid-types ==1.0.5, - any.vector ==0.12.3.1, + any.vector ==0.13.0.0, vector +boundschecks -internalchecks -unsafechecks -wall, any.vector-algorithms ==0.9.0.1, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, - any.versions ==5.0.4, + any.vector-stream ==0.1.0.0, + any.versions ==5.0.5, any.void ==0.7.3, void -safe, any.websockets ==0.12.7.3, @@ -295,4 +297,4 @@ constraints: any.BoundedChan ==1.0.3.0, any.zlib ==0.6.3.0, zlib -bundled-c-zlib -non-blocking-ffi -pkg-config, any.zlib-bindings ==0.1.1.5 -index-state: hackage.haskell.org 2023-03-13T12:18:58Z +index-state: hackage.haskell.org 2023-04-03T13:41:27Z diff --git a/cabal.GHC-9.0.2.config b/cabal.GHC-9.0.2.config index e65cecff1..6446bbbe5 100644 --- a/cabal.GHC-9.0.2.config +++ b/cabal.GHC-9.0.2.config @@ -15,10 +15,11 @@ constraints: any.BoundedChan ==1.0.3.0, any.adjunctions ==4.4.2, any.aeson ==2.0.3.0, aeson -cffi +ordered-keymap, - any.aeson-typescript ==0.4.2.0, + any.aeson-typescript ==0.5.0.0, any.alex ==3.2.7.1, - any.ansi-terminal ==0.11.4, + any.ansi-terminal ==0.11.5, ansi-terminal -example, + any.ansi-terminal-types ==0.11.5, any.ansi-wl-pprint ==0.6.9, ansi-wl-pprint -example, any.array ==0.5.4.0, @@ -40,7 +41,7 @@ constraints: any.BoundedChan ==1.0.3.0, bifunctors +semigroups +tagged, any.bimap ==0.5.0, any.binary ==0.8.8.0, - any.bitvec ==1.1.3.0, + any.bitvec ==1.1.4.0, bitvec -libgmp, any.bitwise ==1.0.0.1, any.blaze-builder ==0.4.2.2, @@ -90,14 +91,14 @@ constraints: any.BoundedChan ==1.0.3.0, any.erf ==2.0.0.0, any.exceptions ==0.10.4, any.executable-path ==0.0.3.1, - any.extra ==1.7.12, + any.extra ==1.7.13, any.fgl ==5.8.1.1, fgl +containers042, any.fgl-visualize ==0.1.0.1, any.filemanip ==0.3.6.3, any.filepath ==1.4.2.1, any.fingertree ==0.1.5.0, - any.free ==5.1.10, + any.free ==5.2, any.generic-deriving ==1.14.3, generic-deriving +base-4-9, any.generic-lens ==2.2.1.0, @@ -117,7 +118,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.haskeline ==0.8.2, any.haskell-lexer ==1.1.1, any.haskell-src-exts ==1.23.1, - any.haskell-src-meta ==0.8.11, + any.haskell-src-meta ==0.8.12, any.hedgehog ==1.1.1, any.hsc2hs ==0.68.9, hsc2hs -in-ghc-tree, @@ -134,18 +135,18 @@ constraints: any.BoundedChan ==1.0.3.0, any.invariant ==0.6.1, any.io-streams ==1.5.2.2, io-streams +network -nointeractivetests +zlib, - any.itanium-abi ==0.1.1.1, + any.itanium-abi ==0.1.2, any.json ==0.10, json +generic -mapdict +parsec +pretty +split-base, any.kan-extensions ==5.2.5, - any.kvitable ==1.0.2.0, - any.lens ==5.2.1, + any.kvitable ==1.0.2.1, + any.lens ==5.2.2, lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, any.libBF ==0.6.5.1, libBF -system-libbf, any.libyaml ==0.1.2, libyaml -no-unicode -system-libyaml, - any.lifted-async ==0.10.2.3, + any.lifted-async ==0.10.2.4, any.lifted-base ==0.2.3.12, llvm-pretty-bc-parser -fuzz -regressions, any.logict ==0.8.0.0, @@ -154,7 +155,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.megaparsec ==9.0.1, megaparsec -dev, any.microlens ==0.4.13.1, - any.microlens-th ==0.4.3.11, + any.microlens-th ==0.4.3.12, any.mmorph ==1.2.0, any.monad-control ==1.0.3.1, any.monadLib ==3.10.1, @@ -214,19 +215,19 @@ constraints: any.BoundedChan ==1.0.3.0, any.splitmix ==0.1.0.4, splitmix -optimised-mixer, any.stm ==2.5.0.0, - any.streaming-commons ==0.2.2.5, + any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, any.strict ==0.4.0.1, strict +assoc, any.string-interpolate ==0.3.2.0, string-interpolate -bytestring-builder -extended-benchmarks -text-builder, - any.syb ==0.7.2.2, + any.syb ==0.7.2.3, any.tagged ==0.8.7, tagged +deepseq +transformers, any.tasty ==1.4.3, tasty +unix, any.tasty-ant-xml ==1.1.8, - any.tasty-checklist ==1.0.5.0, + any.tasty-checklist ==1.0.5.1, any.tasty-expected-failure ==0.12.3, any.tasty-golden ==2.3.5, tasty-golden -build-example, @@ -235,7 +236,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.tasty-hunit ==0.10.0.3, any.tasty-quickcheck ==0.10.2, any.tasty-smallcheck ==0.8.2, - any.tasty-sugar ==2.0.1.0, + any.tasty-sugar ==2.1.0.0, any.template-haskell ==2.17.0.0, any.temporary ==1.3, any.terminal-size ==0.3.3, @@ -267,7 +268,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.unbounded-delays ==0.1.1.1, any.uniplate ==1.6.13, any.unix ==2.7.2.2, - any.unix-compat ==0.6, + any.unix-compat ==0.7, unix-compat -old-time, any.unliftio ==0.2.24.0, any.unliftio-core ==0.2.1.0, @@ -275,11 +276,12 @@ constraints: any.BoundedChan ==1.0.3.0, unordered-containers -debug, any.utf8-string ==1.0.2, any.uuid-types ==1.0.5, - any.vector ==0.12.3.1, + any.vector ==0.13.0.0, vector +boundschecks -internalchecks -unsafechecks -wall, any.vector-algorithms ==0.9.0.1, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, - any.versions ==5.0.4, + any.vector-stream ==0.1.0.0, + any.versions ==5.0.5, any.void ==0.7.3, void -safe, any.websockets ==0.12.7.3, @@ -294,4 +296,4 @@ constraints: any.BoundedChan ==1.0.3.0, any.zlib ==0.6.3.0, zlib -bundled-c-zlib -non-blocking-ffi -pkg-config, any.zlib-bindings ==0.1.1.5 -index-state: hackage.haskell.org 2023-03-13T12:18:58Z +index-state: hackage.haskell.org 2023-04-03T13:41:27Z diff --git a/cabal.GHC-9.2.4.config b/cabal.GHC-9.2.4.config index f07ea3ec1..2dc6fe216 100644 --- a/cabal.GHC-9.2.4.config +++ b/cabal.GHC-9.2.4.config @@ -15,10 +15,11 @@ constraints: any.BoundedChan ==1.0.3.0, any.adjunctions ==4.4.2, any.aeson ==2.0.3.0, aeson -cffi +ordered-keymap, - any.aeson-typescript ==0.4.2.0, + any.aeson-typescript ==0.5.0.0, any.alex ==3.2.7.1, - any.ansi-terminal ==0.11.4, + any.ansi-terminal ==0.11.5, ansi-terminal -example, + any.ansi-terminal-types ==0.11.5, any.ansi-wl-pprint ==0.6.9, ansi-wl-pprint -example, any.array ==0.5.4.0, @@ -40,7 +41,7 @@ constraints: any.BoundedChan ==1.0.3.0, bifunctors +semigroups +tagged, any.bimap ==0.5.0, any.binary ==0.8.9.0, - any.bitvec ==1.1.3.0, + any.bitvec ==1.1.4.0, bitvec -libgmp, any.bitwise ==1.0.0.1, any.blaze-builder ==0.4.2.2, @@ -90,14 +91,14 @@ constraints: any.BoundedChan ==1.0.3.0, any.erf ==2.0.0.0, any.exceptions ==0.10.4, any.executable-path ==0.0.3.1, - any.extra ==1.7.12, + any.extra ==1.7.13, any.fgl ==5.8.1.1, fgl +containers042, any.fgl-visualize ==0.1.0.1, any.filemanip ==0.3.6.3, any.filepath ==1.4.2.2, any.fingertree ==0.1.5.0, - any.free ==5.1.10, + any.free ==5.2, any.generic-deriving ==1.14.3, generic-deriving +base-4-9, any.generic-lens ==2.2.1.0, @@ -117,7 +118,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.haskeline ==0.8.2, any.haskell-lexer ==1.1.1, any.haskell-src-exts ==1.23.1, - any.haskell-src-meta ==0.8.11, + any.haskell-src-meta ==0.8.12, any.hedgehog ==1.1.1, any.hsc2hs ==0.68.9, hsc2hs -in-ghc-tree, @@ -134,18 +135,18 @@ constraints: any.BoundedChan ==1.0.3.0, any.invariant ==0.6.1, any.io-streams ==1.5.2.2, io-streams +network -nointeractivetests +zlib, - any.itanium-abi ==0.1.1.1, + any.itanium-abi ==0.1.2, any.json ==0.10, json +generic -mapdict +parsec +pretty +split-base, any.kan-extensions ==5.2.5, - any.kvitable ==1.0.2.0, - any.lens ==5.2.1, + any.kvitable ==1.0.2.1, + any.lens ==5.2.2, lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, any.libBF ==0.6.5.1, libBF -system-libbf, any.libyaml ==0.1.2, libyaml -no-unicode -system-libyaml, - any.lifted-async ==0.10.2.3, + any.lifted-async ==0.10.2.4, any.lifted-base ==0.2.3.12, llvm-pretty-bc-parser -fuzz -regressions, any.logict ==0.8.0.0, @@ -154,7 +155,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.megaparsec ==9.0.1, megaparsec -dev, any.microlens ==0.4.13.1, - any.microlens-th ==0.4.3.11, + any.microlens-th ==0.4.3.12, any.mmorph ==1.2.0, any.monad-control ==1.0.3.1, any.monadLib ==3.10.1, @@ -214,19 +215,19 @@ constraints: any.BoundedChan ==1.0.3.0, any.splitmix ==0.1.0.4, splitmix -optimised-mixer, any.stm ==2.5.0.2, - any.streaming-commons ==0.2.2.5, + any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, any.strict ==0.4.0.1, strict +assoc, any.string-interpolate ==0.3.2.0, string-interpolate -bytestring-builder -extended-benchmarks -text-builder, - any.syb ==0.7.2.2, + any.syb ==0.7.2.3, any.tagged ==0.8.7, tagged +deepseq +transformers, any.tasty ==1.4.3, tasty +unix, any.tasty-ant-xml ==1.1.8, - any.tasty-checklist ==1.0.5.0, + any.tasty-checklist ==1.0.5.1, any.tasty-expected-failure ==0.12.3, any.tasty-golden ==2.3.5, tasty-golden -build-example, @@ -235,7 +236,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.tasty-hunit ==0.10.0.3, any.tasty-quickcheck ==0.10.2, any.tasty-smallcheck ==0.8.2, - any.tasty-sugar ==2.0.1.0, + any.tasty-sugar ==2.1.0.0, any.template-haskell ==2.18.0.0, any.temporary ==1.3, any.terminal-size ==0.3.3, @@ -267,7 +268,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.unbounded-delays ==0.1.1.1, any.uniplate ==1.6.13, any.unix ==2.7.2.2, - any.unix-compat ==0.6, + any.unix-compat ==0.7, unix-compat -old-time, any.unliftio ==0.2.24.0, any.unliftio-core ==0.2.1.0, @@ -275,11 +276,12 @@ constraints: any.BoundedChan ==1.0.3.0, unordered-containers -debug, any.utf8-string ==1.0.2, any.uuid-types ==1.0.5, - any.vector ==0.12.3.1, + any.vector ==0.13.0.0, vector +boundschecks -internalchecks -unsafechecks -wall, any.vector-algorithms ==0.9.0.1, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, - any.versions ==5.0.4, + any.vector-stream ==0.1.0.0, + any.versions ==5.0.5, any.void ==0.7.3, void -safe, any.websockets ==0.12.7.3, @@ -294,4 +296,4 @@ constraints: any.BoundedChan ==1.0.3.0, any.zlib ==0.6.3.0, zlib -bundled-c-zlib -non-blocking-ffi -pkg-config, any.zlib-bindings ==0.1.1.5 -index-state: hackage.haskell.org 2023-03-13T12:18:58Z +index-state: hackage.haskell.org 2023-04-03T13:41:27Z diff --git a/crucible-llvm/crucible-llvm.cabal b/crucible-llvm/crucible-llvm.cabal index 9d852ba45..25449ba1b 100644 --- a/crucible-llvm/crucible-llvm.cabal +++ b/crucible-llvm/crucible-llvm.cabal @@ -147,5 +147,5 @@ test-suite crucible-llvm-tests tasty, tasty-quickcheck, tasty-hunit, - tasty-sugar >= 2.0 && < 2.1, + tasty-sugar >= 2.0 && < 2.2, vector diff --git a/crucible-llvm/src/Lang/Crucible/LLVM/Translation/Instruction.hs b/crucible-llvm/src/Lang/Crucible/LLVM/Translation/Instruction.hs index a4b87f85b..ec08a052b 100644 --- a/crucible-llvm/src/Lang/Crucible/LLVM/Translation/Instruction.hs +++ b/crucible-llvm/src/Lang/Crucible/LLVM/Translation/Instruction.hs @@ -148,12 +148,12 @@ instrResultType instr = L.UnaryArith _ x -> liftMemType (L.typedType x) L.Bit _ x _ -> liftMemType (L.typedType x) L.Conv _ _ ty -> liftMemType ty - L.Call _ (L.PtrTo (L.FunTy ty _ _)) _ _ -> liftMemType ty - L.Call _ ty _ _ -> throwError $ unwords ["unexpected function type in call:", show ty] + L.Call _ (L.FunTy ty _ _) _ _ -> liftMemType ty + L.Call _ ty _ _ -> throwError $ unwords ["unexpected non-function type in call:", show ty] L.Invoke (L.FunTy ty _ _) _ _ _ _ -> liftMemType ty - L.Invoke ty _ _ _ _ -> throwError $ unwords ["unexpected function type in invoke:", show ty] - L.CallBr (L.PtrTo (L.FunTy ty _ _)) _ _ _ _ -> liftMemType ty - L.CallBr ty _ _ _ _ -> throwError $ unwords ["unexpected function type in callbr:", show ty] + L.Invoke ty _ _ _ _ -> throwError $ unwords ["unexpected non-function type in invoke:", show ty] + L.CallBr (L.FunTy ty _ _) _ _ _ _ -> liftMemType ty + L.CallBr ty _ _ _ _ -> throwError $ unwords ["unexpected non-function type in callbr:", show ty] L.Alloca ty _ _ -> liftMemType (L.PtrTo ty) L.Load x _ _ -> case L.typedType x of L.PtrTo ty -> liftMemType ty @@ -1594,23 +1594,18 @@ generateInstr retType lab defSet instr assign_f k = assign_f v k - L.Call tailcall (L.PtrTo fnTy) fn args -> + L.Call tailcall fnTy fn args -> callFunction defSet instr tailcall fnTy fn args assign_f >> k - L.Call _ ty _ _ -> - fail $ unwords ["unexpected function type in call:", show ty] L.Invoke fnTy fn args normLabel _unwindLabel -> do do callFunction defSet instr False fnTy fn args assign_f definePhiBlock lab normLabel - L.CallBr (L.PtrTo fnTy) fn args normLabel otherLabels -> do + L.CallBr fnTy fn args normLabel otherLabels -> do do callFunction defSet instr False fnTy fn args assign_f for_ otherLabels $ \lab' -> void (definePhiBlock lab lab') definePhiBlock lab normLabel - L.CallBr ty _ _ _ _ -> - fail $ unwords ["unexpected function type in callbr:", show ty] - L.Bit op x y -> do tp <- liftMemType' (L.typedType x) x' <- transValue tp (L.typedValue x) diff --git a/crucible-llvm/src/Lang/Crucible/LLVM/TypeContext.hs b/crucible-llvm/src/Lang/Crucible/LLVM/TypeContext.hs index d5c5a3240..a31db925f 100644 --- a/crucible-llvm/src/Lang/Crucible/LLVM/TypeContext.hs +++ b/crucible-llvm/src/Lang/Crucible/LLVM/TypeContext.hs @@ -153,6 +153,8 @@ tcType tp0 = do maybe badType (return . FunType) $ FunDecl <$> mrt <*> sequence margs <*> pure va L.PtrTo tp -> (MemType . PtrType) <$> tcType tp + L.PtrOpaque -> + error "crucible-llvm does not yet support opaque pointers in LLVM" L.Struct tpl -> maybeApp StructType $ tcStruct False tpl L.PackedStruct tpl -> maybeApp StructType $ tcStruct True tpl L.Vector n etp -> maybeApp (VecType (fromIntegral n)) $ tcMemType etp diff --git a/crucible-wasm/crucible-wasm.cabal b/crucible-wasm/crucible-wasm.cabal index 44ad83de3..243608bbc 100644 --- a/crucible-wasm/crucible-wasm.cabal +++ b/crucible-wasm/crucible-wasm.cabal @@ -97,6 +97,6 @@ test-suite crucible-wasm-test parsec, tasty >= 0.10, tasty-hunit >= 0.10, - tasty-sugar >= 2.0 && < 2.1, + tasty-sugar >= 2.0 && < 2.2, text, versions diff --git a/crux-llvm/crux-llvm.cabal b/crux-llvm/crux-llvm.cabal index 392c1efb1..2f83c90b5 100644 --- a/crux-llvm/crux-llvm.cabal +++ b/crux-llvm/crux-llvm.cabal @@ -67,7 +67,7 @@ common bldflags common testdefs build-depends: tasty >= 0.10 , tasty-hunit >= 0.10 - , tasty-sugar >= 2.0 && < 2.1 + , tasty-sugar >= 2.0 && < 2.2 , QuickCheck diff --git a/dependencies/llvm-pretty b/dependencies/llvm-pretty index 64d43d937..b13493fda 160000 --- a/dependencies/llvm-pretty +++ b/dependencies/llvm-pretty @@ -1 +1 @@ -Subproject commit 64d43d9375a819dc2a2df99fb98df24f049dcfaa +Subproject commit b13493fda7276835a4e19bf13a9fb1b3e08083a9 diff --git a/dependencies/llvm-pretty-bc-parser b/dependencies/llvm-pretty-bc-parser index cbcf0954c..d541adf5c 160000 --- a/dependencies/llvm-pretty-bc-parser +++ b/dependencies/llvm-pretty-bc-parser @@ -1 +1 @@ -Subproject commit cbcf0954c23da0018df3cc6aae77290ae2efe53b +Subproject commit d541adf5c12e86058cbc1f211456b4ad4a7011a1 diff --git a/dependencies/what4 b/dependencies/what4 index 6c462cd46..ffbad75b1 160000 --- a/dependencies/what4 +++ b/dependencies/what4 @@ -1 +1 @@ -Subproject commit 6c462cd46e0ea9ebbfbd6b6ea237984eeb3dc72a +Subproject commit ffbad75b1ce65577422a19a30a39a5059be8b95f