From e51b6d3ece12cde925c051bbd3e40cfee205b572 Mon Sep 17 00:00:00 2001
From: davidsemakula <hello@davidsemakula.com>
Date: Mon, 25 Nov 2024 13:26:28 +0300
Subject: [PATCH 1/2] Delete z3 context on drop

---
 checker/src/z3_solver.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/checker/src/z3_solver.rs b/checker/src/z3_solver.rs
index b40043c6..60d47b8e 100644
--- a/checker/src/z3_solver.rs
+++ b/checker/src/z3_solver.rs
@@ -2152,3 +2152,11 @@ impl Z3Solver {
         self.bv_variable(path, num_bits)
     }
 }
+
+impl Drop for Z3Solver {
+    fn drop(&mut self) {
+        unsafe {
+            z3_sys::Z3_del_context(self.z3_context);
+        };
+    }
+}

From f3ec9c594735b8b77ea6112a4f4b671e2ff01a77 Mon Sep 17 00:00:00 2001
From: davidsemakula <hello@davidsemakula.com>
Date: Wed, 27 Nov 2024 22:12:03 +0300
Subject: [PATCH 2/2] Fix CI

---
 Cargo.lock                 |  54 ++++++++++++++++++-------------------
 binaries/summary_store.tar | Bin 3009536 -> 3184128 bytes
 checker/src/cargo_mirai.rs |  21 ++++++++-------
 3 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9598bec2..b520f93c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -99,7 +99,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -140,9 +140,9 @@ dependencies = [
 
 [[package]]
 name = "cargo_metadata"
-version = "0.18.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+checksum = "afc309ed89476c8957c50fb818f56fe894db857866c3e163335faa91dc34eb85"
 dependencies = [
  "camino",
  "cargo-platform",
@@ -154,9 +154,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
+checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
 dependencies = [
  "shlex",
 ]
@@ -216,9 +216,9 @@ checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
 
 [[package]]
 name = "cmake"
-version = "0.1.51"
+version = "0.1.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a"
+checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e"
 dependencies = [
  "cc",
 ]
@@ -422,9 +422,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
 name = "humantime"
@@ -474,9 +474,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "lazy_static"
@@ -486,9 +486,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.162"
+version = "0.2.166"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
+checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36"
 
 [[package]]
 name = "libloading"
@@ -667,9 +667,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -804,9 +804,9 @@ checksum = "3316159ab19e19d1065ecc49278e87f767a9dae9fae80348d2b4d4fa4ae02d4d"
 
 [[package]]
 name = "rustix"
-version = "0.38.40"
+version = "0.38.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0"
+checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -862,14 +862,14 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.132"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
  "memchr",
@@ -948,9 +948,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.87"
+version = "2.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1012,7 +1012,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]
 
 [[package]]
@@ -1038,9 +1038,9 @@ checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "untrustworthy_inputs"
@@ -1211,7 +1211,7 @@ dependencies = [
 [[package]]
 name = "z3-sys"
 version = "0.8.1"
-source = "git+https://github.com/prove-rs/z3.rs.git#cb10013a2a0a017048b1d218bc734afa390f34ff"
+source = "git+https://github.com/prove-rs/z3.rs.git#eb5796f1c6832d2695b6668303f712261b40d29b"
 dependencies = [
  "bindgen",
  "cmake",
@@ -1237,5 +1237,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]
diff --git a/binaries/summary_store.tar b/binaries/summary_store.tar
index 0e205ffc8f3f5bf69b9e73e1ab63f1c404fe5234..4db9ec82af41f999865752ced069c6fefb446053 100644
GIT binary patch
delta 7085
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
K@v-@a>i+-+vMUn+

delta 7410
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
P)BnZCNTOXVo-_L=9(wX<

diff --git a/checker/src/cargo_mirai.rs b/checker/src/cargo_mirai.rs
index 77a80a1b..190592b5 100644
--- a/checker/src/cargo_mirai.rs
+++ b/checker/src/cargo_mirai.rs
@@ -9,7 +9,7 @@
 // 2) It calls mirai rather than rustc for all the targets of the current package.
 // 3) It runs cargo test --no-run for test targets.
 
-use cargo_metadata::{Package, Target};
+use cargo_metadata::{Package, Target, TargetKind};
 use std::ffi::OsString;
 use std::ops::Index;
 use std::path::Path;
@@ -96,35 +96,38 @@ fn call_cargo_on_each_package_target(package: &Package) {
             .kind
             .first()
             .expect("bad cargo metadata: target::kind");
-        if lib_only && kind != "lib" {
+        if lib_only && !target.is_lib() {
             continue;
         }
         call_cargo_on_target(target, kind);
     }
 }
 
-fn call_cargo_on_target(target: &Target, kind: &str) {
+fn call_cargo_on_target(target: &Target, kind: &TargetKind) {
     // Build a cargo command for target
     let mut cmd =
         Command::new(std::env::var_os("CARGO").unwrap_or_else(|| OsString::from("cargo")));
-    match kind {
-        "bin" => {
+    let kind_str = match kind {
+        TargetKind::Bin => {
             cmd.arg("check");
             cmd.arg("--bin").arg(&target.name);
+            "bin"
         }
-        "lib" => {
+        TargetKind::Lib => {
             cmd.arg("check");
             cmd.arg("--lib");
+            "lib"
         }
-        "test" => {
+        TargetKind::Test => {
             cmd.arg("test");
             cmd.arg("--test").arg(&target.name);
             cmd.arg("--no-run");
+            "test"
         }
         _ => {
             return;
         }
-    }
+    };
 
     let mut args = std::env::args().skip(2);
     // Add cargo args to cmd until first `--`.
@@ -161,7 +164,7 @@ fn call_cargo_on_target(target: &Target, kind: &str) {
 
     // Communicate the target kind of the root crate to the calls to cargo-mirai that are invoked via
     // the RUSTC_WRAPPER setting.
-    cmd.env("MIRAI_KIND", kind);
+    cmd.env("MIRAI_KIND", kind_str);
 
     // Set the tool chain to be compatible with mirai
     if let Some(toolchain) = option_env!("RUSTUP_TOOLCHAIN") {