Add missing check to warning for packed attribute. PR14259.

llvm-svn: 167510

diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 6db30bea9d58ef0ed8a04790a2fc00f564b92974..aef87c62f4f72e5a5befa23e8286b1f7a42fb783 100644 (file)
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -963,7 +963,8 @@ static void handlePackedAttr(Sema &S, Decl *D, const AttributeList &Attr) {
   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.
-    if (!FD->getType()->isIncompleteType() &&
+    if (!FD->getType()->isDependentType() &&
+        !FD->getType()->isIncompleteType() &&
         S.Context.getTypeAlign(FD->getType()) <= 8)
       S.Diag(Attr.getLoc(), diag::warn_attribute_ignored_for_field_of_type)
         << Attr.getName() << FD->getType();

diff --git a/clang/test/SemaTemplate/instantiate-attr.cpp b/clang/test/SemaTemplate/instantiate-attr.cpp
index 45136f6f60a0468b614a89d2ac803b4eeea9e7a3..1e94614f371daa9415f99e37dafbe579185df215 100644 (file)
--- a/clang/test/SemaTemplate/instantiate-attr.cpp
+++ b/clang/test/SemaTemplate/instantiate-attr.cpp
@@ -25,3 +25,12 @@ namespace test1 {
   int test1[__builtin_offsetof(type, a) == 0 ? 1 : -1];
   int test2[__builtin_offsetof(type, b) == 4 ? 1 : -1];
 }
+
+namespace test2 {
+  template <class type>
+  struct fastscriptmember {
+      type Member __attribute__ ((packed));
+      char x;
+  };
+  int test0[sizeof(fastscriptmember<int>) == 5 ? 1 : -1];
+}