Skip to content

Commit

Permalink
[clang] Do not crash on pointer wchar_t pointer assignment.
Browse files Browse the repository at this point in the history
wchar_t can be signed (thus hasSignedIntegerRepresentation() returns
true), but it doesn't have an unsigned type, which would lead to a crash
when trying to get it.

With this fix, we special-case WideChar types in the pointer assignment
code.

Differential Revision: https://reviews.llvm.org/D91625
  • Loading branch information
gislan committed Nov 20, 2020
1 parent 412237d commit 95ce9fb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
5 changes: 5 additions & 0 deletions clang/lib/AST/ASTContext.cpp
Expand Up @@ -10007,6 +10007,11 @@ QualType ASTContext::getCorrespondingUnsignedType(QualType T) const {
return UnsignedLongLongTy;
case BuiltinType::Int128:
return UnsignedInt128Ty;
// wchar_t is special. It is either signed or not, but when it's signed,
// there's no matching "unsigned wchar_t". Therefore we return the unsigned
// version of it's underlying type instead.
case BuiltinType::WChar_S:
return getUnsignedWCharType();

case BuiltinType::ShortAccum:
return UnsignedShortAccumTy;
Expand Down
9 changes: 8 additions & 1 deletion clang/test/SemaCXX/wchar_t.cpp
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
// RUN: %clang_cc1 -fsyntax-only -Wno-signed-unsigned-wchar -verify=allow-signed %s
// RUN: %clang_cc1 -fsyntax-only -Wno-signed-unsigned-wchar -verify=allow-signed -DSKIP_ERROR_TESTS %s
// allow-signed-no-diagnostics
wchar_t x;

Expand Down Expand Up @@ -32,3 +32,10 @@ int t(void) {
// rdar://8040728
wchar_t in[] = L"\x434" "\x434"; // No warning

#ifndef SKIP_ERROR_TESTS
// Verify that we do not crash when assigning wchar_t* to another pointer type.
void assignment(wchar_t *x) {
char *y;
y = x; // expected-error {{incompatible pointer types assigning to 'char *' from 'wchar_t *'}}
}
#endif

0 comments on commit 95ce9fb

Please sign in to comment.