diff options
| -rw-r--r-- | Sema/SemaChecking.cpp | 16 | ||||
| -rw-r--r-- | test/Sema/varargs.c | 8 |
2 files changed, 21 insertions, 3 deletions
diff --git a/Sema/SemaChecking.cpp b/Sema/SemaChecking.cpp index 470211d9ab..76363c9dc0 100644 --- a/Sema/SemaChecking.cpp +++ b/Sema/SemaChecking.cpp @@ -149,11 +149,21 @@ bool Sema::SemaBuiltinVAStart(CallExpr *TheCall) { // Verify that the second argument to the builtin is the last argument of the // current function or method. bool SecondArgIsLastNamedArgument = false; - if (DeclRefExpr *DR = dyn_cast<DeclRefExpr>(TheCall->getArg(1))) { - if (ParmVarDecl *PV = dyn_cast<ParmVarDecl>(DR->getDecl())) { + const Expr *Arg = TheCall->getArg(1); + while (1) { + if (const ParenExpr *PE = dyn_cast<ParenExpr>(Arg)) + Arg = PE->getSubExpr(); + else if (const ImplicitCastExpr *CE = dyn_cast<ImplicitCastExpr>(Arg)) + Arg = CE->getSubExpr(); + else + break; + } + + if (const DeclRefExpr *DR = dyn_cast<DeclRefExpr>(Arg)) { + if (const ParmVarDecl *PV = dyn_cast<ParmVarDecl>(DR->getDecl())) { // FIXME: This isn't correct for methods (results in bogus warning). // Get the last formal in the current function. - ParmVarDecl *LastArg; + const ParmVarDecl *LastArg; if (CurFunctionDecl) LastArg = *(CurFunctionDecl->param_end()-1); else diff --git a/test/Sema/varargs.c b/test/Sema/varargs.c index 92faf9ff50..f52921c5fc 100644 --- a/test/Sema/varargs.c +++ b/test/Sema/varargs.c @@ -16,3 +16,11 @@ void f2(int a, int b, ...) __builtin_va_start(ap, a); // expected-warning {{second parameter of 'va_start' not last named argument}} __builtin_va_start(ap, b); } + +void f3(float a, ...) +{ + __builtin_va_list ap; + + __builtin_va_start(ap, a); + __builtin_va_start(ap, (a)); +} |