Merge branch 'format-string-braced-init'
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@156653 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp
index bc4452f..eddb612 100644
--- a/lib/Sema/SemaChecking.cpp
+++ b/lib/Sema/SemaChecking.cpp
@@ -1569,10 +1569,16 @@
}
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<InitListExpr>(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 a9a040f..afc9e97 100644
--- a/test/Sema/format-strings.c
+++ b/test/Sema/format-strings.c
@@ -500,6 +500,10 @@
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