Fix invalid error about duplicate declaration of padding bit field in

an interface.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70652 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 3ae2ba14c910fa7cbf4e859d6c377d93fd5d0451..9647740b14c361202d7bd06b797d2e313fb0cb80 100644 (file)
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -3980,12 +3980,14 @@ void Sema::ActOnFields(Scope* S,
         for (ObjCInterfaceDecl::ivar_iterator IVI = ID->ivar_begin(), 
              IVE = ID->ivar_end(); IVI != IVE; ++IVI) {
           ObjCIvarDecl* Ivar = (*IVI);
-          IdentifierInfo *II = Ivar->getIdentifier();
-          ObjCIvarDecl* prevIvar =
-            ID->getSuperClass()->lookupInstanceVariable(Context, II);
-          if (prevIvar) {
-            Diag(Ivar->getLocation(), diag::err_duplicate_member) << II;
-            Diag(prevIvar->getLocation(), diag::note_previous_declaration);
+
+          if (IdentifierInfo *II = Ivar->getIdentifier()) {
+            ObjCIvarDecl* prevIvar =
+              ID->getSuperClass()->lookupInstanceVariable(Context, II);
+            if (prevIvar) {
+              Diag(Ivar->getLocation(), diag::err_duplicate_member) << II;
+              Diag(prevIvar->getLocation(), diag::note_previous_declaration);
+            }
           }
         }
       }

diff --git a/test/SemaObjC/duplicate-ivar-check.m b/test/SemaObjC/duplicate-ivar-check.m
index a5e2cb918e0638769e4ad78a2d1069ef9a736254..7cab982e6e21dd1d4b523caacffecfd9374e50c4 100644 (file)
--- a/test/SemaObjC/duplicate-ivar-check.m
+++ b/test/SemaObjC/duplicate-ivar-check.m
@@ -3,6 +3,7 @@
 @interface B1 {
 @public
   double fill_B;       // expected-note {{previous declaration is here}}
+  unsigned : 0;
 }
 @end
 
@@ -10,6 +11,7 @@
 @public
   int one;     // expected-note {{previous declaration is here}}
   int one;     // expected-error {{duplicate member 'one'}}
+  unsigned : 0;
 }
 @end