mirror of https://github.com/rust-lang/rust.git
move CheckInAllocMsg to more logical place
This commit is contained in:
parent
c50b9d197f
commit
dcc8371d4e
|
@ -22,28 +22,6 @@ pub enum InboundsCheck {
|
|||
MaybeDead,
|
||||
}
|
||||
|
||||
/// Used by `check_in_alloc` to indicate context of check
|
||||
#[derive(Debug, Copy, Clone, RustcEncodable, RustcDecodable, HashStable)]
|
||||
pub enum CheckInAllocMsg {
|
||||
MemoryAccessTest,
|
||||
NullPointerTest,
|
||||
PointerArithmeticTest,
|
||||
InboundsTest,
|
||||
}
|
||||
|
||||
impl Display for CheckInAllocMsg {
|
||||
/// When this is printed as an error the context looks like this
|
||||
/// "{test name} failed: pointer must be in-bounds at offset..."
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
write!(f, "{}", match *self {
|
||||
CheckInAllocMsg::MemoryAccessTest => "Memory access",
|
||||
CheckInAllocMsg::NullPointerTest => "Null pointer test",
|
||||
CheckInAllocMsg::PointerArithmeticTest => "Pointer arithmetic",
|
||||
CheckInAllocMsg::InboundsTest => "Inbounds test",
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Hash, RustcEncodable, RustcDecodable)]
|
||||
pub struct Allocation<Tag=(),Extra=()> {
|
||||
/// The actual bytes of the allocation.
|
||||
|
|
|
@ -19,10 +19,10 @@ pub use self::value::{Scalar, ScalarMaybeUndef, RawConst, ConstValue};
|
|||
|
||||
pub use self::allocation::{
|
||||
InboundsCheck, Allocation, AllocationExtra,
|
||||
Relocations, UndefMask, CheckInAllocMsg,
|
||||
Relocations, UndefMask,
|
||||
};
|
||||
|
||||
pub use self::pointer::{Pointer, PointerArithmetic};
|
||||
pub use self::pointer::{Pointer, PointerArithmetic, CheckInAllocMsg};
|
||||
|
||||
use std::fmt;
|
||||
use crate::mir;
|
||||
|
|
|
@ -5,9 +5,31 @@ use crate::ty::layout::{self, HasDataLayout, Size};
|
|||
use rustc_macros::HashStable;
|
||||
|
||||
use super::{
|
||||
AllocId, InterpResult, CheckInAllocMsg
|
||||
AllocId, InterpResult,
|
||||
};
|
||||
|
||||
/// Used by `check_in_alloc` to indicate context of check
|
||||
#[derive(Debug, Copy, Clone, RustcEncodable, RustcDecodable, HashStable)]
|
||||
pub enum CheckInAllocMsg {
|
||||
MemoryAccessTest,
|
||||
NullPointerTest,
|
||||
PointerArithmeticTest,
|
||||
InboundsTest,
|
||||
}
|
||||
|
||||
impl Display for CheckInAllocMsg {
|
||||
/// When this is printed as an error the context looks like this
|
||||
/// "{test name} failed: pointer must be in-bounds at offset..."
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
write!(f, "{}", match *self {
|
||||
CheckInAllocMsg::MemoryAccessTest => "Memory access",
|
||||
CheckInAllocMsg::NullPointerTest => "Null pointer test",
|
||||
CheckInAllocMsg::PointerArithmeticTest => "Pointer arithmetic",
|
||||
CheckInAllocMsg::InboundsTest => "Inbounds test",
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Pointer arithmetic
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
Loading…
Reference in New Issue