[cfe-commits] r128147 - in /cfe/trunk: lib/Sema/SemaDeclAttr.cpp test/SemaObjC/ignore-weakimport-method.m

[Douglas Gregor]

Author: dgregor
Date: Wed Mar 23 08:27:51 2011
New Revision: 128147

URL: http://llvm.org/viewvc/llvm-project?rev=128147&view=rev
Log:
Ignore weak_import on Objective-C property and method declarations on
all platforms, not just darwin. Fixes the regression in this test case.

Modified:
    cfe/trunk/lib/Sema/SemaDeclAttr.cpp
    cfe/trunk/test/SemaObjC/ignore-weakimport-method.m

Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=128147&r1=128146&r2=128147&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Wed Mar 23 08:27:51 2011
@@ -1436,10 +1436,11 @@
       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;
 

Modified: cfe/trunk/test/SemaObjC/ignore-weakimport-method.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/ignore-weakimport-method.m?rev=128147&r1=128146&r2=128147&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/ignore-weakimport-method.m (original)
+++ cfe/trunk/test/SemaObjC/ignore-weakimport-method.m Wed Mar 23 08:27:51 2011
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1  -fsyntax-only -verify %s
-
 @interface foo 
 + (void) cx __attribute__((weak_import));
 - (void) x __attribute__((weak_import));