ignore weak_import attribute on objc method decls.

llvm-svn: 70901

2 files changed, 9 insertions, 2 deletions

diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 8aec8c8e07f..b29bcec1aa7 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -775,8 +775,8 @@ static void HandleWeakImportAttr(Decl *D, const AttributeList &Attr, Sema &S) {
     isDef = (!VD->hasExternalStorage() || VD->getInit());
   } else if (FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
     isDef = FD->getBody(S.Context);
-  } else if (isa<ObjCPropertyDecl>(D)) {
-    // We ignore weak import on properties
+  } else if (isa<ObjCPropertyDecl>(D) || isa<ObjCMethodDecl>(D)) {
+    // We ignore weak import on properties and methods
     return;
   } else {
     S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type)
diff --git a/clang/test/SemaObjC/ignore-weakimport-method.m b/clang/test/SemaObjC/ignore-weakimport-method.m
new file mode 100644
index 00000000000..369d9023acf
--- /dev/null
+++ b/clang/test/SemaObjC/ignore-weakimport-method.m
@@ -0,0 +1,7 @@
+// RUN: clang-cc  -fsyntax-only -verify %s
+
+@interface foo 
++ (void) cx __attribute__((weak_import));
+- (void) x __attribute__((weak_import));
+@end
+