Use a single function for doing vararg argument promotion. Also, make sure to do the promotion before checking the type - fixes PR3340.

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

1 files changed, 2 insertions, 9 deletions

diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp
index a73f386dab..548389db37 100644
--- a/lib/Sema/SemaExprObjC.cpp
+++ b/lib/Sema/SemaExprObjC.cpp
@@ -156,15 +156,8 @@ bool Sema::CheckMessageArgumentTypes(Expr **Args, unsigned NumArgs,
 
   // Promote additional arguments to variadic methods.
   if (Method->isVariadic()) {
-    for (unsigned i = NumNamedArgs; i < NumArgs; ++i) {
-      if (!Args[i]->getType()->isPODType()) {
-        Diag(Args[i]->getLocStart(), 
-             diag::warn_cannot_pass_non_pod_arg_to_vararg) << 
-        Args[i]->getType() << 2; // Method
-      }
-      
-      DefaultArgumentPromotion(Args[i]);
-    }
+    for (unsigned i = NumNamedArgs; i < NumArgs; ++i)
+      DefaultVariadicArgumentPromotion(Args[i], VariadicMethod);
   } else {
     // Check for extra arguments to non-variadic methods.
     if (NumArgs != NumNamedArgs) {