Add a warning for questionable va_args usage.

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

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 1bdabadf4509da16ef2e5682c04330e20b5507c6..e81fc491749a21be7a37f4e5022fa0c0d801a849 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1464,6 +1464,8 @@ def err_va_start_used_in_non_variadic_function : Error<
   "'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'">;
 

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index a43c2c370e3cc8683a062c16b161acac53ea461f..a4335eaf627b2566223d7433d4df04c9d2d17ce4 100644 (file)
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -4726,11 +4726,18 @@ Sema::OwningExprResult Sema::ActOnVAArg(SourceLocation BuiltinLoc,
 
   AssignConvertType ConvResult = 
     CheckAssignmentConstraints(VaListType, E->getType());
-  if (ConvResult != Compatible &&
-      ConvResult != CompatiblePointerDiscardsQualifiers)
+  switch (ConvResult) {
+  case Compatible: break;  // Everything good.
+  case CompatiblePointerDiscardsQualifiers:
+    Diag(E->getLocStart(), diag::warn_va_arg_with_qualified_va_list)
+      << E->getType() << E->getSourceRange();
+    break;
+
+  default:
     return ExprError(Diag(E->getLocStart(),
                          diag::err_first_argument_to_va_arg_not_of_type_va_list)
       << E->getType() << E->getSourceRange());
+  }
 
   // FIXME: Check that type is complete/non-abstract
   // FIXME: Warn if a non-POD type is passed in.

diff --git a/test/Sema/varargs-x86-64.c b/test/Sema/varargs-x86-64.c
new file mode 100644 (file)
index 0000000..7953ead
--- /dev/null
+++ b/test/Sema/varargs-x86-64.c
@@ -0,0 +1,8 @@
+// RUN: clang-cc -fsyntax-only -verify %s -triple x86_64-apple-darwin9
+
+// rdar://6726818
+void f1() {
+  const __builtin_va_list args2;
+  (void)__builtin_va_arg(args2, int); // expected-warning {{va_arg applied to va_list type 'struct __va_list_tag const *' with unexpected qualifiers}}
+}
+

diff --git a/test/Sema/varargs.c b/test/Sema/varargs.c
index 7255f9fc061512940c23bd5cf11d5cb8cdfb4656..d5b4aac6f7d011ee4905b0455d5a1ab85099603c 100644 (file)
--- a/test/Sema/varargs.c
+++ b/test/Sema/varargs.c
@@ -61,9 +61,3 @@ void f7(int a, ...) {
   __builtin_va_end(ap);
 }
 
-// rdar://6726818
-void f8() {
-  const __builtin_va_list args2;
-  (void)__builtin_va_arg(args2, int);
-}
-