nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 15:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #54547 - AstralSorcerer:issue-54028, r=eddyb

Browse Source 
Rely only on base alignment and offset for computing field alignment

Fix #54028
r? @eddyb
This commit is contained in:
bors 2018-09-28 02:28:25 +00:00
commit c222479c6f
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustc_codegen_llvm/mir/place.rs
View File

@ -173,10 +173,7 @@ impl PlaceRef<'ll, 'tcx> {
let cx = bx.cx;
let field = self.layout.field(cx, ix);
let offset = self.layout.fields.offset(ix);
let effective_field_align = self.align
.min(self.layout.align)
.min(field.align)
.restrict_for_offset(offset);
let effective_field_align = self.align.restrict_for_offset(offset);
let simple = || {
// Unions and newtypes only use an offset of 0.

10
src/test/codegen/align-struct.rs
View File

@ -48,6 +48,16 @@ pub fn align64(i : i32) -> Align64 {
a64
}
// For issue 54028: make sure that we are specifying the correct alignment for fields of aligned
// structs
// CHECK-LABEL: @align64_load
#[no_mangle]
pub fn align64_load(a: Align64) -> i32 {
// CHECK: [[FIELD:%.*]] = bitcast %Align64* %{{.*}} to i32*
// CHECK: {{%.*}} = load i32, i32* [[FIELD]], align 64
a.0
}
// CHECK-LABEL: @nested64
#[no_mangle]
pub fn nested64(a: Align64, b: i32, c: i32, d: i8) -> Nested64 {