nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-08 16:07:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

add assert_{bits,ptr}; document which methods we hope to get rid of

Browse Source
This commit is contained in:
Ralf Jung 2019-07-05 21:06:31 +02:00
parent b820c76174
commit eed52de6b7
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/librustc/mir/interpret/value.rs
View File

@ -339,6 +339,10 @@ impl<'tcx, Tag> Scalar<Tag> {
Scalar::Raw { data: f.to_bits(), size: 8 } Scalar::Raw { data: f.to_bits(), size: 8 }
} }
/// This is very rarely the method you want! You should dispatch on the type
/// and use `force_bits`/`assert_bits`/`force_ptr`/`assert_ptr`.
/// This method only exists for the benefit of low-level memory operations
/// as well as the implementation of the `force_*` methods.
#[inline] #[inline]
pub fn to_bits_or_ptr( pub fn to_bits_or_ptr(
self, self,
@ -359,6 +363,7 @@ impl<'tcx, Tag> Scalar<Tag> {
} }
} }
/// Do not call this method! Use either `assert_bits` or `force_bits`.
#[inline] #[inline]
pub fn to_bits(self, target_size: Size) -> InterpResult<'tcx, u128> { pub fn to_bits(self, target_size: Size) -> InterpResult<'tcx, u128> {
match self { match self {
@ -372,6 +377,12 @@ impl<'tcx, Tag> Scalar<Tag> {
} }
} }
#[inline(always)]
pub fn assert_bits(self, target_size: Size) -> u128 {
self.to_bits(target_size).expect("Expected Raw bits but got a Pointer")
}
/// Do not call this method! Use either `assert_ptr` or `force_ptr`.
#[inline] #[inline]
pub fn to_ptr(self) -> InterpResult<'tcx, Pointer<Tag>> { pub fn to_ptr(self) -> InterpResult<'tcx, Pointer<Tag>> {
match self { match self {
@ -381,6 +392,12 @@ impl<'tcx, Tag> Scalar<Tag> {
} }
} }
#[inline(always)]
pub fn assert_ptr(self) -> Pointer<Tag> {
self.to_ptr().expect("Expected a Pointer but got Raw bits")
}
/// Do not call this method! Dispatch based on the type instead.
#[inline] #[inline]
pub fn is_bits(self) -> bool { pub fn is_bits(self) -> bool {
match self { match self {
@ -389,6 +406,7 @@ impl<'tcx, Tag> Scalar<Tag> {
} }
} }
/// Do not call this method! Dispatch based on the type instead.
#[inline] #[inline]
pub fn is_ptr(self) -> bool { pub fn is_ptr(self) -> bool {
match self { match self {
@ -536,11 +554,13 @@ impl<'tcx, Tag> ScalarMaybeUndef<Tag> {
} }
} }
/// Do not call this method! Use either `assert_ptr` or `force_ptr`.
#[inline(always)] #[inline(always)]
pub fn to_ptr(self) -> InterpResult<'tcx, Pointer<Tag>> { pub fn to_ptr(self) -> InterpResult<'tcx, Pointer<Tag>> {
self.not_undef()?.to_ptr() self.not_undef()?.to_ptr()
} }
/// Do not call this method! Use either `assert_bits` or `force_bits`.
#[inline(always)] #[inline(always)]
pub fn to_bits(self, target_size: Size) -> InterpResult<'tcx, u128> { pub fn to_bits(self, target_size: Size) -> InterpResult<'tcx, u128> {
self.not_undef()?.to_bits(target_size) self.not_undef()?.to_bits(target_size)