Fixes a minor hick up to my last patch.

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

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 69d9c1d9980dd80c39ef90d0d2d5e0972bf235fe..f3b7ad713dc71f722a3465a7596247a356d5d797 100644 (file)
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -2321,11 +2321,15 @@ static inline
 bool containsInvalidMethodImplAttribute(ObjCMethodDecl *IMD,
                                         const AttrVec &A) {
   // If method is only declared in implementation (private method),
-  // or method declared in interface has no attribute. 
   // No need to issue any diagnostics on method definition with attributes.
-  if (!IMD || !IMD->hasAttrs())
+  if (!IMD)
     return false;
 
+  // method declared in interface has no attribute. 
+  // But implementation has attributes. This is invalid
+  if (!IMD->hasAttrs())
+    return true;
+
   const AttrVec &D = IMD->getAttrs();
   if (D.size() != A.size())
     return true;

diff --git a/test/SemaObjC/method-attributes.m b/test/SemaObjC/method-attributes.m
index f7f647bd4603fbe59890ecb442fa3d4d511b7b1e..a560e7432fc47c7a4c54e24595eb66150161e79f 100644 (file)
--- a/test/SemaObjC/method-attributes.m
+++ b/test/SemaObjC/method-attributes.m
@@ -20,7 +20,7 @@
 @end
 
 @implementation INTF
-- (int) foo: (int)arg1  __attribute__((deprecated)){
+- (int) foo: (int)arg1  __attribute__((deprecated)){ // expected-warning {{method attribute can only be specified}}
         return 10;
 }
 - (int) foo1: (int)arg1 {