summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/lib/Sema/SemaDeclAttr.cpp3
-rw-r--r--clang/test/Sema/attr-format.c6
2 files changed, 8 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp
index 5a7a3c31fe8..a81ad768b8c 100644
--- a/clang/lib/Sema/SemaDeclAttr.cpp
+++ b/clang/lib/Sema/SemaDeclAttr.cpp
@@ -1137,7 +1137,8 @@ static FormatAttrKind getFormatAttrKind(llvm::StringRef Format) {
Format == "zcmn_err")
return SupportedFormat;
- if (Format == "gcc_tdiag")
+ if (Format == "gcc_diag" || Format == "gcc_cdiag" ||
+ Format == "gcc_cxxdiag" || Format == "gcc_tdiag")
return IgnoredFormat;
return InvalidFormat;
diff --git a/clang/test/Sema/attr-format.c b/clang/test/Sema/attr-format.c
index 34102c66037..0fadf98f978 100644
--- a/clang/test/Sema/attr-format.c
+++ b/clang/test/Sema/attr-format.c
@@ -71,4 +71,10 @@ foo2(const char *fmt, va_list va) {
// PR6542
extern void gcc_format (const char *, ...)
+ __attribute__ ((__format__(__gcc_diag__, 1, 2)));
+extern void gcc_cformat (const char *, ...)
+ __attribute__ ((__format__(__gcc_cdiag__, 1, 2)));
+extern void gcc_cxxformat (const char *, ...)
+ __attribute__ ((__format__(__gcc_cxxdiag__, 1, 2)));
+extern void gcc_tformat (const char *, ...)
__attribute__ ((__format__(__gcc_tdiag__, 1, 2)));
OpenPOWER on IntegriCloud