Author: dpolukhin Date: Thu Apr 14 04:52:06 2016 New Revision: 266287 URL: http://llvm.org/viewvc/llvm-project?rev=266287&view=rev Log: [MSVC] Fix check for wchar_t type in case of -fno-wchar
The example below should work identically with and without compiler native wchar_t support. void foo(wchar_t * t = L""); Differential Revision: http://reviews.llvm.org/D19056 Modified: cfe/trunk/lib/Sema/SemaExprCXX.cpp cfe/trunk/test/SemaCXX/no-wchar.cpp Modified: cfe/trunk/lib/Sema/SemaExprCXX.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=266287&r1=266286&r2=266287&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaExprCXX.cpp (original) +++ cfe/trunk/lib/Sema/SemaExprCXX.cpp Thu Apr 14 04:52:06 2016 @@ -3040,7 +3040,8 @@ Sema::IsStringLiteralToNonConstPointerCo return (ToPointeeType->getKind() == BuiltinType::Char_U || ToPointeeType->getKind() == BuiltinType::Char_S); case StringLiteral::Wide: - return ToPointeeType->isWideCharType(); + return Context.typesAreCompatible(Context.getWideCharType(), + QualType(ToPointeeType, 0)); } } } Modified: cfe/trunk/test/SemaCXX/no-wchar.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/no-wchar.cpp?rev=266287&r1=266286&r2=266287&view=diff ============================================================================== --- cfe/trunk/test/SemaCXX/no-wchar.cpp (original) +++ cfe/trunk/test/SemaCXX/no-wchar.cpp Thu Apr 14 04:52:06 2016 @@ -7,3 +7,24 @@ void foo(const wchar_t* x); void bar() { foo(L"wide string literal"); } + +void foo1(wchar_t * t = L""); +// expected-warning@-1 {{conversion from string literal to 'wchar_t *' (aka 'unsigned short *') is deprecated}} + +short *a = L""; +// expected-error@-1 {{cannot initialize a variable of type 'short *' with an lvalue of type 'const unsigned short [1]'}} +char *b = L""; +// expected-error@-1 {{cannot initialize a variable of type 'char *' with an lvalue of type 'const unsigned short [1]'}} + +// NOTE: MSVC allows deprecated conversion in conditional expression if at least +// one of the operand is a string literal but Clang doesn't allow it. +wchar_t *c = true ? L"a" : L""; +// expected-error@-1 {{cannot initialize a variable of type 'wchar_t *' (aka 'unsigned short *') with}} + +const wchar_t *d1 = 0; +const wchar_t *d2 = 0; +wchar_t *d = true ? d1 : d2; +// expected-error@-1 {{cannot initialize a variable of type 'wchar_t *' (aka 'unsigned short *') with}} + +wchar_t* e = (const wchar_t*)L""; +// expected-error@-1 {{cannot initialize a variable of type 'wchar_t *' (aka 'unsigned short *') with an rvalue of type 'const wchar_t *' (aka 'const unsigned short *')}} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
