[cfe-commits] r79053 - in /cfe/trunk: lib/Sema/SemaDeclAttr.cpp test/Sema/attr-malloc.c

[Ted Kremenek]

Author: kremenek
Date: Fri Aug 14 17:03:27 2009
New Revision: 79053

URL: http://llvm.org/viewvc/llvm-project?rev=79053&view=rev
Log:
Per Eli Friedman's feedback, handle attribute 'malloc' being applied to
declarations of function pointers.

Modified:
    cfe/trunk/lib/Sema/SemaDeclAttr.cpp
    cfe/trunk/test/Sema/attr-malloc.c

Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=79053&r1=79052&r2=79053&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Fri Aug 14 17:03:27 2009
@@ -437,16 +437,16 @@
     S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 0;
     return;
   }
-
-  const FunctionDecl *FD = dyn_cast<FunctionDecl>(d);
-
-  if (!FD) {
+  
+  const FunctionType *FT = getFunctionType(d, false);
+  
+  if (!FT) {
     S.Diag(Attr.getLoc(), diag::warn_attribute_wrong_decl_type)
       << Attr.getName() << 0 /*function*/;
     return;
   }
 
-  QualType RetTy = FD->getResultType();
+  QualType RetTy = FT->getResultType();
   
   if (!(RetTy->isAnyPointerType() || RetTy->isBlockPointerType())) {
     S.Diag(Attr.getLoc(), diag::warn_attribute_malloc_pointer_only);

Modified: cfe/trunk/test/Sema/attr-malloc.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/attr-malloc.c?rev=79053&r1=79052&r2=79053&view=diff

==============================================================================
--- cfe/trunk/test/Sema/attr-malloc.c (original)
+++ cfe/trunk/test/Sema/attr-malloc.c Fri Aug 14 17:03:27 2009
@@ -7,12 +7,14 @@
 
 void  returns_void  (void) __attribute((malloc)); // expected-warning {{functions returning pointer type}}
 int   returns_int   (void) __attribute((malloc)); // expected-warning {{functions returning pointer type}}
-int * returns_intptr(void) __attribute((malloc));
+int * returns_intptr(void) __attribute((malloc)); // no-warning
 typedef int * iptr;
-iptr  returns_iptr  (void) __attribute((malloc));
+iptr  returns_iptr  (void) __attribute((malloc)); // no-warning
+
+__attribute((malloc)) void *(*f)(); // no-warning
 
 __attribute((malloc))
-void * xalloc(unsigned n) { return malloc(n); }
+void * xalloc(unsigned n) { return malloc(n); } // no-warning
 // RUN: grep 'define noalias .* @xalloc(' %t &&
 
 #define malloc_like __attribute((__malloc__))