Author: alexshap Date: Fri Sep 22 11:36:06 2017 New Revision: 314011 URL: http://llvm.org/viewvc/llvm-project?rev=314011&view=rev Log: [clang] Fix printf fixit for objc specific types
For the triple thumbv7-apple-ios8.0.0 ssize_t is long and size_t is unsigned long, while NSInteger is int and NSUinteger is unsigned int. Following https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/Strings/Articles/formatSpecifiers.html Clang catches it and insert a cast to long, for example printf("%zd", getNSInteger()) will be replaced with printf("%zd", (long)getNSInteger()) but since the underlying type of ssize_t is long the specifier "%zd" is not getting replaced. This diff changes this behavior to enable replacing the specifier "%zd" with the correct one. Differential revision: https://reviews.llvm.org/D38159 Test plan: make check-all Added: cfe/trunk/test/FixIt/fixit-format-ios.m Modified: cfe/trunk/lib/Sema/SemaChecking.cpp Modified: cfe/trunk/lib/Sema/SemaChecking.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=314011&r1=314010&r2=314011&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaChecking.cpp (original) +++ cfe/trunk/lib/Sema/SemaChecking.cpp Fri Sep 22 11:36:06 2017 @@ -6346,7 +6346,7 @@ CheckPrintfHandler::checkFormatExpr(cons 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)) { Added: cfe/trunk/test/FixIt/fixit-format-ios.m URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit-format-ios.m?rev=314011&view=auto ============================================================================== --- cfe/trunk/test/FixIt/fixit-format-ios.m (added) +++ cfe/trunk/test/FixIt/fixit-format-ios.m Fri Sep 22 11:36:06 2017 @@ -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()); +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits