diff --git a/library/kani_macros/src/sysroot/loop_contracts/mod.rs b/library/kani_macros/src/sysroot/loop_contracts/mod.rs index 52428e3aa0a..4744cdf46f4 100644 --- a/library/kani_macros/src/sysroot/loop_contracts/mod.rs +++ b/library/kani_macros/src/sysroot/loop_contracts/mod.rs @@ -914,10 +914,21 @@ pub fn loop_modifies(attr: TokenStream, item: TokenStream) -> TokenStream { let loop_assign_stmt: Stmt = parse_quote! { let #loop_assign_ident = (#(#assigns),*); }; + // Pass a reference to the binding to a function so rustc's MIR optimizations keep its + // assignment, which codegen reads for the assignable targets. Without a reader it is removed + // at `-Zmir-opt-level=2`+ and the modifies clause goes unenforced. + // The marker excludes this function from autoharness. + let loop_assign_keep_stmts: Vec = parse_quote! { + #[inline(never)] + #[kanitool::fn_marker = "kani_keep_loop_modifies_binding"] + const fn kani_keep_loop_modifies_binding(_binding: &T) {} + kani_keep_loop_modifies_binding(&#loop_assign_ident); + }; let loop_stmt: Stmt = syn::parse(item.clone()).unwrap(); let ret: TokenStream = quote!( { #loop_assign_stmt + #(#loop_assign_keep_stmts)* #loop_stmt }) .into(); diff --git a/tests/expected/loop-contract/loop_assigns_for_empty_slice_fail.expected b/tests/expected/loop-contract/loop_assigns_for_empty_slice_fail.expected index 09d9264060e..4c99d1f7f20 100644 --- a/tests/expected/loop-contract/loop_assigns_for_empty_slice_fail.expected +++ b/tests/expected/loop-contract/loop_assigns_for_empty_slice_fail.expected @@ -1,7 +1,7 @@ main.assigns.1\ - Status: FAILURE\ - - Description: "Check that a[var_14] is assignable" + - Description: "Check that a[var_16] is assignable" -Failed Checks: Check that a[var_14] is assignable +Failed Checks: Check that a[var_16] is assignable VERIFICATION:- FAILED diff --git a/tests/expected/loop-contract/loop_assigns_for_fat_ptr.expected b/tests/expected/loop-contract/loop_assigns_for_fat_ptr.expected index 62271ee7a2a..3b1aeeaf20a 100644 --- a/tests/expected/loop-contract/loop_assigns_for_fat_ptr.expected +++ b/tests/expected/loop-contract/loop_assigns_for_fat_ptr.expected @@ -1,6 +1,6 @@ main.assigns.1\ - Status: SUCCESS\ - - Description: "Check that a[var_15] is assignable" + - Description: "Check that a[var_17] is assignable" main.assigns.2\ - Status: SUCCESS\ diff --git a/tests/expected/loop-contract/loop_assigns_for_fat_ptr_fail.expected b/tests/expected/loop-contract/loop_assigns_for_fat_ptr_fail.expected index ba092653939..1d19397eba2 100644 --- a/tests/expected/loop-contract/loop_assigns_for_fat_ptr_fail.expected +++ b/tests/expected/loop-contract/loop_assigns_for_fat_ptr_fail.expected @@ -1,7 +1,7 @@ main.assigns.1\ - Status: FAILURE\ - - Description: "Check that a[var_15] is assignable" + - Description: "Check that a[var_17] is assignable" -Failed Checks: Check that a[var_15] is assignable +Failed Checks: Check that a[var_17] is assignable VERIFICATION:- FAILED diff --git a/tests/expected/loop-contract/loop_assigns_for_ptr.expected b/tests/expected/loop-contract/loop_assigns_for_ptr.expected index c8d51a4544c..2a1dedd9cef 100644 --- a/tests/expected/loop-contract/loop_assigns_for_ptr.expected +++ b/tests/expected/loop-contract/loop_assigns_for_ptr.expected @@ -1,6 +1,6 @@ main.assigns.1\ - Status: SUCCESS\ - - Description: "Check that a[var_14] is assignable" + - Description: "Check that a[var_16] is assignable" main.assigns.2\ - Status: SUCCESS\ diff --git a/tests/expected/loop-contract/loop_assigns_for_ptr_fail.expected b/tests/expected/loop-contract/loop_assigns_for_ptr_fail.expected index 882d7607e99..253028b2a90 100644 --- a/tests/expected/loop-contract/loop_assigns_for_ptr_fail.expected +++ b/tests/expected/loop-contract/loop_assigns_for_ptr_fail.expected @@ -1,11 +1,11 @@ main.assigns.1\ - Status: FAILURE\ - - Description: "Check that a[var_15] is assignable" + - Description: "Check that a[var_17] is assignable" main.loop_invariant_base.1\ - Status: SUCCESS\ - Description: "Check invariant before entry for loop main.0" -Failed Checks: Check that a[var_15] is assignable +Failed Checks: Check that a[var_17] is assignable VERIFICATION:- FAILED diff --git a/tests/expected/loop-contract/loop_assigns_for_ref.expected b/tests/expected/loop-contract/loop_assigns_for_ref.expected index 59db3e04b3d..512f77961e7 100644 --- a/tests/expected/loop-contract/loop_assigns_for_ref.expected +++ b/tests/expected/loop-contract/loop_assigns_for_ref.expected @@ -1,6 +1,6 @@ main.assigns.1\ - Status: SUCCESS\ - - Description: "Check that a[var_12] is assignable" + - Description: "Check that a[var_14] is assignable" main.loop_invariant_step.1\ - Status: SUCCESS\ diff --git a/tests/expected/loop-contract/modifies_mir_opt_level.expected b/tests/expected/loop-contract/modifies_mir_opt_level.expected new file mode 100644 index 00000000000..7929507c638 --- /dev/null +++ b/tests/expected/loop-contract/modifies_mir_opt_level.expected @@ -0,0 +1,6 @@ +- Status: SUCCESS\ +- Description: "Check that tracked is assignable" + +Failed Checks: Check that hidden is assignable + +VERIFICATION:- FAILED diff --git a/tests/expected/loop-contract/modifies_mir_opt_level.rs b/tests/expected/loop-contract/modifies_mir_opt_level.rs new file mode 100644 index 00000000000..c323f923041 --- /dev/null +++ b/tests/expected/loop-contract/modifies_mir_opt_level.rs @@ -0,0 +1,40 @@ +// Copyright Kani Contributors +// SPDX-License-Identifier: Apache-2.0 OR MIT +// compile-flags: -Zmir-opt-level=2 + +// kani-flags: -Z loop-contracts + +//! `#[kani::loop_modifies]` must stay enforced under MIR optimization: a write outside the +//! declared set is rejected, and a complete set still verifies. +//! Regression test for https://github.com/model-checking/kani/issues/5053. + +#![feature(proc_macro_hygiene)] +#![feature(stmt_expr_attributes)] + +#[kani::proof] +fn incomplete_modifies_fails() { + let mut i: u32 = 0; + let mut hidden: u32 = 0; + #[kani::loop_invariant(i <= 5)] + #[kani::loop_modifies(&i)] + while i < 5 { + hidden = i; // not in the modifies set + i = i + 1; + } + assert!(i == 5); + std::hint::black_box(hidden); +} + +#[kani::proof] +fn complete_modifies_passes() { + let mut i: u32 = 0; + let mut tracked: u32 = 0; + #[kani::loop_invariant(i <= 5)] + #[kani::loop_modifies(&i, &tracked)] + while i < 5 { + tracked = i; // in the modifies set + i = i + 1; + } + assert!(i == 5); + std::hint::black_box(tracked); +}