[cfe-commits] r141518 - in /cfe/trunk: lib/Sema/SemaDeclAttr.cpp test/SemaTemplate/attributes.cpp

[Douglas Gregor]

Author: dgregor
Date: Sun Oct  9 17:26:49 2011
New Revision: 141518

URL: http://llvm.org/viewvc/llvm-project?rev=141518&view=rev
Log:
For the various CF and NS attributes, don't complain if the parameter
or return types are dependent. Fixes PR9049.

Modified:
    cfe/trunk/lib/Sema/SemaDeclAttr.cpp
    cfe/trunk/test/SemaTemplate/attributes.cpp

Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=141518&r1=141517&r2=141518&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Sun Oct  9 17:26:49 2011
@@ -3136,10 +3136,14 @@
 //===----------------------------------------------------------------------===//
 
 static bool isValidSubjectOfNSAttribute(Sema &S, QualType type) {
-  return type->isObjCObjectPointerType() || S.Context.isObjCNSObjectType(type);
+  return type->isDependentType() || 
+         type->isObjCObjectPointerType() || 
+         S.Context.isObjCNSObjectType(type);
 }
 static bool isValidSubjectOfCFAttribute(Sema &S, QualType type) {
-  return type->isPointerType() || isValidSubjectOfNSAttribute(S, type);
+  return type->isDependentType() || 
+         type->isPointerType() || 
+         isValidSubjectOfNSAttribute(S, type);
 }
 
 static void handleNSConsumedAttr(Sema &S, Decl *D, const AttributeList &Attr) {

Modified: cfe/trunk/test/SemaTemplate/attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/attributes.cpp?rev=141518&r1=141517&r2=141518&view=diff
==============================================================================
--- cfe/trunk/test/SemaTemplate/attributes.cpp (original)
+++ cfe/trunk/test/SemaTemplate/attributes.cpp Sun Oct  9 17:26:49 2011
@@ -19,3 +19,16 @@
   check_alignment<3>::t c3; // expected-note 2 {{in instantiation}}
   check_alignment<4>::t c4;
 }
+
+namespace PR9049 {
+  extern const void *CFRetain(const void *ref);
+
+  template<typename T> __attribute__((cf_returns_retained))
+  inline T WBCFRetain(T aValue) { return aValue ? (T)CFRetain(aValue) : (T)0; }
+
+
+  extern void CFRelease(const void *ref);
+
+  template<typename T>
+  inline void WBCFRelease(__attribute__((cf_consumed)) T aValue) { if(aValue) CFRelease(aValue); }
+}