From db748a380ab89b1c0b6e751e55291f57605cccce Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Thu, 29 Nov 2012 23:21:04 +0000 Subject: [PATCH] Fix a small calling-convention bug for x86-32. PR14453. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@168959 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/TargetInfo.cpp | 10 ++++++++-- test/CodeGen/x86_32-arguments-darwin.c | 5 +++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/CodeGen/TargetInfo.cpp b/lib/CodeGen/TargetInfo.cpp index 1582eb6354..8ff57f6c20 100644 --- a/lib/CodeGen/TargetInfo.cpp +++ b/lib/CodeGen/TargetInfo.cpp @@ -266,9 +266,15 @@ static const Type *isSingleElementStruct(QualType T, ASTContext &Context) { } static bool is32Or64BitBasicType(QualType Ty, ASTContext &Context) { + // Treat complex types as the element type. + if (const ComplexType *CTy = Ty->getAs()) + Ty = CTy->getElementType(); + + // Check for a type which we know has a simple scalar argument-passing + // convention without any padding. (We're specifically looking for 32 + // and 64-bit integer and integer-equivalents, float, and double.) if (!Ty->getAs() && !Ty->hasPointerRepresentation() && - !Ty->isAnyComplexType() && !Ty->isEnumeralType() && - !Ty->isBlockPointerType()) + !Ty->isEnumeralType() && !Ty->isBlockPointerType()) return false; uint64_t Size = Context.getTypeSize(Ty); diff --git a/test/CodeGen/x86_32-arguments-darwin.c b/test/CodeGen/x86_32-arguments-darwin.c index 5bbc80b939..917ba72e0b 100644 --- a/test/CodeGen/x86_32-arguments-darwin.c +++ b/test/CodeGen/x86_32-arguments-darwin.c @@ -337,3 +337,8 @@ T66 f66(int i, ...) { __builtin_va_end(ap); return v; } + +// PR14453 +struct s67 { _Complex unsigned short int a; }; +void f67(struct s67 x) {} +// CHECK: define void @f67(%struct.s67* byval align 4 %x) -- 2.40.0