Skip to content

Commit da0c7c6

Browse files
committed
Miri: offset_from: do int-to-ptr casts when needed
1 parent f49f388 commit da0c7c6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/librustc_mir/interpret/intrinsics.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
251251
}
252252

253253
"ptr_offset_from" => {
254-
let a = self.read_immediate(args[0])?.to_scalar()?.to_ptr()?;
255-
let b = self.read_immediate(args[1])?.to_scalar()?.to_ptr()?;
254+
let a = self.force_ptr(self.read_immediate(args[0])?.to_scalar()?)?;
255+
let b = self.force_ptr(self.read_immediate(args[1])?.to_scalar()?)?;
256256
if a.alloc_id != b.alloc_id {
257257
throw_ub_format!(
258258
"ptr_offset_from cannot compute offset of pointers into different \

0 commit comments

Comments
 (0)