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.

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

Fix codegen of constant byte slices #2663

Merged
merged 1 commit into from
Aug 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 3 additions & 9 deletions kani-compiler/src/codegen_cprover_gotoc/codegen/operand.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,17 +196,11 @@ impl<'tcx> GotocCtx<'tcx> {
}
ty::Slice(slice_ty) => {
if let Uint(UintTy::U8) = slice_ty.kind() {
// The case where we have a slice of u8 is easy enough: make an array of u8
let mem_var = self.codegen_const_allocation(data, None);
let slice =
data.inspect_with_uninit_and_ptr_outside_interpreter(start..end);
let vec_of_bytes: Vec<Expr> = slice
.iter()
.map(|b| Expr::int_constant(*b, Type::unsigned_int(8)))
.collect();
let len = vec_of_bytes.len();
let array_expr =
Expr::array_expr(Type::unsigned_int(8).array_of(len), vec_of_bytes);
let data_expr = array_expr.array_to_ptr();
let len = slice.len();
let data_expr = mem_var.cast_to(Type::unsigned_int(8).to_pointer());
let len_expr = Expr::int_constant(len, Type::size_t());
return slice_fat_ptr(
self.codegen_ty(lit_ty),
Expand Down
5 changes: 1 addition & 4 deletions tests/cargo-kani/itoa_dep/check_unsigned.expected
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
Status: SUCCESS\
Description: "assertion failed: result == &output"

Status: FAILURE\
Description: "memcpy source region readable"

VERIFICATION:- FAILED
VERIFICATION:- SUCCESSFUL
2 changes: 0 additions & 2 deletions tests/cargo-kani/itoa_dep/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// SPDX-License-Identifier: Apache-2.0 OR MIT

//! This test checks Kani's support for the `itoa` crate
//! Currently fails with a spurious failure:
//! https://github.com/model-checking/kani/issues/2066

use itoa::{Buffer, Integer};
use std::fmt::Write;
Expand Down
14 changes: 14 additions & 0 deletions tests/kani/Slice/const_bytes.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright Kani Contributors
// SPDX-License-Identifier: Apache-2.0 OR MIT

//! This test checks that byte slices are codegen correctly. This used to fail
//! in the past (see https://github.com/model-checking/kani/issues/2656).

#[kani::proof]
fn main() {
const MY_CONSTANT: &[u8] = &[147, 211];
let x: u8 = MY_CONSTANT[0];
let y: u8 = MY_CONSTANT[1];
assert_eq!(x, 147);
assert_eq!(y, 211);
}
15 changes: 15 additions & 0 deletions tests/kani/Vectors/vector_extend_bytes.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Copyright Kani Contributors
// SPDX-License-Identifier: Apache-2.0 OR MIT

//! Check that we propertly handle `Vec::extend` with a constant byte slice.
//! This used to fail previously (see
//! https://github.com/model-checking/kani/issues/2656).

#[kani::proof]
fn check_extend_const_byte_slice() {
const MY_CONSTANT: &[u8] = b"Hi";

let mut my_vec: Vec<u8> = Vec::new();
my_vec.extend(MY_CONSTANT);
assert_eq!(my_vec, [72, 105]);
}