diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 2 | ||||
| -rw-r--r-- | test/Sema/va_arg_x86_64.c | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 4781ffb578..2bb3983acf 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -2613,6 +2613,8 @@ Sema::ExprResult Sema::ActOnVAArg(SourceLocation BuiltinLoc, // a pointer for va_arg. if (VaListType->isArrayType()) VaListType = Context.getArrayDecayedType(VaListType); + // Make sure the input expression also decays appropriately. + UsualUnaryConversions(E); if (CheckAssignmentConstraints(VaListType, E->getType()) != Compatible) return Diag(E->getLocStart(), diff --git a/test/Sema/va_arg_x86_64.c b/test/Sema/va_arg_x86_64.c index 86511349c3..3e51b8628c 100644 --- a/test/Sema/va_arg_x86_64.c +++ b/test/Sema/va_arg_x86_64.c @@ -1,6 +1,16 @@ // RUN: clang -fsyntax-only -verify -triple=x86_64-unknown-freebsd7.0 %s +// PR2631 char* foo(char *fmt, __builtin_va_list ap) { return __builtin_va_arg((ap), char *); } + +// PR2692 +typedef __builtin_va_list va_list; +static char *f (char * (*g) (char **, int), char **p, ...) { + char *s; + va_list v; + s = g (p, __builtin_va_arg(v, int)); +} + |