summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2011-04-06 18:42:48 +0000
committerAnders Carlsson <andersca@mac.com>2011-04-06 18:42:48 +0000
commit6b06e18c7075062f992d7619caef354fe479a232 (patch)
tree6e6aa2ac892d3b23d0147bd51a04c106ca1a7886 /clang/lib
parent3b9819b4a2f11ab168630f6daa6b2287800fa671 (diff)
downloadbcm5719-llvm-6b06e18c7075062f992d7619caef354fe479a232.tar.gz
bcm5719-llvm-6b06e18c7075062f992d7619caef354fe479a232.zip
Wide Pascal strings should be of type wchar_t[] and not unsigned char[].
llvm-svn: 129017
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Sema/SemaExpr.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 55155efa696..13ac32dcb13 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -744,8 +744,10 @@ Sema::ActOnStringLiteral(const Token *StringToks, unsigned NumStringToks) {
StringTokLocs.push_back(StringToks[i].getLocation());
QualType StrTy = Context.CharTy;
- if (Literal.AnyWide) StrTy = Context.getWCharType();
- if (Literal.Pascal) StrTy = Context.UnsignedCharTy;
+ if (Literal.AnyWide)
+ StrTy = Context.getWCharType();
+ else if (Literal.Pascal)
+ StrTy = Context.UnsignedCharTy;
// A C++ string literal has a const-qualified element type (C++ 2.13.4p1).
if (getLangOptions().CPlusPlus || getLangOptions().ConstStrings)
OpenPOWER on IntegriCloud