Author: compnerd Date: Wed Sep 19 09:18:55 2018 New Revision: 342557 URL: http://llvm.org/viewvc/llvm-project?rev=342557&view=rev Log: Basic: correct `__WINT_TYPE__` on Windows
Windows uses `unsigned short` for `wint_t`. Correct the type definition as vended by the compiler. This type is defined in corecrt.h and is unconditionally typedef'ed. cl does not have an equivalent to `__WINT_TYPE__` which is why this was never detected. Modified: cfe/trunk/lib/Basic/Targets/OSTargets.h cfe/trunk/test/Preprocessor/init.c cfe/trunk/test/Preprocessor/woa-defaults.c cfe/trunk/test/Sema/format-strings-ms.c Modified: cfe/trunk/lib/Basic/Targets/OSTargets.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets/OSTargets.h?rev=342557&r1=342556&r2=342557&view=diff ============================================================================== --- cfe/trunk/lib/Basic/Targets/OSTargets.h (original) +++ cfe/trunk/lib/Basic/Targets/OSTargets.h Wed Sep 19 09:18:55 2018 @@ -643,6 +643,7 @@ public: WindowsTargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts) : OSTargetInfo<Target>(Triple, Opts) { this->WCharType = TargetInfo::UnsignedShort; + this->WIntType = TargetInfo::UnsignedShort; } }; Modified: cfe/trunk/test/Preprocessor/init.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/init.c?rev=342557&r1=342556&r2=342557&view=diff ============================================================================== --- cfe/trunk/test/Preprocessor/init.c (original) +++ cfe/trunk/test/Preprocessor/init.c Wed Sep 19 09:18:55 2018 @@ -1553,7 +1553,7 @@ // AARCH64-MSVC: #define __SIZEOF_SHORT__ 2 // AARCH64-MSVC: #define __SIZEOF_SIZE_T__ 8 // AARCH64-MSVC: #define __SIZEOF_WCHAR_T__ 2 -// AARCH64-MSVC: #define __SIZEOF_WINT_T__ 4 +// AARCH64-MSVC: #define __SIZEOF_WINT_T__ 2 // AARCH64-MSVC: #define __SIZE_MAX__ 18446744073709551615ULL // AARCH64-MSVC: #define __SIZE_TYPE__ long long unsigned int // AARCH64-MSVC: #define __SIZE_WIDTH__ 64 @@ -1602,8 +1602,8 @@ // AARCH64-MSVC: #define __WCHAR_TYPE__ unsigned short // AARCH64-MSVC: #define __WCHAR_UNSIGNED__ 1 // AARCH64-MSVC: #define __WCHAR_WIDTH__ 16 -// AARCH64-MSVC: #define __WINT_TYPE__ int -// AARCH64-MSVC: #define __WINT_WIDTH__ 32 +// AARCH64-MSVC: #define __WINT_TYPE__ unsigned short +// AARCH64-MSVC: #define __WINT_WIDTH__ 16 // AARCH64-MSVC: #define __aarch64__ 1 // RUN: %clang_cc1 -E -dM -ffreestanding -triple=arm-none-none < /dev/null | FileCheck -match-full-lines -check-prefix ARM %s Modified: cfe/trunk/test/Preprocessor/woa-defaults.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/woa-defaults.c?rev=342557&r1=342556&r2=342557&view=diff ============================================================================== --- cfe/trunk/test/Preprocessor/woa-defaults.c (original) +++ cfe/trunk/test/Preprocessor/woa-defaults.c Wed Sep 19 09:18:55 2018 @@ -27,7 +27,7 @@ // CHECK: #define __SIZEOF_SHORT__ 2 // CHECK: #define __SIZEOF_SIZE_T__ 4 // CHECK: #define __SIZEOF_WCHAR_T__ 2 -// CHECK: #define __SIZEOF_WINT_T__ 4 +// CHECK: #define __SIZEOF_WINT_T__ 2 // CHECK: #define __SIZE_TYPE__ unsigned int // CHECK: #define __UINTPTR_TYPE__ unsigned int Modified: cfe/trunk/test/Sema/format-strings-ms.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/format-strings-ms.c?rev=342557&r1=342556&r2=342557&view=diff ============================================================================== --- cfe/trunk/test/Sema/format-strings-ms.c (original) +++ cfe/trunk/test/Sema/format-strings-ms.c Wed Sep 19 09:18:55 2018 @@ -13,6 +13,7 @@ void non_iso_warning_test(__int32 i32, _ printf("%I32d", i32); // expected-warning{{'I32' length modifier is not supported by ISO C}} printf("%I64d", i64); // expected-warning{{'I64' length modifier is not supported by ISO C}} printf("%wc", c); // expected-warning{{'w' length modifier is not supported by ISO C}} + // expected-warning@-1{{format specifies type 'wint_t' (aka 'unsigned short') but the argument has type 'wchar_t' (aka 'unsigned short')}} printf("%Z", p); // expected-warning{{'Z' conversion specifier is not supported by ISO C}} } @@ -35,7 +36,7 @@ void unsigned_test() { } void w_test(wchar_t c, wchar_t *s) { - printf("%wc", c); + printf("%wc", c); // expected-warning{{format specifies type 'wint_t' (aka 'unsigned short') but the argument has type 'wchar_t' (aka 'unsigned short')}} printf("%wC", c); printf("%C", c); printf("%ws", s); @@ -49,7 +50,7 @@ void w_test(wchar_t c, wchar_t *s) { scanf("%S", s); double bad; - printf("%wc", bad); // expected-warning{{format specifies type 'wint_t' (aka 'int') but the argument has type 'double'}} + printf("%wc", bad); // expected-warning{{format specifies type 'wint_t' (aka 'unsigned short') but the argument has type 'double'}} printf("%wC", bad); // expected-warning{{format specifies type 'wchar_t' (aka 'unsigned short') but the argument has type 'double'}} printf("%C", bad); // expected-warning{{format specifies type 'wchar_t' (aka 'unsigned short') but the argument has type 'double'}} printf("%ws", bad); // expected-warning{{format specifies type 'wchar_t *' (aka 'unsigned short *') but the argument has type 'double'}} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits