Ignore weak_import on Objective-C property and method declarations on

all platforms, not just darwin. Fixes the regression in this test case.

llvm-svn: 128147

1 files changed, 5 insertions, 4 deletions

diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 3f33f144e48..31523229c59 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -1436,10 +1436,11 @@ static void HandleWeakImportAttr(Decl *D, const AttributeList &Attr, Sema &S) {
       S.Diag(Attr.getLoc(),
              diag::warn_attribute_weak_import_invalid_on_definition)
         << "weak_import" << 2 /*variable and function*/;
-    else if (S.Context.Target.getTriple().getOS() != llvm::Triple::Darwin ||
-             (!isa<ObjCInterfaceDecl>(D) &&
-              !isa<ObjCPropertyDecl>(D) &&
-              !isa<ObjCMethodDecl>(D)))
+    else if (isa<ObjCPropertyDecl>(D) || isa<ObjCMethodDecl>(D) ||
+             (S.Context.Target.getTriple().getOS() == llvm::Triple::Darwin &&
+              isa<ObjCInterfaceDecl>(D))) {
+      // Nothing to warn about here.
+    } else
       S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type)
         << Attr.getName() << ExpectedVariableOrFunction;