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

Contracts & Harnesses for swap, replace, and drop_in_place #144

Merged
merged 19 commits into from
Nov 20, 2024
Merged
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
63 changes: 62 additions & 1 deletion library/core/src/ptr/non_null.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use crate::ub_checks::assert_unsafe_precondition;
use crate::{fmt, hash, intrinsics, ptr};
use safety::{ensures, requires};


#[cfg(kani)]
use crate::kani;
#[cfg(kani)]
Expand Down Expand Up @@ -1060,6 +1059,8 @@ impl<T: ?Sized> NonNull<T> {
/// [`ptr::drop_in_place`]: crate::ptr::drop_in_place()
#[inline(always)]
#[stable(feature = "non_null_convenience", since = "1.80.0")]
#[requires(ub_checks::can_dereference(self.as_ptr() as *const()))] // Ensure self is aligned, initialized, and valid for read
#[requires(ub_checks::can_write(self.as_ptr() as *mut()))] // Ensure self is valid for write
pub unsafe fn drop_in_place(self) {
// SAFETY: the caller must uphold the safety contract for `drop_in_place`.
unsafe { ptr::drop_in_place(self.as_ptr()) }
Expand Down Expand Up @@ -1151,6 +1152,9 @@ impl<T: ?Sized> NonNull<T> {
/// [`ptr::replace`]: crate::ptr::replace()
#[inline(always)]
#[stable(feature = "non_null_convenience", since = "1.80.0")]
#[cfg_attr(kani, kani::modifies(self.as_ptr()))]
#[requires(ub_checks::can_dereference(self.as_ptr()))] // Ensure self is aligned, initialized, and valid for read
#[requires(ub_checks::can_write(self.as_ptr()))] // Ensure self is valid for write
pub unsafe fn replace(self, src: T) -> T
where
T: Sized,
Expand All @@ -1169,6 +1173,9 @@ impl<T: ?Sized> NonNull<T> {
#[inline(always)]
#[stable(feature = "non_null_convenience", since = "1.80.0")]
#[rustc_const_unstable(feature = "const_swap", issue = "83163")]
#[cfg_attr(kani, kani::modifies(self.as_ptr(), with.as_ptr()))]
#[requires(ub_checks::can_dereference(self.as_ptr()) && ub_checks::can_write(self.as_ptr()))]
#[requires(ub_checks::can_dereference(with.as_ptr()) && ub_checks::can_write(with.as_ptr()))]
pub const unsafe fn swap(self, with: NonNull<T>)
where
T: Sized,
Expand Down Expand Up @@ -2118,4 +2125,58 @@ mod verify {
let _ = ptr.get_unchecked_mut(lower..upper);
}
}

#[kani::proof_for_contract(NonNull::replace)]
pub fn non_null_check_replace() {
let mut x: i32 = kani::any();
let mut y: i32 = kani::any();

let origin_ptr = NonNull::new(&mut x as *mut i32).unwrap();
unsafe {
let captured_original = ptr::read(origin_ptr.as_ptr());
let replaced = origin_ptr.replace(y);
let after_replace = ptr::read(origin_ptr.as_ptr());

assert_eq!(captured_original, replaced);
assert_eq!(after_replace, y)
}
}

#[kani::proof_for_contract(NonNull::drop_in_place)]
pub fn non_null_check_drop_in_place() {
struct Droppable {
value: i32,
}

impl Drop for Droppable {
fn drop(&mut self) {
}
}

let mut droppable = Droppable { value: kani::any() };
let ptr = NonNull::new(&mut droppable as *mut Droppable).unwrap();
unsafe {
ptr.drop_in_place();
}
}

#[kani::proof_for_contract(NonNull::swap)]
pub fn non_null_check_swap() {
let mut a: i32 = kani::any();
let mut b: i32 = kani::any();

let ptr_a = NonNull::new(&mut a as *mut i32).unwrap();
let ptr_b = NonNull::new(&mut b as *mut i32).unwrap();

unsafe {
let old_a = ptr::read(ptr_a.as_ptr());
let old_b = ptr::read(ptr_b.as_ptr());
ptr_a.swap(ptr_b);
// Verify that the values have been swapped.
let new_a = ptr::read(ptr_a.as_ptr());
let new_b = ptr::read(ptr_b.as_ptr());
assert_eq!(old_a, new_b);
assert_eq!(old_b, new_a);
}
}
}
Loading