diff options
Diffstat (limited to 'clang/lib/AST/RecordLayoutBuilder.cpp')
| -rw-r--r-- | clang/lib/AST/RecordLayoutBuilder.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp index 1d96c1a20b7..8a18197a569 100644 --- a/clang/lib/AST/RecordLayoutBuilder.cpp +++ b/clang/lib/AST/RecordLayoutBuilder.cpp @@ -197,9 +197,11 @@ void ASTRecordLayoutBuilder::LayoutBaseNonVirtually(const CXXRecordDecl *RD) { void ASTRecordLayoutBuilder::Layout(const RecordDecl *D) { IsUnion = D->isUnion(); - - if (const PackedAttr* PA = D->getAttr<PackedAttr>()) - StructPacking = PA->getAlignment(); + + if (D->hasAttr<PackedAttr>()) + StructPacking = 1; + if (const PragmaPackAttr *PPA = D->getAttr<PragmaPackAttr>()) + StructPacking = PPA->getAlignment(); if (const AlignedAttr *AA = D->getAttr<AlignedAttr>()) UpdateAlignment(AA->getAlignment()); @@ -240,8 +242,8 @@ void ASTRecordLayoutBuilder::Layout(const ObjCInterfaceDecl *D, NextOffset = Size; } - if (const PackedAttr *PA = D->getAttr<PackedAttr>()) - StructPacking = PA->getAlignment(); + if (D->hasAttr<PackedAttr>()) + StructPacking = 1; if (const AlignedAttr *AA = D->getAttr<AlignedAttr>()) UpdateAlignment(AA->getAlignment()); @@ -273,8 +275,8 @@ void ASTRecordLayoutBuilder::LayoutField(const FieldDecl *D) { // FIXME: Should this override struct packing? Probably we want to // take the minimum? - if (const PackedAttr *PA = D->getAttr<PackedAttr>()) - FieldPacking = PA->getAlignment(); + if (D->hasAttr<PackedAttr>()) + FieldPacking = 1; if (const Expr *BitWidthExpr = D->getBitWidth()) { // TODO: Need to check this algorithm on other targets! |
