improve comment wording
diff --git a/compiler/rustc_const_eval/src/interpret/validity.rs b/compiler/rustc_const_eval/src/interpret/validity.rs
index a47828b..e36d301 100644
--- a/compiler/rustc_const_eval/src/interpret/validity.rs
+++ b/compiler/rustc_const_eval/src/interpret/validity.rs
@@ -434,7 +434,8 @@
found_bytes: has.bytes()
},
);
- // Make sure this is non-null. (ZST references can be dereferenceable and null.)
+ // Make sure this is non-null. We checked dereferenceability above, but if `size` is zero
+ // that does not imply non-null.
if self.ecx.scalar_may_be_null(Scalar::from_maybe_pointer(place.ptr(), self.ecx))? {
throw_validation_failure!(self.path, NullPtr { ptr_kind })
}
diff --git a/library/core/src/intrinsics.rs b/library/core/src/intrinsics.rs
index 90a7e2b..33ecaae 100644
--- a/library/core/src/intrinsics.rs
+++ b/library/core/src/intrinsics.rs
@@ -1484,7 +1484,7 @@
/// # Safety
///
/// If the computed offset is non-zero, then both the starting and resulting pointer must be
- /// either in bounds or one byte past the end of an allocated object. If either pointer is out
+ /// either in bounds or at the end of an allocated object. If either pointer is out
/// of bounds or arithmetic overflow occurs then any further use of the returned value will
/// result in undefined behavior.
///
@@ -1502,7 +1502,7 @@
/// # Safety
///
/// Unlike the `offset` intrinsic, this intrinsic does not restrict the
- /// resulting pointer to point into or one byte past the end of an allocated
+ /// resulting pointer to point into or at the end of an allocated
/// object, and it wraps with two's complement arithmetic. The resulting
/// value is not necessarily valid to be used to actually access memory.
///
diff --git a/library/core/src/ptr/const_ptr.rs b/library/core/src/ptr/const_ptr.rs
index 27b0c69..c8065b2 100644
--- a/library/core/src/ptr/const_ptr.rs
+++ b/library/core/src/ptr/const_ptr.rs
@@ -465,8 +465,8 @@
/// If any of the following conditions are violated, the result is Undefined
/// Behavior:
///
- /// * If the computed offset is non-zero, then both the starting and resulting pointer must be
- /// either in bounds or one byte past the end of the same [allocated object].
+ /// * If the computed offset, **in bytes**, is non-zero, then both the starting and resulting
+ /// pointer must be either in bounds or at the end of the same [allocated object].
/// (If it is zero, then the function is always well-defined.)
///
/// * The computed offset, **in bytes**, cannot overflow an `isize`.
@@ -952,8 +952,8 @@
/// If any of the following conditions are violated, the result is Undefined
/// Behavior:
///
- /// * If the computed offset is non-zero, then both the starting and resulting pointer must be
- /// either in bounds or one byte past the end of the same [allocated object].
+ /// * If the computed offset, **in bytes**, is non-zero, then both the starting and resulting
+ /// pointer must be either in bounds or at the end of the same [allocated object].
/// (If it is zero, then the function is always well-defined.)
///
/// * The computed offset, **in bytes**, cannot overflow an `isize`.
@@ -1037,8 +1037,8 @@
/// If any of the following conditions are violated, the result is Undefined
/// Behavior:
///
- /// * If the computed offset is non-zero, then both the starting and resulting pointer must be
- /// either in bounds or one byte past the end of the same [allocated object].
+ /// * If the computed offset, **in bytes**, is non-zero, then both the starting and resulting
+ /// pointer must be either in bounds or at the end of the same [allocated object].
/// (If it is zero, then the function is always well-defined.)
///
/// * The computed offset cannot exceed `isize::MAX` **bytes**.
diff --git a/library/core/src/ptr/mut_ptr.rs b/library/core/src/ptr/mut_ptr.rs
index 3d05715..f87496b 100644
--- a/library/core/src/ptr/mut_ptr.rs
+++ b/library/core/src/ptr/mut_ptr.rs
@@ -480,8 +480,8 @@
/// If any of the following conditions are violated, the result is Undefined
/// Behavior:
///
- /// * If the computed offset is non-zero, then both the starting and resulting pointer must be
- /// either in bounds or one byte past the end of the same [allocated object].
+ /// * If the computed offset, **in bytes**, is non-zero, then both the starting and resulting
+ /// pointer must be either in bounds or at the end of the same [allocated object].
/// (If it is zero, then the function is always well-defined.)
///
/// * The computed offset, **in bytes**, cannot overflow an `isize`.
@@ -1096,8 +1096,8 @@
/// If any of the following conditions are violated, the result is Undefined
/// Behavior:
///
- /// * If the computed offset is non-zero, then both the starting and resulting pointer must be
- /// either in bounds or one byte past the end of the same [allocated object].
+ /// * If the computed offset, **in bytes**, is non-zero, then both the starting and resulting
+ /// pointer must be either in bounds or at the end of the same [allocated object].
/// (If it is zero, then the function is always well-defined.)
///
/// * The computed offset, **in bytes**, cannot overflow an `isize`.
@@ -1181,8 +1181,8 @@
/// If any of the following conditions are violated, the result is Undefined
/// Behavior:
///
- /// * If the computed offset is non-zero, then both the starting and resulting pointer must be
- /// either in bounds or one byte past the end of the same [allocated object].
+ /// * If the computed offset, **in bytes**, is non-zero, then both the starting and resulting
+ /// pointer must be either in bounds or at the end of the same [allocated object].
/// (If it is zero, then the function is always well-defined.)
///
/// * The computed offset cannot exceed `isize::MAX` **bytes**.
