diff options
author | Anders Carlsson <andersca@mac.com> | 2009-08-08 18:23:56 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@mac.com> | 2009-08-08 18:23:56 +0000 |
commit | a860e755f1f9f071b6a6a2f96128a6a258f5c331 (patch) | |
tree | f762526a00bcade08890b617ddfa128dd8fd9562 /lib/AST/RecordLayoutBuilder.cpp | |
parent | df31e091126da6a5c08303a78b562d00e7fd4e20 (diff) |
Introduce a new PragmaPack attribute, and use it for #pragma pack. The PackedAttr now only represents __attribute__((packed)).
This is necessary because #pragma pack and __attribute__((packed)) have different semantics. No functionality change yet, but this lays the groundwork for fixing a record layout bug.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@78483 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/RecordLayoutBuilder.cpp')
-rw-r--r-- | lib/AST/RecordLayoutBuilder.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/AST/RecordLayoutBuilder.cpp b/lib/AST/RecordLayoutBuilder.cpp index 1d96c1a20b..8a18197a56 100644 --- a/lib/AST/RecordLayoutBuilder.cpp +++ b/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! |