NonZero (unchecked_mul & unchecked_add) Proof for Contracts (#338)

tautschnig · aa-luna · SahithiMV · web-flow · commit 79498aa514e7 · 2025-06-14T11:45:18.000Z
Towards #71 These are the changes contributed by [SahithiMV](https://github.com/SahithiMV) in #184 plus the proposed changes in that PR. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses. --------- Co-authored-by: aaluna <aaluna@andrew.cmu.edu> Co-authored-by: SahithiMV <sahithi99mv@gmail.com> Co-authored-by: aaluna <166172412+MooniniteErr@users.noreply.github.com> Co-authored-by: Carolyn Zech <cmzech@amazon.com> Co-authored-by: Zyad Hassan <88045115+zhassan-aws@users.noreply.github.com> Co-authored-by: Carolyn Zech <carolynzech@gmail.com>
diff --git a/library/core/src/num/nonzero.rs b/library/core/src/num/nonzero.rs
@@ -1112,6 +1112,12 @@ macro_rules! nonzero_integer {
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
+            #[requires({
+                self.get().checked_mul(other.get()).is_some()
+            })]
+            #[ensures(|result: &Self| {
+                self.get().checked_mul(other.get()).is_some_and(|product| product == result.get())
+            })]
             pub const unsafe fn unchecked_mul(self, other: Self) -> Self {
                 // SAFETY: The caller ensures there is no overflow.
                 unsafe { Self::new_unchecked(self.get().unchecked_mul(other.get())) }
@@ -1514,6 +1520,13 @@ macro_rules! nonzero_integer_signedness_dependent_methods {
         #[must_use = "this returns the result of the operation, \
                       without modifying the original"]
         #[inline]
+        #[requires({
+            self.get().checked_add(other).is_some()
+        })]
+        #[ensures(|result: &Self| {
+            // Postcondition: the result matches the expected addition
+            self.get().checked_add(other).is_some_and(|sum| sum == result.get())
+        })]
         pub const unsafe fn unchecked_add(self, other: $Int) -> Self {
             // SAFETY: The caller ensures there is no overflow.
             unsafe { Self::new_unchecked(self.get().unchecked_add(other)) }
@@ -2575,4 +2588,306 @@ mod verify {
     nonzero_check_clamp_panic!(core::num::NonZeroU64, nonzero_check_clamp_panic_for_u64);
     nonzero_check_clamp_panic!(core::num::NonZeroU128, nonzero_check_clamp_panic_for_u128);
     nonzero_check_clamp_panic!(core::num::NonZeroUsize, nonzero_check_clamp_panic_for_usize);
+
+    macro_rules! check_mul_unchecked_small {
+        ($t:ty, $nonzero_type:ty, $nonzero_check_unchecked_mul_for:ident) => {
+            #[kani::proof_for_contract(NonZero::<$t>::unchecked_mul)]
+            pub fn $nonzero_check_unchecked_mul_for() {
+                let x: $nonzero_type = kani::any();
+                let y: $nonzero_type = kani::any();
+
+                unsafe {
+                    x.unchecked_mul(y);
+                }
+            }
+        };
+    }
+
+    // Use for NonZero what already worked well for general numeric types (see num/mod.rs)
+    macro_rules! check_mul_unchecked_intervals {
+        ($t:ty, $nonzero_type:ty, $nonzero_check_mul_for:ident, $min:expr, $max:expr) => {
+            #[kani::proof_for_contract(NonZero::<$t>::unchecked_mul)]
+            pub fn $nonzero_check_mul_for() {
+                let x = kani::any::<$t>();
+                let y = kani::any::<$t>();
+
+                kani::assume(x != 0 && x >= $min && x <= $max);
+                kani::assume(y != 0 && y >= $min && y <= $max);
+
+                let x = <$nonzero_type>::new(x).unwrap();
+                let y = <$nonzero_type>::new(y).unwrap();
+
+                unsafe {
+                    x.unchecked_mul(y);
+                }
+            }
+        };
+    }
+
+    //Calls for i32
+    check_mul_unchecked_intervals!(
+        i32,
+        NonZeroI32,
+        check_mul_i32_small,
+        NonZeroI32::new(-10i32).unwrap().into(),
+        NonZeroI32::new(10i32).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        i32,
+        NonZeroI32,
+        check_mul_i32_large_pos,
+        NonZeroI32::new(i32::MAX - 1000i32).unwrap().into(),
+        NonZeroI32::new(i32::MAX).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        i32,
+        NonZeroI32,
+        check_mul_i32_large_neg,
+        NonZeroI32::new(i32::MIN + 1000i32).unwrap().into(),
+        NonZeroI32::new(i32::MIN + 1).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        i32,
+        NonZeroI32,
+        check_mul_i32_edge_pos,
+        NonZeroI32::new(i32::MAX / 2).unwrap().into(),
+        NonZeroI32::new(i32::MAX).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        i32,
+        NonZeroI32,
+        check_mul_i32_edge_neg,
+        NonZeroI32::new(i32::MIN / 2).unwrap().into(),
+        NonZeroI32::new(i32::MIN + 1).unwrap().into()
+    );
+
+    //Calls for i64
+    check_mul_unchecked_intervals!(
+        i64,
+        NonZeroI64,
+        check_mul_i64_small,
+        NonZeroI64::new(-10i64).unwrap().into(),
+        NonZeroI64::new(10i64).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        i64,
+        NonZeroI64,
+        check_mul_i64_large_pos,
+        NonZeroI64::new(i64::MAX - 1000i64).unwrap().into(),
+        NonZeroI64::new(i64::MAX).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        i64,
+        NonZeroI64,
+        check_mul_i64_large_neg,
+        NonZeroI64::new(i64::MIN + 1000i64).unwrap().into(),
+        NonZeroI64::new(i64::MIN + 1).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        i64,
+        NonZeroI64,
+        check_mul_i64_edge_pos,
+        NonZeroI64::new(i64::MAX / 2).unwrap().into(),
+        NonZeroI64::new(i64::MAX).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        i64,
+        NonZeroI64,
+        check_mul_i64_edge_neg,
+        NonZeroI64::new(i64::MIN / 2).unwrap().into(),
+        NonZeroI64::new(i64::MIN + 1).unwrap().into()
+    );
+
+    //calls for i128
+    check_mul_unchecked_intervals!(
+        i128,
+        NonZeroI128,
+        check_mul_i128_small,
+        NonZeroI128::new(-10i128).unwrap().into(),
+        NonZeroI128::new(10i128).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        i128,
+        NonZeroI128,
+        check_mul_i128_large_pos,
+        NonZeroI128::new(i128::MAX - 1000i128).unwrap().into(),
+        NonZeroI128::new(i128::MAX).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        i128,
+        NonZeroI128,
+        check_mul_i128_large_neg,
+        NonZeroI128::new(i128::MIN + 1000i128).unwrap().into(),
+        NonZeroI128::new(i128::MIN + 1).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        i128,
+        NonZeroI128,
+        check_mul_i128_edge_pos,
+        NonZeroI128::new(i128::MAX / 2).unwrap().into(),
+        NonZeroI128::new(i128::MAX).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        i128,
+        NonZeroI128,
+        check_mul_i128_edge_neg,
+        NonZeroI128::new(i128::MIN / 2).unwrap().into(),
+        NonZeroI128::new(i128::MIN + 1).unwrap().into()
+    );
+
+    //calls for isize
+    check_mul_unchecked_intervals!(
+        isize,
+        NonZeroIsize,
+        check_mul_isize_small,
+        NonZeroIsize::new(-10isize).unwrap().into(),
+        NonZeroIsize::new(10isize).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        isize,
+        NonZeroIsize,
+        check_mul_isize_large_pos,
+        NonZeroIsize::new(isize::MAX - 1000isize).unwrap().into(),
+        NonZeroIsize::new(isize::MAX).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        isize,
+        NonZeroIsize,
+        check_mul_isize_large_neg,
+        NonZeroIsize::new(isize::MIN + 1000isize).unwrap().into(),
+        NonZeroIsize::new(isize::MIN + 1).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        isize,
+        NonZeroIsize,
+        check_mul_isize_edge_pos,
+        NonZeroIsize::new(isize::MAX / 2).unwrap().into(),
+        NonZeroIsize::new(isize::MAX).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        isize,
+        NonZeroIsize,
+        check_mul_isize_edge_neg,
+        NonZeroIsize::new(isize::MIN / 2).unwrap().into(),
+        NonZeroIsize::new(isize::MIN + 1).unwrap().into()
+    );
+
+    //calls for u32
+    check_mul_unchecked_intervals!(
+        u32,
+        NonZeroU32,
+        check_mul_u32_small,
+        NonZeroU32::new(1u32).unwrap().into(),
+        NonZeroU32::new(10u32).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        u32,
+        NonZeroU32,
+        check_mul_u32_large,
+        NonZeroU32::new(u32::MAX - 1000u32).unwrap().into(),
+        NonZeroU32::new(u32::MAX).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        u32,
+        NonZeroU32,
+        check_mul_u32_edge,
+        NonZeroU32::new(u32::MAX / 2).unwrap().into(),
+        NonZeroU32::new(u32::MAX).unwrap().into()
+    );
+
+    //calls for u64
+    check_mul_unchecked_intervals!(
+        u64,
+        NonZeroU64,
+        check_mul_u64_small,
+        NonZeroU64::new(1u64).unwrap().into(),
+        NonZeroU64::new(10u64).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        u64,
+        NonZeroU64,
+        check_mul_u64_large,
+        NonZeroU64::new(u64::MAX - 1000u64).unwrap().into(),
+        NonZeroU64::new(u64::MAX).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        u64,
+        NonZeroU64,
+        check_mul_u64_edge,
+        NonZeroU64::new(u64::MAX / 2).unwrap().into(),
+        NonZeroU64::new(u64::MAX).unwrap().into()
+    );
+
+    //calls for u128
+    check_mul_unchecked_intervals!(
+        u128,
+        NonZeroU128,
+        check_mul_u128_small,
+        NonZeroU128::new(1u128).unwrap().into(),
+        NonZeroU128::new(10u128).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        u128,
+        NonZeroU128,
+        check_mul_u128_large,
+        NonZeroU128::new(u128::MAX - 1000u128).unwrap().into(),
+        NonZeroU128::new(u128::MAX).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        u128,
+        NonZeroU128,
+        check_mul_u128_edge,
+        NonZeroU128::new(u128::MAX / 2).unwrap().into(),
+        NonZeroU128::new(u128::MAX).unwrap().into()
+    );
+
+    //calls for usize
+    check_mul_unchecked_intervals!(
+        usize,
+        NonZeroUsize,
+        check_mul_usize_small,
+        NonZeroUsize::new(1usize).unwrap().into(),
+        NonZeroUsize::new(10usize).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        usize,
+        NonZeroUsize,
+        check_mul_usize_large,
+        NonZeroUsize::new(usize::MAX - 1000usize).unwrap().into(),
+        NonZeroUsize::new(usize::MAX).unwrap().into()
+    );
+    check_mul_unchecked_intervals!(
+        usize,
+        NonZeroUsize,
+        check_mul_usize_edge,
+        NonZeroUsize::new(usize::MAX / 2).unwrap().into(),
+        NonZeroUsize::new(usize::MAX).unwrap().into()
+    );
+
+    //calls for i8, i16, u8, u16
+    check_mul_unchecked_small!(i8, NonZeroI8, nonzero_check_mul_for_i8);
+    check_mul_unchecked_small!(i16, NonZeroI16, nonzero_check_mul_for_i16);
+    check_mul_unchecked_small!(u8, NonZeroU8, nonzero_check_mul_for_u8);
+    check_mul_unchecked_small!(u16, NonZeroU16, nonzero_check_mul_for_u16);
+
+    macro_rules! nonzero_check_add {
+        ($t:ty, $nonzero_type:ty, $nonzero_check_unchecked_add_for:ident) => {
+            #[kani::proof_for_contract(NonZero::<$t>::unchecked_add)]
+            pub fn $nonzero_check_unchecked_add_for() {
+                let x: $nonzero_type = kani::any();
+                let y: $t = kani::any();
+
+                unsafe {
+                    x.unchecked_add(y);
+                }
+            }
+        };
+    }
+
+    nonzero_check_add!(u8, core::num::NonZeroU8, nonzero_check_unchecked_add_for_u8);
+    nonzero_check_add!(u16, core::num::NonZeroU16, nonzero_check_unchecked_add_for_u16);
+    nonzero_check_add!(u32, core::num::NonZeroU32, nonzero_check_unchecked_add_for_u32);
+    nonzero_check_add!(u64, core::num::NonZeroU64, nonzero_check_unchecked_add_for_u64);
+    nonzero_check_add!(u128, core::num::NonZeroU128, nonzero_check_unchecked_add_for_u128);
+    nonzero_check_add!(usize, core::num::NonZeroUsize, nonzero_check_unchecked_add_for_usize);
 }
