diff options
| -rw-r--r-- | clang/lib/Analysis/PrintfFormatString.cpp | 4 | ||||
| -rw-r--r-- | clang/test/Sema/format-strings-fixit.c | 26 |
2 files changed, 29 insertions, 1 deletions
diff --git a/clang/lib/Analysis/PrintfFormatString.cpp b/clang/lib/Analysis/PrintfFormatString.cpp index db9f7f2c834..19a9134c049 100644 --- a/clang/lib/Analysis/PrintfFormatString.cpp +++ b/clang/lib/Analysis/PrintfFormatString.cpp @@ -441,7 +441,9 @@ bool PrintfSpecifier::fixType(QualType QT) { HasAlternativeForm = 0; } else if (QT->isUnsignedIntegerType()) { - CS.setKind(ConversionSpecifier::uArg); + // Preserve the original formatting, e.g. 'X', 'o'. + if (!cast<PrintfConversionSpecifier>(CS).isUIntArg()) + CS.setKind(ConversionSpecifier::uArg); HasAlternativeForm = 0; HasPlusPrefix = 0; } diff --git a/clang/test/Sema/format-strings-fixit.c b/clang/test/Sema/format-strings-fixit.c index 7cd76c7c37e..c2fa2f77074 100644 --- a/clang/test/Sema/format-strings-fixit.c +++ b/clang/test/Sema/format-strings-fixit.c @@ -1,6 +1,7 @@ // RUN: cp %s %t // RUN: %clang_cc1 -pedantic -Wall -fixit %t || true // RUN: %clang_cc1 -fsyntax-only -pedantic -Wall -Werror %t +// RUN: %clang_cc1 -E -o - %t | FileCheck %s /* This is a test of the various code modification hints that are provided as part of warning or extension diagnostics. All of the @@ -41,4 +42,29 @@ void test() { // Bad length modifiers printf("%hhs", "foo"); printf("%1$zp", (void *)0); + + // Perserve the original formatting for unsigned integers. + unsigned long val = 42; + printf("%X", val); } + +// Validate the fixes... +// CHECK: printf("%d", (int) 123); +// CHECK: printf("abc%s", "testing testing 123"); +// CHECK: printf("%ld", (long) -12); +// CHECK: printf("%d", 123); +// CHECK: printf("%s\n", "x"); +// CHECK: printf("%f\n", 1.23); +// CHECK: printf("%.2llu", (unsigned long long) 123456); +// CHECK: printf("%1Lf", (long double) 1.23); +// CHECK: printf("%0u", (unsigned) 31337); +// CHECK: printf("%p", (void *) 0); +// CHECK: printf("%+f", 1.23); +// CHECK: printf("%-f", 1.23); +// CHECK: printf("%1$d:%2$.*3$d:%4$.*3$d\n", 1, 2, 3, 4); +// CHECK: printf("%10.5ld", 1l); +// CHECK: printf("%c", 'a'); +// CHECK: printf("%-f", 1.23); +// CHECK: printf("%s", "foo"); +// CHECK: printf("%1$p", (void *)0); +// CHECK: printf("%lX", val); |
