Make sure EmitMoveFromReturnSlot is passing the correct alignment to

EmitFinalDestCopy (and thus pass EmitAggregateCopy the correct alignment).
rdar://11220251

llvm-svn: 154883
This commit is contained in:
Chad Rosier 2012-04-17 00:35:38 +00:00
parent e63746195d
commit a750d46c9f
2 changed files with 9 additions and 1 deletions

View File

@ -238,7 +238,7 @@ void AggExprEmitter::EmitMoveFromReturnSlot(const Expr *E, RValue Src) {
// Otherwise, do a final copy, // Otherwise, do a final copy,
assert(Dest.getAddr() != Src.getAggregateAddr()); assert(Dest.getAddr() != Src.getAggregateAddr());
EmitFinalDestCopy(E, Src, /*Ignore*/ true); EmitFinalDestCopy(E, Src, /*Ignore*/ true, Dest.getAlignment().getQuantity());
} }
/// EmitFinalDestCopy - Perform the final copy to DestPtr, if desired. /// EmitFinalDestCopy - Perform the final copy to DestPtr, if desired.

View File

@ -4,6 +4,7 @@ struct X { int x[6]; };
struct Y { char x[13]; struct X y; } __attribute((packed)); struct Y { char x[13]; struct X y; } __attribute((packed));
struct Y g; struct Y g;
void f(struct X); void f(struct X);
struct X foo(void);
// <rdar://problem/10463337> // <rdar://problem/10463337>
struct X test1() { struct X test1() {
@ -37,3 +38,10 @@ int test5() {
// CHECK: load i32* getelementptr inbounds (%struct.Y* @g, i32 0, i32 1, i32 0, i64 0), align 1 // CHECK: load i32* getelementptr inbounds (%struct.Y* @g, i32 0, i32 1, i32 0, i64 0), align 1
return g.y.x[0]; return g.y.x[0];
} }
// <rdar://problem/11220251>
void test6() {
// CHECK: @test6
// CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* bitcast (%struct.X* getelementptr inbounds (%struct.Y* @g, i32 0, i32 1) to i8*), i8* %0, i64 24, i32 1, i1 false)
g.y = foo();
}