catch conversion errors during ptr_sized_op

oli-obk · oli-obk · commit d1074edb6472 · 2020-11-04T10:12:55.000Z
diff --git a/compiler/rustc_middle/src/ty/consts/int.rs b/compiler/rustc_middle/src/ty/consts/int.rs
@@ -194,7 +194,7 @@ impl ScalarInt {
         f_int: impl FnOnce(u64) -> InterpResult<'tcx, u64>,
     ) -> InterpResult<'tcx, Self> {
         assert_eq!(u64::from(self.size), dl.pointer_size.bytes());
-        Ok(Self { data: u128::from(f_int(u64::try_from(self.data).unwrap())?), size: self.size })
+        Ok(Self::try_from_uint(f_int(u64::try_from(self.data).unwrap())?, self.size).unwrap())
     }
 
     #[inline]

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ impl ScalarInt {`
`194`	`194`	`f_int: impl FnOnce(u64) -> InterpResult<'tcx, u64>,`
`195`	`195`	`) -> InterpResult<'tcx, Self> {`
`196`	`196`	`assert_eq!(u64::from(self.size), dl.pointer_size.bytes());`
`197`		`- Ok(Self { data: u128::from(f_int(u64::try_from(self.data).unwrap())?), size: self.size })`
	`197`	`+ Ok(Self::try_from_uint(f_int(u64::try_from(self.data).unwrap())?, self.size).unwrap())`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`#[inline]`