bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

adjust dangling-int-ptr error message

Browse source
This commit is contained in:
Ralf Jung 2022-07-03 15:46:22 -04:00
parent 4045ce641a
commit 46956f76ca
18 changed files with 60 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_middle/src/mir/interpret/pointer.rs
View file

@ -181,7 +181,17 @@ impl<Tag: Provenance> fmt::Debug for Pointer<Option<Tag>> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self.provenance {
Some(tag) => Provenance::fmt(&Pointer::new(tag, self.offset), f),
None => write!(f, "{:#x}", self.offset.bytes()),
None => write!(f, "{:#x}[noalloc]", self.offset.bytes()),
}
}
}
impl<Tag: Provenance> fmt::Display for Pointer<Option<Tag>> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
if self.provenance.is_none() && self.offset.bytes() == 0 {
write!(f, "null pointer")
} else {
fmt::Debug::fmt(self, f)
}
}
}
@ -226,9 +236,14 @@ impl<Tag> Pointer<Option<Tag>> {
}
impl<Tag> Pointer<Option<Tag>> {
#[inline(always)]
pub fn from_addr(addr: u64) -> Self {
Pointer { provenance: None, offset: Size::from_bytes(addr) }
}
#[inline(always)]
pub fn null() -> Self {
Pointer { provenance: None, offset: Size::ZERO }
Pointer::from_addr(0)
}
}