Darwin x86_32: Ignore padding bit-fields when looking for "single

element" structures.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71266 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGCall.cpp b/lib/CodeGen/CGCall.cpp
index eba5ff5b5e755736b98a3c5b37309243ff14156d..883eb5ede483cd445538705355ef25bafb378b28 100644 (file)
--- a/lib/CodeGen/CGCall.cpp
+++ b/lib/CodeGen/CGCall.cpp
@@ -204,11 +204,15 @@ static const Type *isSingleElementStruct(QualType T, ASTContext &Context) {
       if (AT->getSize().getZExtValue() == 1)
         FT = AT->getElementType();
 
-    if (isEmptyRecord(Context, FT)) {
-      // Ignore
-    } else if (Found) {
+    // Ignore empty records and padding bit-fields.
+    if (isEmptyRecord(Context, FT) || 
+        (FD->isBitField() && !FD->getIdentifier()))
+      continue;
+
+    if (Found)
       return 0;
-    } else if (!CodeGenFunction::hasAggregateLLVMType(FT)) {
+
+    if (!CodeGenFunction::hasAggregateLLVMType(FT)) {
       Found = FT.getTypePtr();
     } else {
       Found = isSingleElementStruct(FT, Context);

diff --git a/test/CodeGen/x86_32-arguments.c b/test/CodeGen/x86_32-arguments.c
index b18d2d0acb6bb1a1c6c9132774e8ca0a00c2a70f..c75734e5a126d24c7ff272bceb144b40d1f30862 100644 (file)
--- a/test/CodeGen/x86_32-arguments.c
+++ b/test/CodeGen/x86_32-arguments.c
@@ -130,4 +130,7 @@ struct s29 { struct { } a[1]; char b; char c; } f29(void) {}
 // RUN: grep 'define i16 @f30()' %t &&
 struct s30 { char a; char b : 4; } f30(void) {}
 
+// RUN: grep 'define float @f31()' %t &&
+struct s31 { char : 0; float b; char : 0} f31(void) {}
+
 // RUN: true