[cfe-commits] r72039 - in /cfe/trunk/lib/Sema: Sema.h SemaChecking.cpp SemaExpr.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Mon May 18 16:05:18 2009
New Revision: 72039

URL: http://llvm.org/viewvc/llvm-project?rev=72039&view=rev
Log:
more printf attribute on block declaration and
checking when block is envoked. In progress.

Modified:
    cfe/trunk/lib/Sema/Sema.h
    cfe/trunk/lib/Sema/SemaChecking.cpp
    cfe/trunk/lib/Sema/SemaExpr.cpp

Modified: cfe/trunk/lib/Sema/Sema.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.h?rev=72039&r1=72038&r2=72039&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/Sema.h (original)
+++ cfe/trunk/lib/Sema/Sema.h Mon May 18 16:05:18 2009
@@ -2700,6 +2700,8 @@
 private:
   Action::OwningExprResult CheckFunctionCall(FunctionDecl *FDecl,
                                              CallExpr *TheCall);
+  
+  Action::OwningExprResult CheckBlockCall(NamedDecl *NDecl, CallExpr *TheCall);
   SourceLocation getLocationOfStringLiteralByte(const StringLiteral *SL,
                                                 unsigned ByteNo) const;
   bool CheckObjCString(Expr *Arg);

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

==============================================================================
--- cfe/trunk/lib/Sema/SemaChecking.cpp (original)
+++ cfe/trunk/lib/Sema/SemaChecking.cpp Mon May 18 16:05:18 2009
@@ -181,6 +181,34 @@
   return move(TheCallResult);
 }
 
+Action::OwningExprResult
+Sema::CheckBlockCall(NamedDecl *NDecl, CallExpr *TheCall) {
+
+  OwningExprResult TheCallResult(Owned(TheCall));
+  // Printf checking.
+  const FormatAttr *Format = NDecl->getAttr<FormatAttr>();
+  if (!Format)
+    return move(TheCallResult);
+  const VarDecl *V = dyn_cast<VarDecl>(NDecl);
+  if (!V)
+    return move(TheCallResult);
+  QualType Ty = V->getType();
+  if (!Ty->isBlockPointerType())
+    return move(TheCallResult);
+  if (Format->getType() == "printf") {
+      bool HasVAListArg = Format->getFirstArg() == 0;
+      if (!HasVAListArg) {
+        const FunctionType *FT = 
+          Ty->getAsBlockPointerType()->getPointeeType()->getAsFunctionType();
+        if (const FunctionProtoType *Proto = dyn_cast<FunctionProtoType>(FT))
+          HasVAListArg = !Proto->isVariadic();
+      }
+      CheckPrintfArguments(TheCall, HasVAListArg, Format->getFormatIdx() - 1,
+                           HasVAListArg ? 0 : Format->getFirstArg() - 1);
+  }
+  return move(TheCallResult);
+}
+
 /// SemaBuiltinAtomicOverloaded - We have a call to a function like
 /// __sync_fetch_and_add, which is an overloaded function based on the pointer
 /// type of its first argument.  The main ActOnCallExpr routines have already

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

==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Mon May 18 16:05:18 2009
@@ -2692,6 +2692,8 @@
   // Do special checking on direct calls to functions.
   if (FDecl)
     return CheckFunctionCall(FDecl, TheCall.take());
+  if (NDecl)
+    return CheckBlockCall(NDecl, TheCall.take());
 
   return Owned(TheCall.take());
 }