From 9d5c961fa40cde6a9b70dfde3c1fe59de848d723 Mon Sep 17 00:00:00 2001
From: Ben Kimock <kimockb@gmail.com>
Date: Sun, 6 Oct 2024 23:36:22 -0400
Subject: [PATCH] cfg out checks in add and sub but not offset

...because the checks in offset found bugs in a crater run.
---
 library/core/src/ptr/const_ptr.rs | 4 ++++
 library/core/src/ptr/mut_ptr.rs   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/library/core/src/ptr/const_ptr.rs b/library/core/src/ptr/const_ptr.rs
index 4727dc77d18..c9af7f13e46 100644
--- a/library/core/src/ptr/const_ptr.rs
+++ b/library/core/src/ptr/const_ptr.rs
@@ -887,6 +887,7 @@ pub const fn guaranteed_ne(self, other: *const T) -> Option<bool>
     where
         T: Sized,
     {
+        #[cfg(debug_assertions)]
         #[inline]
         const fn runtime_add_nowrap(this: *const (), count: usize, size: usize) -> bool {
             #[inline]
@@ -905,6 +906,7 @@ const fn comptime(_: *const (), _: usize, _: usize) -> bool {
             intrinsics::const_eval_select((this, count, size), comptime, runtime)
         }
 
+        #[cfg(debug_assertions)] // Expensive, and doesn't catch much in the wild.
         ub_checks::assert_unsafe_precondition!(
             check_language_ub,
             "ptr::add requires that the address calculation does not overflow",
@@ -993,6 +995,7 @@ const fn comptime(_: *const (), _: usize, _: usize) -> bool {
     where
         T: Sized,
     {
+        #[cfg(debug_assertions)]
         #[inline]
         const fn runtime_sub_nowrap(this: *const (), count: usize, size: usize) -> bool {
             #[inline]
@@ -1010,6 +1013,7 @@ const fn comptime(_: *const (), _: usize, _: usize) -> bool {
             intrinsics::const_eval_select((this, count, size), comptime, runtime)
         }
 
+        #[cfg(debug_assertions)] // Expensive, and doesn't catch much in the wild.
         ub_checks::assert_unsafe_precondition!(
             check_language_ub,
             "ptr::sub requires that the address calculation does not overflow",
diff --git a/library/core/src/ptr/mut_ptr.rs b/library/core/src/ptr/mut_ptr.rs
index 8dbce1fdb98..e458bb4642f 100644
--- a/library/core/src/ptr/mut_ptr.rs
+++ b/library/core/src/ptr/mut_ptr.rs
@@ -971,6 +971,7 @@ pub const fn guaranteed_ne(self, other: *mut T) -> Option<bool>
     where
         T: Sized,
     {
+        #[cfg(debug_assertions)]
         #[inline]
         const fn runtime_add_nowrap(this: *const (), count: usize, size: usize) -> bool {
             #[inline]
@@ -989,6 +990,7 @@ const fn comptime(_: *const (), _: usize, _: usize) -> bool {
             intrinsics::const_eval_select((this, count, size), comptime, runtime)
         }
 
+        #[cfg(debug_assertions)] // Expensive, and doesn't catch much in the wild.
         ub_checks::assert_unsafe_precondition!(
             check_language_ub,
             "ptr::add requires that the address calculation does not overflow",
@@ -1077,6 +1079,7 @@ const fn comptime(_: *const (), _: usize, _: usize) -> bool {
     where
         T: Sized,
     {
+        #[cfg(debug_assertions)]
         #[inline]
         const fn runtime_sub_nowrap(this: *const (), count: usize, size: usize) -> bool {
             #[inline]
@@ -1094,6 +1097,7 @@ const fn comptime(_: *const (), _: usize, _: usize) -> bool {
             intrinsics::const_eval_select((this, count, size), comptime, runtime)
         }
 
+        #[cfg(debug_assertions)] // Expensive, and doesn't catch much in the wild.
         ub_checks::assert_unsafe_precondition!(
             check_language_ub,
             "ptr::sub requires that the address calculation does not overflow",