Author: Yaxun (Sam) Liu Date: 2019-12-10T13:56:34-05:00 New Revision: 21b43885b81a6180e7231e575b5433202582f2fb
URL: https://github.com/llvm/llvm-project/commit/21b43885b81a6180e7231e575b5433202582f2fb DIFF: https://github.com/llvm/llvm-project/commit/21b43885b81a6180e7231e575b5433202582f2fb.diff LOG: Fix bug 44190 - wrong code with #pragma pack(1) https://github.com/llvm/llvm-project/commit/5b330e8d6122c336d81dfd11c864e6c6240a381e caused a regression on s390: https://bugs.llvm.org/show_bug.cgi?id=44190 we need to copy if if either the argument is non-byval or the argument is underaligned. Differential Revision: https://reviews.llvm.org/D71282 Added: clang/test/CodeGen/s390x-packed-struct-func-arg.c Modified: clang/lib/CodeGen/CGCall.cpp Removed: ################################################################################ diff --git a/clang/lib/CodeGen/CGCall.cpp b/clang/lib/CodeGen/CGCall.cpp index 4cf709be7429..d41516b7eab3 100644 --- a/clang/lib/CodeGen/CGCall.cpp +++ b/clang/lib/CodeGen/CGCall.cpp @@ -4005,9 +4005,8 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo, auto LV = I->getKnownLValue(); auto AS = LV.getAddressSpace(); - if ((!ArgInfo.getIndirectByVal() && - (LV.getAlignment() >= - getContext().getTypeAlignInChars(I->Ty)))) { + if (!ArgInfo.getIndirectByVal() || + (LV.getAlignment() < getContext().getTypeAlignInChars(I->Ty))) { NeedCopy = true; } if (!getLangOpts().OpenCL) { diff --git a/clang/test/CodeGen/s390x-packed-struct-func-arg.c b/clang/test/CodeGen/s390x-packed-struct-func-arg.c new file mode 100644 index 000000000000..df68b0311939 --- /dev/null +++ b/clang/test/CodeGen/s390x-packed-struct-func-arg.c @@ -0,0 +1,23 @@ +// RUN: %clang_cc1 -triple s390x-linux-gnu -target-cpu z13 -emit-llvm -o - %s \ +// RUN: | FileCheck %s + +struct S0 { + long f1; + int f2 : 4; +} d; + +#pragma pack(1) +struct S1 { + struct S0 S0_member; +}; + +void f(struct S0 arg) { + arg.f2 = 1; +} + +void g() { + struct S1 g; + // CHECK: alloca %struct.S0, align 8 + // CHECK: call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 8 {{.*}}, i8* align 1 {{.*}}, i64 16 + f(g.S0_member); +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
