Skip to content

Commit cad0188

Browse files
authored
Merge pull request rust-lang#187 from dwrensha/fix-issue-184-mark-packed
fix issue 184 by marking the destination as a packed struct
2 parents 58a4639 + 49fb43f commit cad0188

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

src/terminator/intrinsic.rs

+11-1
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,18 @@ 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.type_align(src_ty)?;
389+
let dest_align = self.type_align(dest_ty)?;
390+
let size = self.type_size(dest_ty)?.expect("transmute() type must be sized");
391+
if dest_align < src_align {
392+
let ptr = self.force_allocation(dest)?.to_ptr();
393+
self.memory.mark_packed(ptr, size);
394+
self.write_value_to_ptr(arg_vals[0], ptr, dest_ty)?;
395+
} else {
396+
self.write_value(arg_vals[0], dest, dest_ty)?;
397+
}
388398
}
389399

390400
"uninit" => {

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

+4
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)