From e2c60667d1bc29b7e148f9c9828dcbdbfc5b82b0 Mon Sep 17 00:00:00 2001 From: Matt Beaumont-Gay Date: Fri, 11 May 2012 22:10:59 +0000 Subject: [PATCH] Merge branch 'format-string-braced-init' git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156653 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaChecking.cpp | 8 +++++++- test/Sema/format-strings.c | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp index bc4452f125..eddb612fc6 100644 --- a/lib/Sema/SemaChecking.cpp +++ b/lib/Sema/SemaChecking.cpp @@ -1569,10 +1569,16 @@ bool Sema::SemaCheckStringLiteral(const Expr *E, Expr **Args, } if (isConstant) { - if (const Expr *Init = VD->getAnyInitializer()) + if (const Expr *Init = VD->getAnyInitializer()) { + // Look through initializers like const char c[] = { "foo" } + if (const InitListExpr *InitList = dyn_cast(Init)) { + if (InitList->isStringLiteralInit()) + Init = InitList->getInit(0)->IgnoreParenImpCasts(); + } return SemaCheckStringLiteral(Init, Args, NumArgs, HasVAListArg, format_idx, firstDataArg, Type, /*inFunctionCall*/false); + } } // For vprintf* functions (i.e., HasVAListArg==true), we add a diff --git a/test/Sema/format-strings.c b/test/Sema/format-strings.c index a9a040fdc0..afc9e9720c 100644 --- a/test/Sema/format-strings.c +++ b/test/Sema/format-strings.c @@ -500,6 +500,10 @@ void pr9751() { printf(kFormat17, (int[]){0}); // expected-warning{{format specifies type 'unsigned short' but the argument}} printf("%a", (long double)0); // expected-warning{{format specifies type 'double' but the argument has type 'long double'}} + + // Test braced char[] initializers. + const char kFormat18[] = { "%lld" }; // expected-note{{format string is defined here}}} + printf(kFormat18, 0); // expected-warning{{format specifies type}} } // PR 9466: clang: doesn't know about %Lu, %Ld, and %Lx