diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Analysis/PrintfFormatString.cpp | 9 | ||||
| -rw-r--r-- | clang/test/Sema/format-strings-ms.c | 18 |
2 files changed, 22 insertions, 5 deletions
diff --git a/clang/lib/Analysis/PrintfFormatString.cpp b/clang/lib/Analysis/PrintfFormatString.cpp index cdf6122363e..f21b407bcb5 100644 --- a/clang/lib/Analysis/PrintfFormatString.cpp +++ b/clang/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/clang/test/Sema/format-strings-ms.c b/clang/test/Sema/format-strings-ms.c index cc574a7a986..88f6dec50a2 100644 --- a/clang/test/Sema/format-strings-ms.c +++ b/clang/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'}} } |
