diff options
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 7 | ||||
| -rw-r--r-- | clang/test/Layout/itanium-pack-and-align.cpp | 26 |
2 files changed, 30 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 9a1ab4a3c58..e8e3faf7578 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -15594,6 +15594,10 @@ void Sema::ActOnFields(Scope *S, SourceLocation RecLoc, Decl *EnclosingDecl, if (!Completed) Record->completeDefinition(); + // Handle attributes before checking the layout. + if (Attr) + ProcessDeclAttributeList(S, Record, Attr); + // We may have deferred checking for a deleted destructor. Check now. if (CXXRecordDecl *CXXRecord = dyn_cast<CXXRecordDecl>(Record)) { auto *Dtor = CXXRecord->getDestructor(); @@ -15724,9 +15728,6 @@ void Sema::ActOnFields(Scope *S, SourceLocation RecLoc, Decl *EnclosingDecl, CDecl->setIvarRBraceLoc(RBrac); } } - - if (Attr) - ProcessDeclAttributeList(S, Record, Attr); } /// Determine whether the given integral value is representable within diff --git a/clang/test/Layout/itanium-pack-and-align.cpp b/clang/test/Layout/itanium-pack-and-align.cpp new file mode 100644 index 00000000000..64569168e47 --- /dev/null +++ b/clang/test/Layout/itanium-pack-and-align.cpp @@ -0,0 +1,26 @@ +// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm-only -fdump-record-layouts %s \ +// RUN: | FileCheck %s + +struct S { + char x; + int y; +} __attribute__((packed, aligned(8))); + +struct alignas(8) T { + char x; + int y; +} __attribute__((packed)); + +S s; +T t; +// CHECK: 0 | struct T +// CHECK-NEXT: 0 | char x +// CHECK-NEXT: 1 | int y +// CHECK-NEXT: | [sizeof=8, dsize=8, align=8, +// CHECK-NEXT: | nvsize=8, nvalign=8] + +// CHECK: 0 | struct S +// CHECK-NEXT: 0 | char x +// CHECK-NEXT: 1 | int y +// CHECK-NEXT: | [sizeof=8, dsize=8, align=8, +// CHECK-NETX: | nvsize=8, nvalign=8] |
