user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

librustc: Fix field offsets for packed structs.

Browse source
This commit is contained in:
Luqman Aden 2014-08-18 14:03:20 -04:00
parent 7074592ee1
commit 82fa4368ed
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/librustc/middle/trans/cabi_x86_64.rs
View file

@ -176,11 +176,15 @@ fn classify_ty(ty: Type) -> Vec<RegClass> {
}
fn classify_struct(tys: &[Type],
cls: &mut [RegClass], i: uint,
off: uint) {
cls: &mut [RegClass],
i: uint,
off: uint,
packed: bool) {
let mut field_off = off;
for ty in tys.iter() {
field_off = align(field_off, *ty);
if !packed {
field_off = align(field_off, *ty);
}
classify(*ty, cls, i, field_off);
field_off += ty_size(*ty);
}
@ -219,7 +223,7 @@ fn classify_ty(ty: Type) -> Vec<RegClass> {
unify(cls, ix + off / 8u, SSEDs);
}
Struct => {
classify_struct(ty.field_types().as_slice(), cls, ix, off);
classify_struct(ty.field_types().as_slice(), cls, ix, off, ty.is_packed());
}
Array => {
let len = ty.array_length();