diff options
| -rw-r--r-- | include/clang/AST/PrettyPrinter.h | 7 | ||||
| -rw-r--r-- | include/clang/Basic/TokenKinds.def | 1 | ||||
| -rw-r--r-- | lib/AST/ASTContext.cpp | 5 | ||||
| -rw-r--r-- | lib/AST/Type.cpp | 2 | ||||
| -rw-r--r-- | test/Lexer/ms-compatibility-wchar.c | 12 | ||||
| -rw-r--r-- | test/Lexer/ms-extensions-wchar.c | 12 |
6 files changed, 35 insertions, 4 deletions
diff --git a/include/clang/AST/PrettyPrinter.h b/include/clang/AST/PrettyPrinter.h index e3c09e7b41..36e90724d9 100644 --- a/include/clang/AST/PrettyPrinter.h +++ b/include/clang/AST/PrettyPrinter.h @@ -40,7 +40,8 @@ struct PrintingPolicy { SuppressUnwrittenScope(false), SuppressInitializers(false), ConstantArraySizeAsWritten(false), AnonymousTagLocations(true), SuppressStrongLifetime(false), Bool(LO.Bool), - TerseOutput(false), PolishForDeclaration(false) { } + TerseOutput(false), PolishForDeclaration(false), + MSWChar(LO.MicrosoftMode && !LO.WChar) { } /// \brief What language we're printing. LangOptions LangOpts; @@ -146,6 +147,10 @@ struct PrintingPolicy { /// declaration tag; such as, do not print attributes attached to the declaration. /// unsigned PolishForDeclaration : 1; + + /// \brief When true, print the built-in wchar_t type as __wchar_t. For use in + /// Microsoft mode when wchar_t is not available. + unsigned MSWChar : 1; }; } // end namespace clang diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def index bcf0f31dcb..0dbff81d34 100644 --- a/include/clang/Basic/TokenKinds.def +++ b/include/clang/Basic/TokenKinds.def @@ -524,6 +524,7 @@ KEYWORD(__interface , KEYMS) ALIAS("__int8" , char , KEYMS) ALIAS("__int16" , short , KEYMS) ALIAS("__int32" , int , KEYMS) +ALIAS("__wchar_t" , wchar_t , KEYMS) ALIAS("_asm" , asm , KEYMS) ALIAS("_alignof" , __alignof , KEYMS) ALIAS("__builtin_alignof", __alignof , KEYMS) diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 5e9a87c58a..f4e53e6105 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -897,12 +897,13 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target) { InitBuiltinType(Int128Ty, BuiltinType::Int128); InitBuiltinType(UnsignedInt128Ty, BuiltinType::UInt128); - if (LangOpts.CPlusPlus && LangOpts.WChar) { // C++ 3.9.1p5 + if ((LangOpts.CPlusPlus && LangOpts.WChar) || LangOpts.MicrosoftMode) { + // C++ 3.9.1p5 or -fms-compatibility. if (TargetInfo::isTypeSigned(Target.getWCharType())) InitBuiltinType(WCharTy, BuiltinType::WChar_S); else // -fshort-wchar makes wchar_t be unsigned. InitBuiltinType(WCharTy, BuiltinType::WChar_U); - } else // C99 (or C++ using -fno-wchar) + } else // C99 (or C++ using -fno-wchar) in non-MicrosoftMode. WCharTy = getFromTargetType(Target.getWCharType()); WIntTy = getFromTargetType(Target.getWIntType()); diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp index fa16facb63..a1f0b08494 100644 --- a/lib/AST/Type.cpp +++ b/lib/AST/Type.cpp @@ -1521,7 +1521,7 @@ StringRef BuiltinType::getName(const PrintingPolicy &Policy) const { case Double: return "double"; case LongDouble: return "long double"; case WChar_S: - case WChar_U: return "wchar_t"; + case WChar_U: return Policy.MSWChar ? "__wchar_t" : "wchar_t"; case Char16: return "char16_t"; case Char32: return "char32_t"; case NullPtr: return "nullptr_t"; diff --git a/test/Lexer/ms-compatibility-wchar.c b/test/Lexer/ms-compatibility-wchar.c new file mode 100644 index 0000000000..966292eeb1 --- /dev/null +++ b/test/Lexer/ms-compatibility-wchar.c @@ -0,0 +1,12 @@ +// RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility -triple i386-pc-win32 %s + +// C++ mode with -fno-wchar works the same as C mode for wchar_t. +// RUN: %clang_cc1 -x c++ -fno-wchar -fsyntax-only -verify -fms-compatibility -triple i386-pc-win32 %s + +wchar_t f(); // expected-error{{unknown type name 'wchar_t'}} + +// __wchar_t is available as an MS extension. +__wchar_t g; // expected-note {{previous}} + +// __wchar_t is a distinct type, separate from the target's integer type for wide chars. +unsigned short g; // expected-error {{redefinition of 'g' with a different type: 'unsigned short' vs '__wchar_t'}} diff --git a/test/Lexer/ms-extensions-wchar.c b/test/Lexer/ms-extensions-wchar.c new file mode 100644 index 0000000000..9321c3a914 --- /dev/null +++ b/test/Lexer/ms-extensions-wchar.c @@ -0,0 +1,12 @@ +// RUN: %clang_cc1 -fsyntax-only -verify -fms-extensions -triple i386-pc-win32 %s + +// C++ mode with -fno-wchar works the same as C mode for wchar_t. +// RUN: %clang_cc1 -x c++ -fno-wchar -fsyntax-only -verify -fms-extensions -triple i386-pc-win32 %s + +wchar_t f(); // expected-error{{unknown type name 'wchar_t'}} + +// __wchar_t is available as an MS extension. +__wchar_t g(); // No error. + +// __wchar_t is the same as the target's integer type for wide chars. +unsigned short g(); // No error. |