diff options
| -rw-r--r-- | clang/include/clang/Sema/Sema.h | 1 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaChecking.cpp | 5 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDeclAttr.cpp | 1 | ||||
| -rw-r--r-- | clang/test/SemaObjC/format-ostrace-warning.m | 54 |
4 files changed, 59 insertions, 2 deletions
diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h index 7c14809b998..dc0b94250f3 100644 --- a/clang/include/clang/Sema/Sema.h +++ b/clang/include/clang/Sema/Sema.h @@ -8592,6 +8592,7 @@ public: FST_Strfmon, FST_Kprintf, FST_FreeBSDKPrintf, + FST_OSTrace, FST_Unknown }; static FormatStringType GetFormatStringType(const FormatAttr *Format); diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index 16b96615c96..c26ba3cf9bb 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -2681,6 +2681,7 @@ Sema::FormatStringType Sema::GetFormatStringType(const FormatAttr *Format) { .Case("strfmon", FST_Strfmon) .Cases("kprintf", "cmn_err", "vcmn_err", "zcmn_err", FST_Kprintf) .Case("freebsd_kprintf", FST_FreeBSDKPrintf) + .Case("os_trace", FST_OSTrace) .Default(FST_Unknown); } @@ -4123,9 +4124,9 @@ void Sema::CheckFormatString(const StringLiteral *FExpr, } if (Type == FST_Printf || Type == FST_NSString || - Type == FST_FreeBSDKPrintf) { + Type == FST_FreeBSDKPrintf || Type == FST_OSTrace) { CheckPrintfHandler H(*this, FExpr, OrigFormatExpr, firstDataArg, - numDataArgs, (Type == FST_NSString), + numDataArgs, (Type == FST_NSString || Type == FST_OSTrace), Str, HasVAListArg, Args, format_idx, inFunctionCall, CallType, CheckedVarArgs); diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index 0ec29ac2983..09b6aa49570 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -2494,6 +2494,7 @@ static FormatAttrKind getFormatAttrKind(StringRef Format) { .Cases("cmn_err", "vcmn_err", "zcmn_err", SupportedFormat) .Case("kprintf", SupportedFormat) // OpenBSD. .Case("freebsd_kprintf", SupportedFormat) // FreeBSD. + .Case("os_trace", SupportedFormat) .Cases("gcc_diag", "gcc_cdiag", "gcc_cxxdiag", "gcc_tdiag", IgnoredFormat) .Default(InvalidFormat); diff --git a/clang/test/SemaObjC/format-ostrace-warning.m b/clang/test/SemaObjC/format-ostrace-warning.m new file mode 100644 index 00000000000..c749881c7a8 --- /dev/null +++ b/clang/test/SemaObjC/format-ostrace-warning.m @@ -0,0 +1,54 @@ +// RUN: %clang_cc1 -Wcstring-format-directive -verify -fsyntax-only %s +// rdar://19904147 + +typedef __builtin_va_list __darwin_va_list; +typedef __builtin_va_list va_list; + +va_list argList; + +typedef const struct __CFString * CFStringRef; +typedef struct __CFString * CFMutableStringRef; +typedef const struct __CFAllocator * CFAllocatorRef; + + +typedef const struct __CFDictionary * CFDictionaryRef; + +CFStringRef CFSTR ( const char *cStr ); + + +extern +CFStringRef CStringCreateWithFormat(CFAllocatorRef alloc, CFDictionaryRef formatOptions, const char* format, ...) __attribute__((format(os_trace, 3, 4))); + +extern +CFStringRef CStringCreateWithFormatAndArguments(CFAllocatorRef alloc, CFDictionaryRef formatOptions, const char* format, va_list arguments) __attribute__((format(os_trace, 3, 0))); + +extern +void CStringAppendFormat(CFMutableStringRef theString, CFDictionaryRef formatOptions, const char* format, ...) __attribute__((format(os_trace, 3, 4))); + +extern +void CStringAppendFormatAndArguments(CFMutableStringRef theString, CFDictionaryRef formatOptions, const char* format, va_list arguments) __attribute__((format(os_trace, 3, 0))); + +void Test1(va_list argList) { + CFAllocatorRef alloc; + CStringCreateWithFormatAndArguments (alloc, 0, "%s\n", argList); + CStringAppendFormatAndArguments ((CFMutableStringRef)@"AAAA", 0, "Hello %s there %d\n", argList); + CStringCreateWithFormatAndArguments (alloc, 0, "%c\n", argList); + CStringAppendFormatAndArguments ((CFMutableStringRef)@"AAAA", 0, "%d\n", argList); +} + +extern void MyOSLog(const char* format, ...) __attribute__((format(os_trace, 1, 2))); +extern void MyFStringCreateWithFormat(const char *format, ...) __attribute__((format(os_trace, 1, 2))); +extern void XMyOSLog(int, const char* format, ...) __attribute__((format(os_trace, 2, 3))); +extern void os_trace(const char *format, ...) __attribute__((format(os_trace, 1, 2))); + +void Test2() { + MyOSLog("%s\n", "Hello"); + + MyFStringCreateWithFormat("%s", "Hello"); + XMyOSLog(4, "%s\n", "Hello"); + + os_trace("testing %@, %s, %d, %@, %m", CFSTR("object"), "string", 3, "it"); // expected-warning {{format specifies type 'id' but the argument has type 'char *'}} + + os_trace("testing %@, %s, %d, %@, %m", CFSTR("object"), "string", 3, @"ok"); +} + |
