bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Snap cfgs

Browse source
This commit is contained in:
Mark Rousskov 2019-11-06 08:09:55 -05:00
parent f4edc81ac4
commit 997feacddd
17 changed files with 34 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libcore/ptr/mod.rs
View file

@ -1301,7 +1301,6 @@ impl<T: ?Sized> *const T {
/// }
/// ```
#[unstable(feature = "ptr_offset_from", issue = "41079")]
#[cfg(not(bootstrap))]
#[rustc_const_unstable(feature = "const_ptr_offset_from")]
#[inline]
pub const unsafe fn offset_from(self, origin: *const T) -> isize where T: Sized {
@ -1313,21 +1312,6 @@ impl<T: ?Sized> *const T {
intrinsics::ptr_offset_from(self, origin)
}
#[unstable(feature = "ptr_offset_from", issue = "41079")]
#[inline]
#[cfg(bootstrap)]
/// bootstrap
pub unsafe fn offset_from(self, origin: *const T) -> isize where T: Sized {
let pointee_size = mem::size_of::<T>();
assert!(0 < pointee_size && pointee_size <= isize::max_value() as usize);
// This is the same sequence that Clang emits for pointer subtraction.
// It can be neither `nsw` nor `nuw` because the input is treated as
// unsigned but then the output is treated as signed, so neither works.
let d = isize::wrapping_sub(self as _, origin as _);
intrinsics::exact_div(d, pointee_size as _)
}
/// Calculates the distance between two pointers. The returned value is in
/// units of T: the distance in bytes is divided by `mem::size_of::<T>()`.
///