Skip to content

Commit 6bd7e16

Browse files
committed
cast: no need to catch errors any more, force_bits should succeed
1 parent 03f19f7 commit 6bd7e16

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/librustc_mir/interpret/cast.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,8 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
250250
RawPtr(_) => Ok(ptr.into()),
251251
Int(_) | Uint(_) => {
252252
let size = self.memory.pointer_size();
253-
254-
match self.force_bits(Scalar::Ptr(ptr), size) {
255-
Ok(bits) => self.cast_from_int(bits, src_layout, dest_layout),
256-
Err(_) if dest_layout.size == size => Ok(ptr.into()),
257-
Err(e) => Err(e),
258-
}
253+
let bits = self.force_bits(Scalar::Ptr(ptr), size)?;
254+
self.cast_from_int(bits, src_layout, dest_layout)
259255
}
260256
_ => bug!("invalid MIR: ptr to {:?} cast", dest_layout.ty)
261257
}

0 commit comments

Comments
 (0)