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

Bump bitwuzla 0.4.0 -> 0.6.0 #245

Merged
merged 2 commits into from
Nov 6, 2024
Merged

Bump bitwuzla 0.4.0 -> 0.6.0 #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
931f74c
Bump bitwuzla conflict 0.4.0 -> 0.6.0
filipeom Nov 6, 2024
aa3f118
Remove leaky hack in bitwuzla's mappigns
filipeom Nov 6, 2024
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
2 changes: 1 addition & 1 deletion dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
z3)
(conflicts
(bitwuzla-cxx
(< "0.4.0"))
(< "0.6.0"))
(z3
(or
(< "4.12.2")
Expand Down
2 changes: 1 addition & 1 deletion smtml.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ depends: [
]
depopts: ["alt-ergo-lib" "bitwuzla-cxx" "colibri2" "cvc5" "z3"]
conflicts: [
"bitwuzla-cxx" {< "0.4.0"}
"bitwuzla-cxx" {< "0.6.0"}
"z3" {< "4.12.2" | >= "4.14"}
]
build: [
Expand Down
17 changes: 1 addition & 16 deletions src/bitwuzla_mappings.default.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,6 @@

include Mappings_intf

(* Hack: this was a hack to try and run bitwuzla in Owi *)
let leak =
let leaky_list = ref [] in
let mutex = Mutex.create () in
fun module_ ->
Mutex.lock mutex;
leaky_list := module_ :: !leaky_list;
Mutex.unlock mutex

module Fresh_bitwuzla (B : Bitwuzla_cxx.S) : M = struct
open B

Expand Down Expand Up @@ -511,13 +502,7 @@ end

include (
Mappings.Make (struct
module Make () = struct
let bitwuzla = (module Bitwuzla_cxx.Make () : Bitwuzla_cxx.S)

let () = leak bitwuzla

include Fresh_bitwuzla ((val bitwuzla))
end
module Make () = Fresh_bitwuzla (Bitwuzla_cxx.Make ())

let is_available = true

Expand Down