simplify some code.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@45235 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 14 insertions, 6 deletions

diff --git a/Sema/SemaChecking.cpp b/Sema/SemaChecking.cpp
index 8bb263e84e..46afe7fea9 100644
--- a/Sema/SemaChecking.cpp
+++ b/Sema/SemaChecking.cpp
@@ -125,6 +125,8 @@ bool Sema::CheckBuiltinCFStringArgument(Expr* Arg) {
   return false;
 }
 
+/// SemaBuiltinVAStart - Check the arguments to __builtin_va_start for validity.
+/// Emit an error and return true on failure, return false on success.
 bool Sema::SemaBuiltinVAStart(Expr *Fn, Expr** Args, unsigned NumArgs) {
   if (NumArgs > 2) {
     Diag(Args[2]->getLocStart(), 
@@ -133,14 +135,15 @@ bool Sema::SemaBuiltinVAStart(Expr *Fn, Expr** Args, unsigned NumArgs) {
     return true;
   }
   
-  FunctionTypeProto *Proto;
+  // Determine whether the current function is variadic or not.
+  bool isVariadic;
   if (CurFunctionDecl)
-    Proto = cast<FunctionTypeProto>(CurFunctionDecl->getType());
+    isVariadic =
+      cast<FunctionTypeProto>(CurFunctionDecl->getType())->isVariadic();
   else
-    Proto =
-      cast<FunctionTypeProto>(ObjcGetTypeForMethodDefinition(CurMethodDecl));
+    isVariadic = CurMethodDecl->isVariadic();
   
-  if (!Proto->isVariadic()) {
+  if (!isVariadic) {
     Diag(Fn->getLocStart(), diag::err_va_start_used_in_non_variadic_function);
     return true;
   }
diff --git a/Sema/SemaExpr.cpp b/Sema/SemaExpr.cpp
index 8ca2879b00..9ae5255155 100644
--- a/Sema/SemaExpr.cpp
+++ b/Sema/SemaExpr.cpp
@@ -680,8 +680,13 @@ ActOnCallExpr(ExprTy *fn, SourceLocation LParenLoc,
   if (ImplicitCastExpr *IcExpr = dyn_cast<ImplicitCastExpr>(Fn))
     if (DeclRefExpr *DRExpr = dyn_cast<DeclRefExpr>(IcExpr->getSubExpr()))
       if (FunctionDecl *FDecl = dyn_cast<FunctionDecl>(DRExpr->getDecl()))
-        if (CheckFunctionCall(Fn, RParenLoc, FDecl, Args, NumArgsInCall))
+        if (CheckFunctionCall(Fn, RParenLoc, FDecl, Args, NumArgsInCall)) {
+          // Function rejected, delete sub-ast's.
+          delete Fn;
+          for (unsigned i = 0; i != NumArgsInCall; ++i)
+            delete Args[i];
           return true;
+        }
 
   return new CallExpr(Fn, Args, NumArgsInCall, resultType, RParenLoc);
 }