diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 5 | ||||
| -rw-r--r-- | test/Sema/varargs.c | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 55eaaa4bc8..a43c2c370e 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -4724,7 +4724,10 @@ Sema::OwningExprResult Sema::ActOnVAArg(SourceLocation BuiltinLoc, Expr *E = static_cast<Expr*>(expr.get()); UsualUnaryConversions(E); - if (CheckAssignmentConstraints(VaListType, E->getType()) != Compatible) + AssignConvertType ConvResult = + CheckAssignmentConstraints(VaListType, E->getType()); + if (ConvResult != Compatible && + ConvResult != CompatiblePointerDiscardsQualifiers) return ExprError(Diag(E->getLocStart(), diag::err_first_argument_to_va_arg_not_of_type_va_list) << E->getType() << E->getSourceRange()); diff --git a/test/Sema/varargs.c b/test/Sema/varargs.c index 434e4ce291..7255f9fc06 100644 --- a/test/Sema/varargs.c +++ b/test/Sema/varargs.c @@ -60,3 +60,10 @@ void f7(int a, ...) { int *x = &__builtin_va_arg(ap, int); // expected-error {{address expression must be an lvalue or a function designator}} __builtin_va_end(ap); } + +// rdar://6726818 +void f8() { + const __builtin_va_list args2; + (void)__builtin_va_arg(args2, int); +} + |