bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make ScalarInt entirely independent of MIR interpretation

Browse source
This commit is contained in:
oli 2020-11-04 13:55:29 +00:00
parent 2e53625421
commit 97bfff1f56
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_middle/src/ty/consts/int.rs
View file

@ -1,4 +1,3 @@
use crate::mir::interpret::InterpResult;
use rustc_apfloat::ieee::{Double, Single};
use rustc_apfloat::Float;
use rustc_serialize::{Decodable, Decoder, Encodable, Encoder};
@ -192,11 +191,11 @@ impl ScalarInt {
self.data == 0
}
pub(crate) fn ptr_sized_op<'tcx>(
pub(crate) fn ptr_sized_op<E>(
self,
dl: &TargetDataLayout,
f_int: impl FnOnce(u64) -> InterpResult<'tcx, u64>,
) -> InterpResult<'tcx, Self> {
f_int: impl FnOnce(u64) -> Result<u64, E>,
) -> Result<Self, E> {
assert_eq!(u64::from(self.size), dl.pointer_size.bytes());
Ok(Self::try_from_uint(f_int(u64::try_from(self.data).unwrap())?, self.size()).unwrap())
}