[clang] trim trailing space in format tests. NFC

[inclyc]

Summary

Found in https://reviews.llvm.org/D132568

[ChuanqiXu]

Do you have commit access? If you have, I remember LLVM encourages to land such fixes directly without reviewed. (+ @aaron.ballman to make sure)

[inclyc]

In D133085#3763198, @ChuanqiXu wrote:

Do you have commit access? If you have, I remember LLVM encourages to land such fixes directly without reviewed. (+ @aaron.ballman to make sure)

Thanks! I'm just not sure whether these changes are necessary or not. :)

[aaron.ballman]

In D133085#3763233, @inclyc wrote:

In D133085#3763198, @ChuanqiXu wrote:

Do you have commit access? If you have, I remember LLVM encourages to land such fixes directly without reviewed. (+ @aaron.ballman to make sure)

Thanks! I'm just not sure whether these changes are necessary or not. :)

It's always okay to do an NFC commit which strips trailing whitespace, fixes a typo or misspelling, adds/removes newlines, or that sort of change in a targeted way. No need to review it unless you want a second set of eyes on the changes for some reason. We typically don't want a whole-project NFC change to do that sort of thing, though.

[inclyc]

Thank you for your patience and detailed explanation! Sorry for waste your time though (

[aaron.ballman]

In D133085#3764067, @inclyc wrote:

Thank you for your patience and detailed explanation! Sorry for waste your time though (

No worries, it's definitely not a waste of time to explain this sort of stuff! :-)

clang/test/FixIt/format.m

void test_string_correction (char *x) {
   NSLog(@"%s", x); // no-warning
   NSLog(@"%lf", x); // expected-warning{{format specifies type 'double' but the argument has type 'char *'}}
   NSLog(@"%@", x); // expected-warning{{format specifies type 'id' but the argument has type 'char *'}}
   // CHECK: fix-it:"{{.*}}":{31:11-31:13}:"%s"
   // CHECK: fix-it:"{{.*}}":{33:11-33:14}:"%s"
   // CHECK: fix-it:"{{.*}}":{34:11-34:13}:"%s"
 }
 
-void test_object_correction (id x) {  
+void test_object_correction (id x) {
   NSLog(@"%d", x); // expected-warning{{format specifies type 'int' but the argument has type 'id'}}
   NSLog(@"%s", x); // expected-warning{{format specifies type 'char *' but the argument has type 'id'}}
   NSLog(@"%lf", x); // expected-warning{{format specifies type 'double' but the argument has type 'id'}}
   NSLog(@"%@", x); // no-warning
   // CHECK: fix-it:"{{.*}}":{41:11-41:13}:"%@"
   // CHECK: fix-it:"{{.*}}":{42:11-42:13}:"%@"
   // CHECK: fix-it:"{{.*}}":{43:11-43:14}:"%@"
 }
void test_char(char c, signed char s, unsigned char u, uint8_t n) {
   // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:14}:"%c"
 
   NSLog(@"%@", c); // expected-warning{{format specifies type 'id' but the argument has type 'char'}}
   // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:13}:"%c"
 
   NSLog(@"%c", c); // no-warning
   // CHECK-NOT: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:13}:"%c"
 
-  
   NSLog(@"%s", s); // expected-warning{{format specifies type 'char *' but the argument has type 'signed char'}}
   // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:13}:"%c"
 
   NSLog(@"%lf", s); // expected-warning{{format specifies type 'double' but the argument has type 'signed char'}}
   // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:14}:"%c"
 
   NSLog(@"%@", s); // expected-warning{{format specifies type 'id' but the argument has type 'signed char'}}
   // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:13}:"%c"
void test_percent_C(void) {
   const unsigned short data = 'a';
   NSLog(@"%C", data);  // no-warning
 
   NSLog(@"%C", 0x260300);  // expected-warning{{format specifies type 'unichar' (aka 'unsigned short') but the argument has type 'int'}}
   // CHECK-NOT: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:13}:"%d"
   // CHECK: fix-it:"{{.*}}":{[[@LINE-2]]:16-[[@LINE-2]]:16}:"(unsigned short)"
 
   typedef unsigned short unichar;
-  
   NSLog(@"%C", 0x260300);  // expected-warning{{format specifies type 'unichar' (aka 'unsigned short') but the argument has type 'int'}}
   // CHECK-NOT: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:13}:"%d"
   // CHECK: fix-it:"{{.*}}":{[[@LINE-2]]:16-[[@LINE-2]]:16}:"(unichar)"
-  
   NSLog(@"%C", data ? 0x2F0000 : 0x260300); // expected-warning{{format specifies type 'unichar' (aka 'unsigned short') but the argument has type 'int'}}
   // CHECK-NOT: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:13}:"%d"
   // CHECK: fix-it:"{{.*}}":{[[@LINE-2]]:16-[[@LINE-2]]:16}:"(unichar)("
   // CHECK: fix-it:"{{.*}}":{[[@LINE-3]]:42-[[@LINE-3]]:42}:")"
 
   NSLog(@"%C", 0.0); // expected-warning{{format specifies type 'unichar' (aka 'unsigned short') but the argument has type 'double'}}
   // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:13}:"%f"
   // CHECK-NOT: fix-it:"{{.*}}":{[[@LINE-2]]:16-[[@LINE-2]]:16}:"(unichar)"

 }
 
 void testSizeTypes(void) {
   printf("%zu", 0.f); // expected-warning-re{{format specifies type 'size_t' (aka '{{.+}}') but the argument has type 'float'}}
   // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:14}:"%f"
 
   printf("%zd", 0.f); // expected-warning-re{{format specifies type 'ssize_t' (aka '{{.+}}') but the argument has type 'float'}}
   // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:14}:"%f"
-  
   short x;
 #if !defined(__ANDROID__) && !defined(__Fuchsia__)
   printf("%zn", &x); // expected-warning-re{{format specifies type 'ssize_t *' (aka '{{.+}}') but the argument has type 'short *'}}
 #else
   printf("%zn", &x); // expected-warning-re{{format specifies type 'ssize_t *' (aka '{{.+}}') but the argument has type 'short *'}}
   // expected-warning@-1 {{'%n' specifier not supported on this platform}}
 #endif // !defined(__ANDROID__) && !defined(__Fuchsia__)
   // PrintfSpecifier::fixType doesn't handle %n, so a fix-it is not emitted,
__typeof__(_Generic((__PTRDIFF_TYPE__)0,                                     \
                       signed char : (unsigned char)0))
 
 void testPtrDiffTypes(void) {
   __UNSIGNED_PTRDIFF_TYPE__ p1 = 0;
   printf("%tu", p1);  // No warning.
 
   printf("%tu", 0.f); // expected-warning-re{{format specifies type 'unsigned ptrdiff_t' (aka '{{.+}}') but the argument has type 'float'}}
   // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:14}:"%f"
-  
   ptrdiff_t p2 = 0;
   printf("%td", p2);  // No warning.
 
   printf("%td", 0.f); // expected-warning-re{{format specifies type 'ptrdiff_t' (aka '{{.+}}') but the argument has type 'float'}}
   // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:14}:"%f"
 
   ptrdiff_t p3 = 0;
 #if !defined(__ANDROID__) && !defined(__Fuchsia__)

clang/test/FixIt/format.mm

void test_percent_C() {
   NSLog(@"%C", 0x260300);  // expected-warning{{format specifies type 'unichar' (aka 'unsigned short') but the argument has type 'int'}}
   // CHECK-NOT: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:13}:"%d"
   // CHECK: fix-it:"{{.*}}":{[[@LINE-2]]:16-[[@LINE-2]]:16}:"(unsigned short)"
 
   typedef unsigned short unichar;
 
   NSLog(@"%C", wchar_data);  // expected-warning{{format specifies type 'unichar' (aka 'unsigned short') but the argument has type 'wchar_t'}}
   // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:16-[[@LINE-1]]:16}:"(unichar)"
-  
   NSLog(@"%C", 0x260300);  // expected-warning{{format specifies type 'unichar' (aka 'unsigned short') but the argument has type 'int'}}
   // CHECK-NOT: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:13}:"%d"
   // CHECK: fix-it:"{{.*}}":{[[@LINE-2]]:16-[[@LINE-2]]:16}:"(unichar)"
-  
   NSLog(@"%C", 0.0); // expected-warning{{format specifies type 'unichar' (aka 'unsigned short') but the argument has type 'double'}}
   // CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:11-[[@LINE-1]]:13}:"%f"
   // CHECK-NOT: fix-it:"{{.*}}":{[[@LINE-2]]:16-[[@LINE-2]]:16}:"(unichar)"
 }

clang/test/Sema/format-strings-scanf.c

 // RUN: %clang_cc1 -std=c11 -fsyntax-only -verify -Wformat-nonliteral %s
 
 // Test that -Wformat=0 works:
 // RUN: %clang_cc1 -std=c11 -fsyntax-only -Werror -Wformat=0 %s
 
 #include <stdarg.h>
 typedef __SIZE_TYPE__ size_t;
 #define __SSIZE_TYPE__                                                         \
   __typeof__(_Generic((__SIZE_TYPE__)0,                                        \
                       unsigned long long int : (long long int)0,               \
                       unsigned long int : (long int)0,                         \
                       unsigned int : (int)0,                                   \
                       unsigned short : (short)0,                               \
                       unsigned char : (signed char)0))
-typedef __SSIZE_TYPE__ ssize_t;                         
+typedef __SSIZE_TYPE__ ssize_t;
 
 typedef __PTRDIFF_TYPE__ ptrdiff_t;
 #define __UNSIGNED_PTRDIFF_TYPE__                                              \
   __typeof__(_Generic((__PTRDIFF_TYPE__)0,                                     \
                       long long int : (unsigned long long int)0,               \
                       long int : (unsigned long int)0,                         \
                       int : (unsigned int)0,                                   \
                       short : (unsigned short)0,                               \
void test_ptrdiff_t_types(void) {
   scanf("%tu", &p1); // No warning.
   scanf("%tb", &p1);
 
   double d1 = 0.;
   scanf("%tu", &d1); // expected-warning-re{{format specifies type 'unsigned ptrdiff_t *' (aka '{{.+}}') but the argument has type 'double *'}}
 
   ptrdiff_t p2 = 0;
   scanf("%td", &p2); // No warning.
-  
   double d2 = 0.;
   scanf("%td", &d2); // expected-warning-re{{format specifies type 'ptrdiff_t *' (aka '{{.+}}') but the argument has type 'double *'}}
 
   ptrdiff_t p3 = 0;
   scanf("%tn", &p3); // No warning.
-  
   double d3 = 0.;
   scanf("%tn", &d3); // expected-warning-re{{format specifies type 'ptrdiff_t *' (aka '{{.+}}') but the argument has type 'double *'}}
 }
 
 void check_conditional_literal(char *s, int *i) {
   scanf(0 ? "%s" : "%d", i); // no warning
   scanf(1 ? "%s" : "%d", i); // expected-warning{{format specifies type 'char *'}}
   scanf(0 ? "%d %d" : "%d", i); // no warning