Auto merge of #1381 - RalfJung:rustup, r=RalfJung

rustup; fix for changed error messages

Author: bors

rust-version

@@ -1 +1 @@
-e94eaa6dce468928b4e1326b2f0054f3075681ff
+fd61d06772d17c6242265d860fbfb5eafd282caa

src/diagnostics.rs

@@ -16,7 +16,7 @@ pub enum TerminationInfo {
     Deadlock,
 }
 
-impl fmt::Debug for TerminationInfo {
+impl fmt::Display for TerminationInfo {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         use TerminationInfo::*;
         match self {

src/intptrcast.rs

@@ -9,7 +9,7 @@ use rustc_data_structures::fx::FxHashMap;
 use rustc_mir::interpret::{AllocCheck, AllocId, InterpResult, Memory, Machine, Pointer, PointerArithmetic};
 use rustc_target::abi::{Size, HasDataLayout};
 
-use crate::{Evaluator, Tag, STACK_ADDR};
+use crate::{Evaluator, Tag, STACK_ADDR, CheckInAllocMsg};
 
 pub type MemoryExtra = RefCell<GlobalState>;
 
@@ -46,14 +46,16 @@ impl<'mir, 'tcx> GlobalState {
         let global_state = memory.extra.intptrcast.borrow();
         let pos = global_state.int_to_ptr_map.binary_search_by_key(&int, |(addr, _)| *addr);
 
+        // The int must be in-bounds after being cast to a pointer, so we error
+        // with `CheckInAllocMsg::InboundsTest`.
         Ok(match pos {
             Ok(pos) => {
                 let (_, alloc_id) = global_state.int_to_ptr_map[pos];
                 // `int` is equal to the starting address for an allocation, the offset should be
                 // zero. The pointer is untagged because it was created from a cast
                 Pointer::new_with_tag(alloc_id, Size::from_bytes(0), Tag::Untagged)
             }
-            Err(0) => throw_ub!(InvalidIntPointerUsage(int)),
+            Err(0) => throw_ub!(DanglingIntPointer(int, CheckInAllocMsg::InboundsTest)),
             Err(pos) => {
                 // This is the largest of the adresses smaller than `int`,
                 // i.e. the greatest lower bound (glb)
@@ -65,7 +67,7 @@ impl<'mir, 'tcx> GlobalState {
                     // This pointer is untagged because it was created from a cast
                     Pointer::new_with_tag(alloc_id, Size::from_bytes(offset), Tag::Untagged)
                 } else {
-                    throw_ub!(InvalidIntPointerUsage(int))
+                    throw_ub!(DanglingIntPointer(int, CheckInAllocMsg::InboundsTest))
                 }
             }
         })

tests/compile-fail/dangling_pointers/deref-invalid-ptr.rs

@@ -3,5 +3,5 @@
 
 fn main() {
     let x = 16usize as *const u32;
-    let _y = unsafe { &*x as *const u32 }; //~ ERROR invalid use of 16 as a pointer
+    let _y = unsafe { &*x as *const u32 }; //~ ERROR inbounds test failed: 0x10 is not a valid pointer
 }

tests/compile-fail/dangling_pointers/wild_pointer_deref.rs

@@ -1,5 +1,5 @@
 fn main() {
     let p = 44 as *const i32;
-    let x = unsafe { *p }; //~ ERROR invalid use of 44 as a pointer
+    let x = unsafe { *p }; //~ ERROR inbounds test failed: 0x2c is not a valid pointer
     panic!("this should never print: {}", x);
 }

tests/compile-fail/function_pointers/cast_int_to_fn_ptr.rs

@@ -6,5 +6,5 @@ fn main() {
         std::mem::transmute::<usize, fn(i32)>(42)
     };
 
-    g(42) //~ ERROR invalid use of 42 as a pointer
+    g(42) //~ ERROR inbounds test failed: 0x2a is not a valid pointer
 }

tests/compile-fail/intrinsics/copy_null.rs

@@ -9,5 +9,5 @@ fn main() {
     let mut data = [0u16; 4];
     let ptr = &mut data[0] as *mut u16;
     // Even copying 0 elements from NULL should error.
-    unsafe { copy_nonoverlapping(std::ptr::null(), ptr, 0); } //~ ERROR: invalid use of NULL pointer
+    unsafe { copy_nonoverlapping(std::ptr::null(), ptr, 0); } //~ ERROR: memory access failed: 0x0 is not a valid pointer
 }

tests/compile-fail/intrinsics/ptr_offset_0_plus_0.rs

@@ -1,4 +1,4 @@
-// error-pattern: invalid use of NULL pointer
+// error-pattern: inbounds test failed: 0x0 is not a valid pointer
 
 fn main() {
     let x = 0 as *mut i32;

tests/compile-fail/intrinsics/ptr_offset_int_plus_int.rs

@@ -1,4 +1,4 @@
-// error-pattern: invalid use of 1 as a pointer
+// error-pattern: inbounds test failed: 0x1 is not a valid pointer
 
 fn main() {
     // Can't offset an integer pointer by non-zero offset.

tests/compile-fail/intrinsics/ptr_offset_int_plus_ptr.rs

@@ -1,4 +1,4 @@
-// error-pattern: invalid use of 1 as a pointer
+// error-pattern: inbounds test failed: 0x1 is not a valid pointer
 
 fn main() {
     let ptr = Box::into_raw(Box::new(0u32));