user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove null places

Browse source
This commit is contained in:
Jonas Schievink 2020-04-16 01:23:29 +02:00
parent 4eaf535d2b
commit a417f963fe
2 changed files with 0 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/librustc_middle/mir/interpret/value.rs
View file

@ -188,11 +188,6 @@ impl<'tcx, Tag> Scalar<Tag> {
}
}
#[inline]
pub fn null_ptr(cx: &impl HasDataLayout) -> Self {
Scalar::Raw { data: 0, size: cx.data_layout().pointer_size.bytes() as u8 }
}
#[inline]
pub fn zst() -> Self {
Scalar::Raw { data: 0, size: 0 }

16
src/librustc_mir/interpret/place.rs
View file

@ -135,12 +135,6 @@ impl<Tag> MemPlace<Tag> {
MemPlace { ptr, align, meta: MemPlaceMeta::None }
}
/// 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::null_ptr(cx), Align::from_bytes(1).unwrap())
}
#[inline(always)]
pub fn from_ptr(ptr: Pointer<Tag>, align: Align) -> Self {
Self::from_scalar_ptr(ptr.into(), align)
@ -260,12 +254,6 @@ impl<'tcx, Tag: ::std::fmt::Debug + Copy> OpTy<'tcx, Tag> {
}
impl<Tag: ::std::fmt::Debug> Place<Tag> {
/// Produces a Place that will error if attempted to be read from or written to
#[inline(always)]
fn null(cx: &impl HasDataLayout) -> Self {
Place::Ptr(MemPlace::null(cx))
}
#[inline]
pub fn assert_mem_place(self) -> MemPlace<Tag> {
match self {
@ -276,10 +264,6 @@ impl<Tag: ::std::fmt::Debug> Place<Tag> {
}
impl<'tcx, Tag: ::std::fmt::Debug> PlaceTy<'tcx, Tag> {
pub fn null(cx: &impl HasDataLayout, layout: TyAndLayout<'tcx>) -> Self {
Self { place: Place::null(cx), layout }
}
#[inline]
pub fn assert_mem_place(self) -> MPlaceTy<'tcx, Tag> {
MPlaceTy { mplace: self.place.assert_mem_place(), layout: self.layout }