diff options
| author | Chad Rosier <mcrosier@apple.com> | 2012-04-17 00:35:38 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2012-04-17 00:35:38 +0000 |
| commit | 7fea7c81c0970cdb150c1fadb2776dec9fd09780 (patch) | |
| tree | d9032bc57f114e76607bdc7e0b0729a61e27601a | |
| parent | 0ff258b933fe385425bf2a85429bf46376d338f1 (diff) | |
Make sure EmitMoveFromReturnSlot is passing the correct alignment to
EmitFinalDestCopy (and thus pass EmitAggregateCopy the correct alignment).
rdar://11220251
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154883 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGExprAgg.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGen/packed-nest-unpacked.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp index 2103026a84..d345154f01 100644 --- a/lib/CodeGen/CGExprAgg.cpp +++ b/lib/CodeGen/CGExprAgg.cpp @@ -238,7 +238,7 @@ void AggExprEmitter::EmitMoveFromReturnSlot(const Expr *E, RValue Src) { // Otherwise, do a final copy, 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. diff --git a/test/CodeGen/packed-nest-unpacked.c b/test/CodeGen/packed-nest-unpacked.c index 3751473331..d10a88a5e3 100644 --- a/test/CodeGen/packed-nest-unpacked.c +++ b/test/CodeGen/packed-nest-unpacked.c @@ -4,6 +4,7 @@ struct X { int x[6]; }; struct Y { char x[13]; struct X y; } __attribute((packed)); struct Y g; void f(struct X); +struct X foo(void); // <rdar://problem/10463337> 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 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(); +} |