diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-12-25 23:25:43 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-12-25 23:25:43 +0000 |
| commit | ad3467ee8997900b16a7239b79a33235923a3c0d (patch) | |
| tree | fa5579582ba25f07c32a6b9ee28784ed7c8d2e5f /clang/lib/CodeGen | |
| parent | 03a102bff3bf1dbb37cac3f4e201e4b28b46a2fe (diff) | |
| download | bcm5719-llvm-ad3467ee8997900b16a7239b79a33235923a3c0d.tar.gz bcm5719-llvm-ad3467ee8997900b16a7239b79a33235923a3c0d.zip | |
The -fshort-wchar option causes wchar_t to become unsigned, in addition to being
16-bits in size. Implement this by splitting WChar into two enums, like we have
for char. This fixes a miscompmilation of XULRunner, PR8856.
llvm-svn: 122558
Diffstat (limited to 'clang/lib/CodeGen')
| -rw-r--r-- | clang/lib/CodeGen/CGRTTI.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/CodeGen/CodeGenTypes.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/CodeGen/Mangle.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/CodeGen/MicrosoftCXXABI.cpp | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGRTTI.cpp b/clang/lib/CodeGen/CGRTTI.cpp index a8893d1fc6e..444062bbfff 100644 --- a/clang/lib/CodeGen/CGRTTI.cpp +++ b/clang/lib/CodeGen/CGRTTI.cpp @@ -196,7 +196,8 @@ static bool TypeInfoIsInStandardLibrary(const BuiltinType *Ty) { case BuiltinType::Void: case BuiltinType::NullPtr: case BuiltinType::Bool: - case BuiltinType::WChar: + case BuiltinType::WChar_S: + case BuiltinType::WChar_U: case BuiltinType::Char_U: case BuiltinType::Char_S: case BuiltinType::UChar: diff --git a/clang/lib/CodeGen/CodeGenTypes.cpp b/clang/lib/CodeGen/CodeGenTypes.cpp index dde1322e3c2..6658179d7f9 100644 --- a/clang/lib/CodeGen/CodeGenTypes.cpp +++ b/clang/lib/CodeGen/CodeGenTypes.cpp @@ -228,7 +228,8 @@ const llvm::Type *CodeGenTypes::ConvertNewType(QualType T) { case BuiltinType::ULong: case BuiltinType::LongLong: case BuiltinType::ULongLong: - case BuiltinType::WChar: + case BuiltinType::WChar_S: + case BuiltinType::WChar_U: case BuiltinType::Char16: case BuiltinType::Char32: return llvm::IntegerType::get(getLLVMContext(), diff --git a/clang/lib/CodeGen/Mangle.cpp b/clang/lib/CodeGen/Mangle.cpp index 4659831a66d..a45403e467e 100644 --- a/clang/lib/CodeGen/Mangle.cpp +++ b/clang/lib/CodeGen/Mangle.cpp @@ -1233,7 +1233,8 @@ void CXXNameMangler::mangleType(const BuiltinType *T) { case BuiltinType::ULongLong: Out << 'y'; break; case BuiltinType::UInt128: Out << 'o'; break; case BuiltinType::SChar: Out << 'a'; break; - case BuiltinType::WChar: Out << 'w'; break; + case BuiltinType::WChar_S: + case BuiltinType::WChar_U: Out << 'w'; break; case BuiltinType::Char16: Out << "Ds"; break; case BuiltinType::Char32: Out << "Di"; break; case BuiltinType::Short: Out << 's'; break; diff --git a/clang/lib/CodeGen/MicrosoftCXXABI.cpp b/clang/lib/CodeGen/MicrosoftCXXABI.cpp index aa9046f981b..875c66c2a47 100644 --- a/clang/lib/CodeGen/MicrosoftCXXABI.cpp +++ b/clang/lib/CodeGen/MicrosoftCXXABI.cpp @@ -756,7 +756,8 @@ void MicrosoftCXXNameMangler::mangleType(const BuiltinType *T) { case BuiltinType::Int128: Out << "_L"; break; case BuiltinType::UInt128: Out << "_M"; break; case BuiltinType::Bool: Out << "_N"; break; - case BuiltinType::WChar: Out << "_W"; break; + case BuiltinType::WChar_S: + case BuiltinType::WChar_U: Out << "_W"; break; case BuiltinType::Overload: case BuiltinType::Dependent: |
