diff options
| -rw-r--r-- | clang/lib/Sema/SemaChecking.cpp | 2 | ||||
| -rw-r--r-- | clang/test/FixIt/fixit-format-ios.m | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index 956136859a0..1828dc6c040 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -6346,7 +6346,7 @@ CheckPrintfHandler::checkFormatExpr(const analyze_printf::PrintfSpecifier &FS, CastFix << ")"; SmallVector<FixItHint,4> Hints; - if (!AT.matchesType(S.Context, IntendedTy)) + if (!AT.matchesType(S.Context, IntendedTy) || ShouldNotPrintDirectly) Hints.push_back(FixItHint::CreateReplacement(SpecRange, os.str())); if (const CStyleCastExpr *CCast = dyn_cast<CStyleCastExpr>(E)) { diff --git a/clang/test/FixIt/fixit-format-ios.m b/clang/test/FixIt/fixit-format-ios.m new file mode 100644 index 00000000000..ef664307786 --- /dev/null +++ b/clang/test/FixIt/fixit-format-ios.m @@ -0,0 +1,26 @@ +// RUN: cp %s %t +// RUN: %clang_cc1 -triple thumbv7-apple-ios8.0.0 -fsyntax-only -Wformat -fixit %t +// RUN: grep -v CHECK %t | FileCheck %s + +int printf(const char * restrict, ...); +typedef unsigned int NSUInteger; +typedef int NSInteger; +NSUInteger getNSUInteger(); +NSInteger getNSInteger(); + +void test() { + // For thumbv7-apple-ios8.0.0 the underlying type of ssize_t is long + // and the underlying type of size_t is unsigned long. + + printf("test 1: %zu", getNSUInteger()); + // CHECK: printf("test 1: %lu", (unsigned long)getNSUInteger()); + + printf("test 2: %zu %zu", getNSUInteger(), getNSUInteger()); + // CHECK: printf("test 2: %lu %lu", (unsigned long)getNSUInteger(), (unsigned long)getNSUInteger()); + + printf("test 3: %zd", getNSInteger()); + // CHECK: printf("test 3: %ld", (long)getNSInteger()); + + printf("test 4: %zd %zd", getNSInteger(), getNSInteger()); + // CHECK: printf("test 4: %ld %ld", (long)getNSInteger(), (long)getNSInteger()); +} |
