mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix alignment issue

Browse Source
This commit is contained in:
bjorn3 2018-03-18 19:25:13 +01:00 committed by Oliver Schneider
parent cd89e56f15
commit d4f30aa9c1
No known key found for this signature in database
GPG Key ID: 1D5CB4FC597C3004
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
miri/intrinsic.rs
View File

@ -217,8 +217,16 @@ impl<'a, 'mir, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'mir, 'tcx, super:
// Also see the write_bytes intrinsic.
let elem_align = elem_layout.align;
let src = self.into_ptr(args[0].value)?;
let src_align = self.layout_of(args[0].ty)?.align;
//let src_align = self.layout_of(args[0].ty)?.align;
let src_align = ty::layout::Align::from_bytes(1, 1).unwrap();
let dest = self.into_ptr(args[1].value)?;
/*self.tcx.sess.warn(&format!("src_ty: {:?} src_align: {} elem_align: {} src_aligned: {:?} dst_aligned: {:?}",
args[0].ty,
src_align.abi(),
elem_align.abi(),
self.memory.check_align(src, src_align),
self.memory.check_align(dest, elem_align)
));*/
self.memory.copy(
src,
src_align,

2
xargo/Cargo.lock generated
View File

@ -1,4 +1,4 @@
[root]
[[package]]
name = "miri-xargo"
version = "0.0.0"