[cfe-commits] r68447 - in /cfe/trunk: include/clang/Basic/DiagnosticSemaKinds.td lib/Sema/SemaExpr.cpp test/Sema/varargs-x86-64.c

[Chris Lattner]

Author: lattner
Date: Mon Apr  6 12:07:34 2009
New Revision: 68447

URL: http://llvm.org/viewvc/llvm-project?rev=68447&view=rev
Log:
Daniel convinced me that accepting "const va_list" arguments to va_arg is
a really really bad idea.  Now that we emit an error about the unpromoted
type, users should be able to understand what is going on.

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
    cfe/trunk/lib/Sema/SemaExpr.cpp
    cfe/trunk/test/Sema/varargs-x86-64.c

Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=68447&r1=68446&r2=68447&view=diff

==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Mon Apr  6 12:07:34 2009
@@ -1464,8 +1464,6 @@
   "'va_start' used in function with fixed args">;
 def warn_second_parameter_of_va_start_not_last_named_argument : Warning<
   "second parameter of 'va_start' not last named argument">;
-def warn_va_arg_with_qualified_va_list : Warning<
-  "va_arg applied to va_list type %0 with unexpected qualifiers">;
 def err_first_argument_to_va_arg_not_of_type_va_list : Error<
   "first argument to 'va_arg' is of type %0 and not 'va_list'">;
 

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

==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Mon Apr  6 12:07:34 2009
@@ -4725,16 +4725,7 @@
   // Make sure the input expression also decays appropriately.
   UsualUnaryConversions(E);
 
-  AssignConvertType ConvResult = 
-    CheckAssignmentConstraints(VaListType, E->getType());
-  switch (ConvResult) {
-  case Compatible: break;  // Everything good.
-  case CompatiblePointerDiscardsQualifiers:
-    Diag(E->getLocStart(), diag::warn_va_arg_with_qualified_va_list)
-      << OrigExpr->getType() << E->getSourceRange();
-    break;
-
-  default:
+  if (CheckAssignmentConstraints(VaListType, E->getType()) != Compatible) {
     return ExprError(Diag(E->getLocStart(),
                          diag::err_first_argument_to_va_arg_not_of_type_va_list)
       << OrigExpr->getType() << E->getSourceRange());

Modified: cfe/trunk/test/Sema/varargs-x86-64.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/varargs-x86-64.c?rev=68447&r1=68446&r2=68447&view=diff

==============================================================================
--- cfe/trunk/test/Sema/varargs-x86-64.c (original)
+++ cfe/trunk/test/Sema/varargs-x86-64.c Mon Apr  6 12:07:34 2009
@@ -3,6 +3,6 @@
 // rdar://6726818
 void f1() {
   const __builtin_va_list args2;
-  (void)__builtin_va_arg(args2, int); // expected-warning {{va_arg applied to va_list type '__builtin_va_list const' with unexpected qualifiers}}
+  (void)__builtin_va_arg(args2, int); // expected-error {{first argument to 'va_arg' is of type '__builtin_va_list const' and not 'va_list'}}
 }