Analysis: Make %I in printf more reasonable, add more tests

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@188992 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Analysis/PrintfFormatString.cpp b/lib/Analysis/PrintfFormatString.cpp
index cdf6122363e7ba37f215a0f1c31a341e6438732d..f21b407bcb5155c85b7d888dff10336793d53cda 100644 (file)
--- a/lib/Analysis/PrintfFormatString.cpp
+++ b/lib/Analysis/PrintfFormatString.cpp
@@ -296,8 +296,9 @@ ArgType PrintfSpecifier::getArgType(ASTContext &Ctx,
         // FIXME: How to get the corresponding signed version of size_t?
         return ArgType();
       case LengthModifier::AsInt3264:
-        return Ctx.getTargetInfo().getTriple().isArch64Bit() ? Ctx.LongLongTy
-                                                             : Ctx.IntTy;
+        return Ctx.getTargetInfo().getTriple().isArch64Bit()
+                   ? ArgType(Ctx.LongLongTy, "__int64")
+                   : ArgType(Ctx.IntTy, "__int32");
       case LengthModifier::AsPtrDiff:
         return ArgType(Ctx.getPointerDiffType(), "ptrdiff_t");
       case LengthModifier::AsAllocate:
@@ -328,8 +329,8 @@ ArgType PrintfSpecifier::getArgType(ASTContext &Ctx,
         return ArgType(Ctx.getSizeType(), "size_t");
       case LengthModifier::AsInt3264:
         return Ctx.getTargetInfo().getTriple().isArch64Bit()
-                   ? Ctx.UnsignedLongLongTy
-                   : Ctx.UnsignedIntTy;
+                   ? ArgType(Ctx.UnsignedLongLongTy, "unsigned __int64")
+                   : ArgType(Ctx.UnsignedIntTy, "unsigned __int32");
       case LengthModifier::AsPtrDiff:
         // FIXME: How to get the corresponding unsigned
         // version of ptrdiff_t?

diff --git a/test/Sema/format-strings-ms.c b/test/Sema/format-strings-ms.c
index cc574a7a986432288cc0d9d3af9194f1bef61ff5..88f6dec50a25e373707495008bc31ffe7eaf1bdd 100644 (file)
--- a/test/Sema/format-strings-ms.c
+++ b/test/Sema/format-strings-ms.c
@@ -2,8 +2,24 @@
 
 int printf(const char *format, ...) __attribute__((format(printf, 1, 2)));
 
-void test() {
+void unsigned_test() {
   short val = 30;
   printf("val = %I64d\n", val); // expected-warning{{'I64' length modifier is not supported by ISO C}} \
                                 // expected-warning{{format specifies type '__int64' (aka 'long long') but the argument has type 'short'}}
+  long long bigval = 30;
+  printf("val = %I32d\n", bigval); // expected-warning{{'I32' length modifier is not supported by ISO C}} \
+                                   // expected-warning{{format specifies type '__int32' (aka 'int') but the argument has type 'long long'}}
+  printf("val = %Id\n", bigval); // expected-warning{{'I' length modifier is not supported by ISO C}} \
+                                 // expected-warning{{format specifies type '__int32' (aka 'int') but the argument has type 'long long'}}
+}
+
+void signed_test() {
+  unsigned short val = 30;
+  printf("val = %I64u\n", val); // expected-warning{{'I64' length modifier is not supported by ISO C}} \
+                                // expected-warning{{format specifies type 'unsigned __int64' (aka 'unsigned long long') but the argument has type 'unsigned short'}}
+  unsigned long long bigval = 30;
+  printf("val = %I32u\n", bigval); // expected-warning{{'I32' length modifier is not supported by ISO C}} \
+                                   // expected-warning{{format specifies type 'unsigned __int32' (aka 'unsigned int') but the argument has type 'unsigned long long'}}
+  printf("val = %Iu\n", bigval); // expected-warning{{'I' length modifier is not supported by ISO C}} \
+                                 // expected-warning{{format specifies type 'unsigned __int32' (aka 'unsigned int') but the argument has type 'unsigned long long'}}
 }