<div dir="ltr">On Thu, Jun 20, 2013 at 2:03 PM, Richard Trieu <span dir="ltr"><<a href="mailto:rtrieu@google.com" target="_blank">rtrieu@google.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rtrieu<br>
Date: Thu Jun 20 16:03:13 2013<br>
New Revision: 184470<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=184470&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=184470&view=rev</a><br>
Log:<br>
Extend -Wnon-pod-varargs to check calls made from function pointers.<br>
<br>
Modified:<br>
    cfe/trunk/include/clang/Sema/Sema.h<br>
    cfe/trunk/lib/Sema/SemaChecking.cpp<br>
    cfe/trunk/lib/Sema/SemaExpr.cpp<br>
    cfe/trunk/test/SemaCXX/vararg-non-pod.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Sema/Sema.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=184470&r1=184469&r2=184470&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Sema.h?rev=184470&r1=184469&r2=184470&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/include/clang/Sema/Sema.h (original)<br>
+++ cfe/trunk/include/clang/Sema/Sema.h Thu Jun 20 16:03:13 2013<br>
@@ -7461,8 +7461,8 @@ private:<br>
                          const FunctionProtoType *Proto);<br>
   bool CheckObjCMethodCall(ObjCMethodDecl *Method, SourceLocation loc,<br>
                            ArrayRef<const Expr *> Args);<br>
-  bool CheckBlockCall(NamedDecl *NDecl, CallExpr *TheCall,<br>
-                      const FunctionProtoType *Proto);<br>
+  bool CheckPointerCall(NamedDecl *NDecl, CallExpr *TheCall,<br>
+                        const FunctionProtoType *Proto);<br>
   void CheckConstructorCall(FunctionDecl *FDecl,<br>
                             ArrayRef<const Expr *> Args,<br>
                             const FunctionProtoType *Proto,<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaChecking.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=184470&r1=184469&r2=184470&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=184470&r1=184469&r2=184470&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaChecking.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaChecking.cpp Thu Jun 20 16:03:13 2013<br>
@@ -597,18 +597,24 @@ bool Sema::CheckObjCMethodCall(ObjCMetho<br>
   return false;<br>
 }<br>
<br>
-bool Sema::CheckBlockCall(NamedDecl *NDecl, CallExpr *TheCall,<br>
-                          const FunctionProtoType *Proto) {<br>
+bool Sema::CheckPointerCall(NamedDecl *NDecl, CallExpr *TheCall,<br>
+                            const FunctionProtoType *Proto) {<br>
   const VarDecl *V = dyn_cast<VarDecl>(NDecl);<br>
   if (!V)<br>
     return false;<br>
<br>
   QualType Ty = V->getType();<br>
-  if (!Ty->isBlockPointerType())<br>
+  if (!Ty->isBlockPointerType() && !Ty->isFunctionPointerType())<br>
     return false;<br>
<br>
-  VariadicCallType CallType =<br>
-      Proto && Proto->isVariadic() ? VariadicBlock : VariadicDoesNotApply ;<br>
+  VariadicCallType CallType;<br>
+  if (!Proto) {<br>
+    CallType = VariadicDoesNotApply;<br>
+  } else if (Ty->isBlockPointerType()) {<br>
+    CallType = VariadicBlock;<br>
+  } else { // Ty->isFunctionPointerType()<br>
+    CallType = VariadicFunction;<br>
+  }<br>
   unsigned NumProtoArgs = Proto ? Proto->getNumArgs() : 0;<br>
<br>
   checkCall(NDecl,<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaExpr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=184470&r1=184469&r2=184470&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=184470&r1=184469&r2=184470&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Thu Jun 20 16:03:13 2013<br>
@@ -4464,7 +4464,7 @@ Sema::BuildResolvedCallExpr(Expr *Fn, Na<br>
     if (BuiltinID)<br>
       return CheckBuiltinFunctionCall(BuiltinID, TheCall);<br>
   } else if (NDecl) {<br>
-    if (CheckBlockCall(NDecl, TheCall, Proto))<br>
+    if (CheckPointerCall(NDecl, TheCall, Proto))<br>
       return ExprError();<br>
   }<br></blockquote><div><br></div><div>What if someone does e.g. (FuncReturningVarargsFuncPtr())(a,b,c)?</div><div> </div><div>-Eli</div></div><br></div></div>