fixup! decouple isEmptyXXXForLayout from isEmptyXXX

Author: Michael137

clang/lib/CodeGen/ABIInfoImpl.cpp

@@ -248,7 +248,7 @@ Address CodeGen::emitMergePHI(CodeGenFunction &CGF, Address Addr1,
   return Address(PHI, Addr1.getElementType(), Align);
 }
 
-bool CodeGen::isEmptyField(const ASTContext &Context, const FieldDecl *FD,
+bool CodeGen::isEmptyField(ASTContext &Context, const FieldDecl *FD,
                            bool AllowArrays, bool AsIfNoUniqueAddr) {
   if (FD->isUnnamedBitField())
     return true;
@@ -289,6 +289,27 @@ bool CodeGen::isEmptyField(const ASTContext &Context, const FieldDecl *FD,
   return isEmptyRecord(Context, FT, AllowArrays, AsIfNoUniqueAddr);
 }
 
+bool CodeGen::isEmptyRecord(ASTContext &Context, QualType T, bool AllowArrays,
+                            bool AsIfNoUniqueAddr) {
+  const RecordType *RT = T->getAs<RecordType>();
+  if (!RT)
+    return false;
+  const RecordDecl *RD = RT->getDecl();
+  if (RD->hasFlexibleArrayMember())
+    return false;
+
+  // If this is a C++ record, check the bases first.
+  if (const CXXRecordDecl *CXXRD = dyn_cast<CXXRecordDecl>(RD))
+    for (const auto &I : CXXRD->bases())
+      if (!isEmptyRecord(Context, I.getType(), true, AsIfNoUniqueAddr))
+        return false;
+
+  for (const auto *I : RD->fields())
+    if (!isEmptyField(Context, I, AllowArrays, AsIfNoUniqueAddr))
+      return false;
+  return true;
+}
+
 bool CodeGen::isEmptyFieldForLayout(const ASTContext &Context,
                                     const FieldDecl *FD) {
   if (FD->isZeroLengthBitField(Context))
@@ -297,34 +318,27 @@ bool CodeGen::isEmptyFieldForLayout(const ASTContext &Context,
   if (FD->isUnnamedBitField())
     return false;
 
-  return isEmptyField(Context, FD, /*AllowArrays=*/false,
-                      /*AsIfNoUniqueAddr=*/true);
+  return isEmptyRecordForLayout(Context, FD->getType());
 }
 
-bool CodeGen::isEmptyRecord(const ASTContext &Context, QualType T,
-                            bool AllowArrays, bool AsIfNoUniqueAddr) {
+bool CodeGen::isEmptyRecordForLayout(const ASTContext &Context, QualType T) {
   const RecordType *RT = T->getAs<RecordType>();
   if (!RT)
     return false;
+
   const RecordDecl *RD = RT->getDecl();
-  if (RD->hasFlexibleArrayMember())
-    return false;
 
   // If this is a C++ record, check the bases first.
   if (const CXXRecordDecl *CXXRD = dyn_cast<CXXRecordDecl>(RD))
     for (const auto &I : CXXRD->bases())
-      if (!isEmptyRecord(Context, I.getType(), true, AsIfNoUniqueAddr))
+      if (!isEmptyRecordForLayout(Context, I.getType()))
         return false;
 
   for (const auto *I : RD->fields())
-    if (!isEmptyField(Context, I, AllowArrays, AsIfNoUniqueAddr))
+    if (!isEmptyFieldForLayout(Context, I))
       return false;
-  return true;
-}
 
-bool CodeGen::isEmptyRecordForLayout(const ASTContext &Context, QualType T) {
-  return isEmptyRecord(Context, T, /*AllowArrays=*/false,
-                       /*AsIfNoUniqueAddr=*/true);
+  return true;
 }
 
 const Type *CodeGen::isSingleElementStruct(QualType T, ASTContext &Context) {

clang/lib/CodeGen/ABIInfoImpl.h

@@ -126,24 +126,25 @@ Address emitMergePHI(CodeGenFunction &CGF, Address Addr1,
 /// is an unnamed bit-field or an (array of) empty record(s). If
 /// AsIfNoUniqueAddr is true, then C++ record fields are considered empty if
 /// the [[no_unique_address]] attribute would have made them empty.
-bool isEmptyField(const ASTContext &Context, const FieldDecl *FD,
-                  bool AllowArrays, bool AsIfNoUniqueAddr = false);
-
-/// isEmptyFieldForLayout - Return true iff the field is "empty", that is,
-/// either a zero-width bit-field or an empty record.
-bool isEmptyFieldForLayout(const ASTContext &Context, const FieldDecl *FD);
+bool isEmptyField(ASTContext &Context, const FieldDecl *FD, bool AllowArrays,
+                  bool AsIfNoUniqueAddr = false);
 
 /// isEmptyRecord - Return true iff a structure contains only empty
 /// fields. Note that a structure with a flexible array member is not
 /// considered empty. If AsIfNoUniqueAddr is true, then C++ record fields are
 /// considered empty if the [[no_unique_address]] attribute would have made
 /// them empty.
-bool isEmptyRecord(const ASTContext &Context, QualType T, bool AllowArrays,
+bool isEmptyRecord(ASTContext &Context, QualType T, bool AllowArrays,
                    bool AsIfNoUniqueAddr = false);
 
+/// isEmptyFieldForLayout - Return true iff the field is "empty", that is,
+/// either a zero-width bit-field or an \ref isEmptyRecordForLayout.
+bool isEmptyFieldForLayout(const ASTContext &Context, const FieldDecl *FD);
+
 /// isEmptyRecordForLayout - Return true iff a structure contains only empty
-/// fields. Note, C++ record fields are considered empty if the
-/// [[no_unique_address]] attribute would have made them empty.
+/// fields (per \ref isEmptyFieldForLayout). Note, C++ record fields are
+/// considered empty if the [[no_unique_address]] attribute would have made
+/// them empty.
 bool isEmptyRecordForLayout(const ASTContext &Context, QualType T);
 
 /// isSingleElementStruct - Determine if a structure is a "single

clang/test/CodeGen/debug-info-packed-struct.c

@@ -2,7 +2,7 @@
 
 // CHECK: %struct.layout3 = type <{ i8, [3 x i8], %struct.size8_pack4, i8, [3 x i8] }>
 // CHECK: %struct.layout0 = type { i8, %struct.size8, i8 }
-// CHECK: %struct.layout1 = type { i8, [8 x i8], i8, [2 x i8] }
+// CHECK: %struct.layout1 = type <{ i8, %struct.size8_anon, i8, [2 x i8] }>
 // CHECK: %struct.layout2 = type <{ i8, %struct.size8_pack1, i8 }>
 
 // ---------------------------------------------------------------------