2 files changed, 16 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index fee732f2f56..e32da244de9 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -1939,6 +1939,20 @@ Sema::DeclTy *Sema::ActOnTagStruct(Scope *S, TagDecl::TagKind Kind, TagKind TK,
     // Add it to the decl chain.
     PushOnScopeChains(New, S);
   }
+
+  // Handle #pragma pack: if the #pragma pack stack has non-default
+  // alignment, make up a packed attribute for this decl. These
+  // attributes are checked when the ASTContext lays out the
+  // structure.
+  //
+  // It is important for implementing the correct semantics that this
+  // happen here (in act on tag decl). The #pragma pack stack is
+  // maintained as a result of parser callbacks which can occur at
+  // many points during the parsing of a struct declaration (because
+  // the #pragma tokens are effectively skipped over during the
+  // parsing of the struct).
+  if (unsigned Alignment = PackContext.getAlignment())
+    New->addAttr(new PackedAttr(Alignment * 8));
   
   if (Attr)
     ProcessDeclAttributeList(New, Attr);
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 3ab0c91cb9c..5c04bf0b922 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -256,7 +256,7 @@ static void HandlePackedAttr(Decl *d, const AttributeList &Attr, Sema &S) {
   }
   
   if (TagDecl *TD = dyn_cast<TagDecl>(d))
-    TD->addAttr(new PackedAttr());
+    TD->addAttr(new PackedAttr(1));
   else if (FieldDecl *FD = dyn_cast<FieldDecl>(d)) {
     // If the alignment is less than or equal to 8 bits, the packed attribute
     // has no effect.
@@ -266,7 +266,7 @@ static void HandlePackedAttr(Decl *d, const AttributeList &Attr, Sema &S) {
              diag::warn_attribute_ignored_for_field_of_type,
              Attr.getName()->getName(), FD->getType().getAsString());
     else
-      FD->addAttr(new PackedAttr());
+      FD->addAttr(new PackedAttr(1));
   } else
     S.Diag(Attr.getLoc(), diag::warn_attribute_ignored,
            Attr.getName()->getName());