Merge branch 'main' into Update-toolchain-10-25

.github/workflows/kani-m1.yml

@@ -0,0 +1,30 @@
+# Copyright Kani Contributors
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+
+# Run the regression job on Apple M1 only on commits to `main`
+name: Kani CI M1
+on:
+ push:
+ branches:
+ - 'main'
+
+env:
+ RUST_BACKTRACE: 1
+
+jobs:
+ regression:
+ runs-on: macos-13-xlarge
+ steps:
+ - name: Checkout Kani
+ uses: actions/checkout@v3
+
+ - name: Setup Kani Dependencies
+ uses: ./.github/actions/setup
+ with:
+ os: macos-13-xlarge
+
+ - name: Build Kani
+ run: cargo build-dev
+
+ - name: Execute Kani regression
+ run: ./scripts/kani-regression.sh

kani-dependencies

@@ -1,6 +1,6 @@
 CBMC_MAJOR="5"
-CBMC_MINOR="94"
-CBMC_VERSION="5.94.0"
+CBMC_MINOR="95"
+CBMC_VERSION="5.95.1"
 
 # If you update this version number, remember to bump it in `src/setup.rs` too
 CBMC_VIEWER_MAJOR="3"

kani-driver/src/call_goto_synthesizer.rs

@@ -35,7 +35,18 @@ impl KaniSession {
  output.to_owned().into_os_string(), // output
  ];
 
+ // goto-synthesizer should take the same backend options as cbmc.
+ // Backend options include
+ // 1. solver options
  self.handle_solver_args(&harness_metadata.attributes.solver, &mut args)?;
+ // 2. object-bits option
+ if let Some(object_bits) = self.args.cbmc_object_bits() {
+ args.push("--object-bits".into());
+ args.push(object_bits.to_string().into());
+ }
+ // 3. and array-as-uninterpreted-functions options, which should be included
+ // in the cbmc_args.
+ args.extend(self.args.cbmc_args.iter().cloned());
 
  let mut cmd = Command::new("goto-synthesizer");
  cmd.args(args);

scripts/setup/macos-13-xlarge

@@ -0,0 +1 @@
+macos

tests/ui/loop-contracts-synthesis/main_unsigned/main_unsigned.rs

@@ -1,7 +1,7 @@
 // Copyright Kani Contributors
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-// kani-flags: --enable-unstable --synthesize-loop-contracts
+// kani-flags: --enable-unstable --synthesize-loop-contracts --cbmc-args --object-bits 4
 
 // Check if goto-synthesizer is correctly called, and synthesizes the required
 // loop invariants.