maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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

llvm-svn: 314011
This commit is contained in:
Alexander Shaposhnikov 2017-09-22 18:36:06 +00:00
parent 0bd982b79f
commit 1788a9b71c
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Sema/SemaChecking.cpp
View File

@ -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)) {

26
clang/test/FixIt/fixit-format-ios.m Normal file
View File

@ -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());
}