diff options
| -rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 18 | ||||
| -rw-r--r-- | clang/test/Sema/init.c | 4 |
2 files changed, 14 insertions, 8 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 4976bd466fc..4e0eb1d431f 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -44,17 +44,19 @@ static Expr *IsStringInit(Expr *Init, QualType DeclType, ASTContext &Context) { // Otherwise we can only handle string literals. StringLiteral *SL = dyn_cast<StringLiteral>(Init); if (SL == 0) return 0; - + + QualType ElemTy = Context.getCanonicalType(AT->getElementType()); // char array can be initialized with a narrow string. // Only allow char x[] = "foo"; not char x[] = L"foo"; if (!SL->isWide()) - return AT->getElementType()->isCharType() ? Init : 0; - - // wchar_t array can be initialized with a wide string: C99 6.7.8p15: - // "An array with element type compatible with wchar_t may be initialized by a - // wide string literal, optionally enclosed in braces." - if (Context.typesAreCompatible(Context.getWCharType(), AT->getElementType())) - // Only allow wchar_t x[] = L"foo"; not wchar_t x[] = "foo"; + return ElemTy->isCharType() ? Init : 0; + + // wchar_t array can be initialized with a wide string: C99 6.7.8p15 (with + // correction from DR343): "An array with element type compatible with a + // qualified or unqualified version of wchar_t may be initialized by a wide + // string literal, optionally enclosed in braces." + if (Context.typesAreCompatible(Context.getWCharType(), + ElemTy.getUnqualifiedType())) return Init; return 0; diff --git a/clang/test/Sema/init.c b/clang/test/Sema/init.c index 7938ec5568d..1cbcbb7e36f 100644 --- a/clang/test/Sema/init.c +++ b/clang/test/Sema/init.c @@ -1,5 +1,6 @@ // RUN: clang-cc %s -verify -fsyntax-only +#include <stddef.h> #include <stdint.h> typedef void (* fp)(void); @@ -122,3 +123,6 @@ ivector4 vtest4 = __imag__ (ivector4){1}; uintptr_t ptrasintadd1 = (uintptr_t)&a - 4; uintptr_t ptrasintadd2 = (uintptr_t)&a + 4; uintptr_t ptrasintadd3 = 4 + (uintptr_t)&a; + +// PR4285 +const wchar_t widestr[] = L"asdf"; |
