Change:
Hello, this is your friendly neighborhood mergebot. After merging PR rust-lang/rust, I observed that the tool miri has failing tests. A follow-up PR to the repository is needed to fix the fallout. cc do you think you would have time to do the follow-up work? If so, that would be great! <!-- TRIAGEBOTSTART --<!-- TRIAGEBOTASSIGNSTART --<!-- TRIAGEBOTASSIGNDATASTARTTRIAGEBOTASSIGNDATAEND --<!-- TRIAGEBOTASSIGNEND --<!-- TRIAGEBOTEND --
Some error message changes (cc ) broke Miri, but some "null pointer is not allowed for this operation" changes look... wrong? For example: (and many more) They are all not .
Yeah my patch makes no sense... working on a fix.
I don't think the toolstate is fixed: ! But it's just error message differences: claim

Discussion:
/// Details of why a pointer had to be in-bounds. #[derive(Debug, Copy, Clone, TyEncodable, TyDecodable, HashStable)] pub enum CheckInAllocMsg { <ins> /// We are access memory. </ins> MemoryAccessTest, <ins> /// We are doing pointer arithmetic. </ins> PointerArithmeticTest, <ins> /// None of the above -- generic/unspecific inbounds test. </ins> InboundsTest, } impl fmt::Display for CheckInAllocMsg { /// When this is printed as an error the context looks like this <del> /// "{test name} failed: pointer must be in-bounds at offset..." </del> <ins> /// "{msg}pointer must be in-bounds at offset..." </ins> fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!( f, "{}", match *self { <del> CheckInAllocMsg::MemoryAccessTest => "memory access", CheckInAllocMsg::PointerArithmeticTest => "pointer arithmetic", CheckInAllocMsg::InboundsTest => "inbounds test", </del> <ins> CheckInAllocMsg::MemoryAccessTest => "memory access failed: ", CheckInAllocMsg::PointerArithmeticTest => "pointer arithmetic failed: ", CheckInAllocMsg::InboundsTest => "", </ins> } ) }

} PointerOutOfBounds { ptr, msg, allocation_size } => write!( f, <del> "{} failed: pointer must be in-bounds at offset {},  </del> <ins> "{}pointer must be in-bounds at offset {},  </ins> but is outside bounds of {} which has size {}", msg, ptr.offset.bytes(), ptr.alloc_id, allocation_size.bytes() ), <del> DanglingIntPointer(_, CheckInAllocMsg::InboundsTest) => { write!(f, "null pointer is not allowed for this operation") </del> <ins> DanglingIntPointer(0, CheckInAllocMsg::InboundsTest) => { write!(f, "null pointer is not a valid pointer for this operation") </ins> } DanglingIntPointer(i, msg) => { <del> write!(f, "{} failed: 0x{:x} is not a valid pointer", msg, i) </del> <ins> write!(f, "{}0x{:x} is not a valid pointer", msg, i) </ins> } AlignmentCheckFailed { required, has } => write!( f,

--> $DIR/ub-wide-ptr.rs:135:5 | LL |     mem::transmute::<_, &dyn Trait>((&92u8, 0usize)) <del> |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ null pointer is not allowed for this operation </del> <ins> |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ null pointer is not a valid pointer for this operation </ins> error[E0080]: could not evaluate static initializer --> $DIR/ub-wide-ptr.rs:139:5

LL |           unsafe { intrinsics::ptr_offset_from(self, origin) } |                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |                    | <del> |                    null pointer is not allowed for this operation </del> <ins> |                    null pointer is not a valid pointer for this operation </ins> |                    inside `ptr::const_ptr::<impl *const u8>::offset_from` at $SRC_DIR/core/src/ptr/const_ptr.rs:LL:COL |                    inside `OFFSET_FROM_NULL` at $DIR/offset_from_ub.rs:36:14 |