From 8bad4844b2034ff347479cc27275dc9ea8899f15 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 28 Mar 2020 16:57:33 +0100 Subject: [PATCH 1/2] rename Scalar::{ptr_null -> null_ptr} --- src/librustc/mir/interpret/value.rs | 2 +- src/librustc_mir/interpret/place.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustc/mir/interpret/value.rs b/src/librustc/mir/interpret/value.rs index 706cf1cd09a79..bf4ee8488238f 100644 --- a/src/librustc/mir/interpret/value.rs +++ b/src/librustc/mir/interpret/value.rs @@ -192,7 +192,7 @@ impl<'tcx, Tag> Scalar { } #[inline] - pub fn ptr_null(cx: &impl HasDataLayout) -> Self { + pub fn null_ptr(cx: &impl HasDataLayout) -> Self { Scalar::Raw { data: 0, size: cx.data_layout().pointer_size.bytes() as u8 } } diff --git a/src/librustc_mir/interpret/place.rs b/src/librustc_mir/interpret/place.rs index 94c9a8b2a6d59..79cae21b234a3 100644 --- a/src/librustc_mir/interpret/place.rs +++ b/src/librustc_mir/interpret/place.rs @@ -139,7 +139,7 @@ impl MemPlace { /// Produces a Place that will error if attempted to be read from or written to #[inline(always)] fn null(cx: &impl HasDataLayout) -> Self { - Self::from_scalar_ptr(Scalar::ptr_null(cx), Align::from_bytes(1).unwrap()) + Self::from_scalar_ptr(Scalar::null_ptr(cx), Align::from_bytes(1).unwrap()) } #[inline(always)] From 01dbaeda3242d48bb7b432f5fa2c0506e326551c Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 28 Mar 2020 17:51:11 +0100 Subject: [PATCH 2/2] use machine_ prefix for target usize/isize --- src/librustc/mir/interpret/pointer.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustc/mir/interpret/pointer.rs b/src/librustc/mir/interpret/pointer.rs index 3f841cfb33003..d22207bd81651 100644 --- a/src/librustc/mir/interpret/pointer.rs +++ b/src/librustc/mir/interpret/pointer.rs @@ -46,13 +46,13 @@ pub trait PointerArithmetic: layout::HasDataLayout { } #[inline] - fn usize_max(&self) -> u64 { + fn machine_usize_max(&self) -> u64 { let max_usize_plus_1 = 1u128 << self.pointer_size().bits(); u64::try_from(max_usize_plus_1 - 1).unwrap() } #[inline] - fn isize_max(&self) -> i64 { + fn machine_isize_max(&self) -> i64 { let max_isize_plus_1 = 1u128 << (self.pointer_size().bits() - 1); i64::try_from(max_isize_plus_1 - 1).unwrap() }