Merge branch 'main' into stable_codegen_span

CHANGELOG.md

@@ -8,8 +8,19 @@ This file was introduced starting Kani 0.23.0, so it only contains changes from
 
 ### Breaking Changes
 
+* Set minimum python to 3.7 in docker container and release action by @remi-delmas-3000 in https://github.com/model-checking/kani/pull/2879
 * Delete `any_slice` which has been deprecated since Kani 0.38.0. by @zhassan-aws in https://github.com/model-checking/kani/pull/2860
 
+### What's Changed
+
+* Make `cover` const by @jswrenn in https://github.com/model-checking/kani/pull/2867
+* Change `expect()` from taking formatted strings to use `unwrap_or_else()` by @matthiaskrgr in https://github.com/model-checking/kani/pull/2865
+* Fix setup for `aarch64-unknown-linux-gnu` platform by @adpaco-aws in https://github.com/model-checking/kani/pull/2864
+* Do not override `std` library during playback by @celinval in https://github.com/model-checking/kani/pull/2852
+* Rust toolchain upgraded to `nightly-2023-11-11` by @zhassan-aws
+
+**Full Changelog**: https://github.com/model-checking/kani/compare/kani-0.40.0...kani-0.41.0
+
 ## [0.40.0]
 
 ### What's Changed
@@ -65,7 +76,7 @@ https://github.com/model-checking/kani/compare/kani-0.38.0...kani-0.39.0
 * Fix expected value for `pref_align_of` under aarch64/macos by @remi-delmas-3000 in https://github.com/model-checking/kani/pull/2782
 * Bump CBMC version to 5.92.0 by @zhassan-aws in https://github.com/model-checking/kani/pull/2771
 * Upgrade to Kissat 3.1.1 by @zhassan-aws in https://github.com/model-checking/kani/pull/2756
-* Rust toolchain upgraded to `nightly-2023-09-19` by @remi-delmas-3000 @tautschnig 
+* Rust toolchain upgraded to `nightly-2023-09-19` by @remi-delmas-3000 @tautschnig
 
 **Full Changelog**: https://github.com/model-checking/kani/compare/kani-0.36.0...kani-0.37.0
 

Cargo.lock

@@ -119,7 +119,7 @@ dependencies = [
 
 [[package]]
 name = "build-kani"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "anyhow",
  "cargo_metadata",
@@ -255,7 +255,7 @@ dependencies = [
 
 [[package]]
 name = "cprover_bindings"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "lazy_static",
  "linear-map",
@@ -440,14 +440,14 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "kani"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "kani_macros",
 ]
 
 [[package]]
 name = "kani-compiler"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "clap",
  "cprover_bindings",
@@ -468,7 +468,7 @@ dependencies = [
 
 [[package]]
 name = "kani-driver"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "anyhow",
  "cargo_metadata",
@@ -496,7 +496,7 @@ dependencies = [
 
 [[package]]
 name = "kani-verifier"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "anyhow",
  "home",
@@ -505,7 +505,7 @@ dependencies = [
 
 [[package]]
 name = "kani_macros"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
@@ -515,7 +515,7 @@ dependencies = [
 
 [[package]]
 name = "kani_metadata"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "clap",
  "cprover_bindings",
@@ -1050,7 +1050,7 @@ checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "std"
-version = "0.40.0"
+version = "0.41.0"
 dependencies = [
  "kani",
 ]

Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "kani-verifier"
-version = "0.40.0"
+version = "0.41.0"
 edition = "2021"
 description = "A bit-precise model checker for Rust."
 readme = "README.md"

cprover_bindings/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "cprover_bindings"
-version = "0.40.0"
+version = "0.41.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 publish = false

kani-compiler/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "kani-compiler"
-version = "0.40.0"
+version = "0.41.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 publish = false

kani-driver/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "kani-driver"
-version = "0.40.0"
+version = "0.41.0"
 edition = "2021"
 description = "Build a project with Kani and run all proof harnesses"
 license = "MIT OR Apache-2.0"

kani-driver/src/call_cbmc.rs

@@ -327,8 +327,17 @@ impl VerificationResult {
             }
             Err(exit_status) => {
                 let verification_result = console::style("FAILED").red();
+                let explanation = if *exit_status == 137 {
+                    "CBMC appears to have run out of memory. You may want to rerun your proof in \
+                    an environment with additional memory or use stubbing to reduce the size of the \
+                    code the verifier reasons about.\n"
+                } else {
+                    ""
+                };
                 format!(
-                    "\nCBMC failed with status {exit_status}\nVERIFICATION:- {verification_result}\n",
+                    "\nCBMC failed with status {exit_status}\n\
+                    VERIFICATION:- {verification_result}\n\
+                    {explanation}",
                 )
             }
         }

kani_metadata/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "kani_metadata"
-version = "0.40.0"
+version = "0.41.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 publish = false

library/kani/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "kani"
-version = "0.40.0"
+version = "0.41.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 publish = false

library/kani_macros/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "kani_macros"
-version = "0.40.0"
+version = "0.41.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 publish = false

library/std/Cargo.toml

@@ -5,7 +5,7 @@
 # Note: this package is intentionally named std to make sure the names of
 # standard library symbols are preserved
 name = "std"
-version = "0.40.0"
+version = "0.41.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 publish = false

rust-toolchain.toml

@@ -2,5 +2,5 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
 [toolchain]
-channel = "nightly-2023-11-11"
+channel = "nightly-2023-11-12"
 components = ["llvm-tools-preview", "rustc-dev", "rust-src", "rustfmt"]

scripts/setup/ubuntu/install_cbmc.sh

@@ -15,7 +15,7 @@ fi
 UBUNTU_VERSION=$(lsb_release -rs)
 MAJOR=${UBUNTU_VERSION%.*}
 
-if [[ "${MAJOR}" -gt "18" ]]
+if [[ "${MAJOR}" -gt "18" ]] && [[ $(dpkg --print-architecture) = "amd64" ]]
 then
   FILE="ubuntu-${UBUNTU_VERSION}-cbmc-${CBMC_VERSION}-Linux.deb"
   URL="https://github.com/diffblue/cbmc/releases/download/cbmc-${CBMC_VERSION}/$FILE"
@@ -29,7 +29,7 @@ then
   exit 0
 fi
 
-# Binaries are no longer released for 18.04, so build from source
+# There are no binaries for 18.04 or for non-x86_64, so build from source
 
 WORK_DIR=$(mktemp -d)
 git clone \
@@ -44,7 +44,8 @@ git submodule update --init
 
 cmake -S . -Bbuild -DWITH_JBMC=OFF -Dsat_impl="minisat2;cadical"
 make -C build -j$(nproc)
-sudo make -C build install
+cpack -G DEB --config build/CPackConfig.cmake
+sudo dpkg -i ./cbmc-*.deb
 
 popd
 rm -rf "${WORK_DIR}"

tools/build-kani/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "build-kani"
-version = "0.40.0"
+version = "0.41.0"
 edition = "2021"
 description = "Builds Kani, Sysroot and release bundle."
 license = "MIT OR Apache-2.0"