mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #108044 - RalfJung:from-addr-invalid, r=oli-obk

Browse Source 
interpret: rename Pointer::from_addr → from_addr_invalid

This function corresponds to `ptr::invalid` in the standard library; the previous name was not clear enough IMO.
This commit is contained in:
Matthias Krüger 2023-02-14 18:24:44 +01:00 committed by GitHub
commit 8e82c8c9d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_const_eval/src/interpret/machine.rs
View File

@ -517,7 +517,7 @@ pub macro compile_time_machine(<$mir: lifetime, $tcx: lifetime>) {
// Allow these casts, but make the pointer not dereferenceable. // Allow these casts, but make the pointer not dereferenceable.
// (I.e., they behave like transmutation.) // (I.e., they behave like transmutation.)
// This is correct because no pointers can ever be exposed in compile-time evaluation. // This is correct because no pointers can ever be exposed in compile-time evaluation.
Ok(Pointer::from_addr(addr)) Ok(Pointer::from_addr_invalid(addr))
} }
#[inline(always)] #[inline(always)]

2
compiler/rustc_const_eval/src/interpret/place.rs
View File

@ -178,7 +178,7 @@ impl<'tcx, Prov: Provenance> MPlaceTy<'tcx, Prov> {
pub fn fake_alloc_zst(layout: TyAndLayout<'tcx>) -> Self { pub fn fake_alloc_zst(layout: TyAndLayout<'tcx>) -> Self {
assert!(layout.is_zst()); assert!(layout.is_zst());
let align = layout.align.abi; let align = layout.align.abi;
let ptr = Pointer::from_addr(align.bytes()); // no provenance, absolute address let ptr = Pointer::from_addr_invalid(align.bytes()); // no provenance, absolute address
MPlaceTy { mplace: MemPlace { ptr, meta: MemPlaceMeta::None }, layout, align } MPlaceTy { mplace: MemPlace { ptr, meta: MemPlaceMeta::None }, layout, align }
} }

2
compiler/rustc_middle/src/mir/interpret/error.rs
View File

@ -323,7 +323,7 @@ impl fmt::Display for UndefinedBehaviorInfo {
write!( write!(
f, f,
"{msg}{pointer} is a dangling pointer (it has no provenance)", "{msg}{pointer} is a dangling pointer (it has no provenance)",
pointer = Pointer::<Option<AllocId>>::from_addr(*i), pointer = Pointer::<Option<AllocId>>::from_addr_invalid(*i),
) )
} }
AlignmentCheckFailed { required, has } => write!( AlignmentCheckFailed { required, has } => write!(

6
compiler/rustc_middle/src/mir/interpret/pointer.rs
View File

@ -251,14 +251,16 @@ impl<Prov> Pointer<Option<Prov>> {
} }
impl<Prov> Pointer<Option<Prov>> { impl<Prov> Pointer<Option<Prov>> {
/// Creates a pointer to the given address, with invalid provenance (i.e., cannot be used for
/// any memory access).
#[inline(always)] #[inline(always)]
pub fn from_addr(addr: u64) -> Self { pub fn from_addr_invalid(addr: u64) -> Self {
Pointer { provenance: None, offset: Size::from_bytes(addr) } Pointer { provenance: None, offset: Size::from_bytes(addr) }
} }
#[inline(always)] #[inline(always)]
pub fn null() -> Self { pub fn null() -> Self {
Pointer::from_addr(0) Pointer::from_addr_invalid(0)
} }
} }

2
compiler/rustc_middle/src/mir/interpret/value.rs
View File

@ -322,7 +322,7 @@ impl<'tcx, Prov: Provenance> Scalar<Prov> {
Right(ptr) => Ok(ptr.into()), Right(ptr) => Ok(ptr.into()),
Left(bits) => { Left(bits) => {
let addr = u64::try_from(bits).unwrap(); let addr = u64::try_from(bits).unwrap();
Ok(Pointer::from_addr(addr)) Ok(Pointer::from_addr_invalid(addr))
} }
} }
} }