diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2013-05-04 16:56:22 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2013-05-04 16:56:22 +0000 |
| commit | f9734241b141ad9c19969bab9b56dd4246e35e7d (patch) | |
| tree | 079f1231cac302394a027ac262a4cf15c646a5df /lib | |
| parent | aa3d68af3b533ee79a862f2c6d159b79d278a6fc (diff) | |
Reverting r181004 since it has broken test/Sema/wchar.c.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@181122 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AST/ASTContext.cpp | 5 | ||||
| -rw-r--r-- | lib/AST/Type.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index b827dc1080..e6dfd445ad 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -897,13 +897,12 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target) { InitBuiltinType(Int128Ty, BuiltinType::Int128); InitBuiltinType(UnsignedInt128Ty, BuiltinType::UInt128); - if ((LangOpts.CPlusPlus && LangOpts.WChar) || LangOpts.MicrosoftMode) { - // C++ 3.9.1p5 or -fms-compatibility. + if (LangOpts.CPlusPlus && LangOpts.WChar) { // C++ 3.9.1p5 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) in non-MicrosoftMode. + } else // C99 (or C++ using -fno-wchar) WCharTy = getFromTargetType(Target.getWCharType()); WIntTy = getFromTargetType(Target.getWIntType()); diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp index a1f0b08494..fa16facb63 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 Policy.MSWChar ? "__wchar_t" : "wchar_t"; + case WChar_U: return "wchar_t"; case Char16: return "char16_t"; case Char32: return "char32_t"; case NullPtr: return "nullptr_t"; |