Skip to content

Commit c8be312

Browse files
author
David Renshaw
committed
fix issue 184 by marking the destination as a packed struct
1 parent 58a4639 commit c8be312

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

src/terminator/intrinsic.rs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,17 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
383383
}
384384

385385
"transmute" => {
386+
let src_ty = substs.type_at(0);
386387
let dest_ty = substs.type_at(1);
387-
self.write_value(arg_vals[0], dest, dest_ty)?;
388+
let (_, src_align) = self.size_and_align_of_dst(src_ty, arg_vals[0])?;
389+
let (size, dest_align) = self.size_and_align_of_dst(dest_ty, arg_vals[0])?;
390+
if dest_align < src_align {
391+
let ptr = self.force_allocation(dest)?.to_ptr();
392+
self.memory.mark_packed(ptr, size);
393+
self.write_value_to_ptr(arg_vals[0], ptr, dest_ty)?;
394+
} else {
395+
self.write_value(arg_vals[0], dest, dest_ty)?;
396+
}
388397
}
389398

390399
"uninit" => {

tests/run-pass/issue-miri-184.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
pub fn main() {
2+
let bytes: [u8; 8] = unsafe { ::std::mem::transmute(0u64) };
3+
let _: &[u8] = &bytes;
4+
}

0 commit comments

Comments
 (0)