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 | 3f59c975aa5d047f7edd1b900b5e885c38af0ef7 (patch) | |
| tree | 2fbe959271ee3bfd09aeaf5b035507fc87f13ba2 /lib/CodeGen | |
| parent | af6530c938bfc60902f0dfec1c0808aedbee1663 (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@122558 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen')
| -rw-r--r-- | lib/CodeGen/CGRTTI.cpp | 3 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenTypes.cpp | 3 | ||||
| -rw-r--r-- | lib/CodeGen/Mangle.cpp | 3 | ||||
| -rw-r--r-- | lib/CodeGen/MicrosoftCXXABI.cpp | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/lib/CodeGen/CGRTTI.cpp b/lib/CodeGen/CGRTTI.cpp index a8893d1fc6..444062bbff 100644 --- a/lib/CodeGen/CGRTTI.cpp +++ b/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/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp index dde1322e3c..6658179d7f 100644 --- a/lib/CodeGen/CodeGenTypes.cpp +++ b/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/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp index 4659831a66..a45403e467 100644 --- a/lib/CodeGen/Mangle.cpp +++ b/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/lib/CodeGen/MicrosoftCXXABI.cpp b/lib/CodeGen/MicrosoftCXXABI.cpp index aa9046f981..875c66c2a4 100644 --- a/lib/CodeGen/MicrosoftCXXABI.cpp +++ b/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: |