diff options
| author | Michael Wong <fraggamuffin@gmail.com> | 2015-02-24 13:34:20 +0000 |
|---|---|---|
| committer | Michael Wong <fraggamuffin@gmail.com> | 2015-02-24 13:34:20 +0000 |
| commit | 867eeb5861b44b105f17c1d9add88979a2ef2055 (patch) | |
| tree | 123d2d35b9df60b7415140621667564092ccaab3 | |
| parent | cec70130ac2916ed1050576a45d4485cf1dbe96a (diff) | |
| download | bcm5719-llvm-867eeb5861b44b105f17c1d9add88979a2ef2055.tar.gz bcm5719-llvm-867eeb5861b44b105f17c1d9add88979a2ef2055.zip | |
Commit patch for PR19649. Set the correct sign of wide character for literals based on underlying type of wchar_t.
Reviewed:
http://reviews.llvm.org/D7559
Patch by Rachel Craig; Test cases by Hubert Tong.
llvm-svn: 230333
| -rw-r--r-- | clang/lib/Lex/PPExpressions.cpp | 4 | ||||
| -rw-r--r-- | clang/test/Preprocessor/pr19649-signed-wchar_t.c | 6 | ||||
| -rw-r--r-- | clang/test/Preprocessor/pr19649-unsigned-wchar_t.c | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/clang/lib/Lex/PPExpressions.cpp b/clang/lib/Lex/PPExpressions.cpp index 9cf72cf8f8f..a6f16f80b79 100644 --- a/clang/lib/Lex/PPExpressions.cpp +++ b/clang/lib/Lex/PPExpressions.cpp @@ -310,7 +310,9 @@ static bool EvaluateValue(PPValue &Result, Token &PeekTok, DefinedTracker &DT, // Set the value. Val = Literal.getValue(); // Set the signedness. UTF-16 and UTF-32 are always unsigned - if (!Literal.isUTF16() && !Literal.isUTF32()) + if (Literal.isWide()) + Val.setIsUnsigned(!TargetInfo::isTypeSigned(TI.getWCharType())); + else if (!Literal.isUTF16() && !Literal.isUTF32()) Val.setIsUnsigned(!PP.getLangOpts().CharIsSigned); if (Result.Val.getBitWidth() > Val.getBitWidth()) { diff --git a/clang/test/Preprocessor/pr19649-signed-wchar_t.c b/clang/test/Preprocessor/pr19649-signed-wchar_t.c new file mode 100644 index 00000000000..f76f43163cb --- /dev/null +++ b/clang/test/Preprocessor/pr19649-signed-wchar_t.c @@ -0,0 +1,6 @@ +// RUN: %clang_cc1 -triple powerpc64-unknown-linux-gnu -E -x c %s +// RUN: %clang_cc1 -triple powerpc64-unknown-linux-gnu -E -fno-signed-char -x c %s + +#if (L'\0' - 1 > 0) +# error "Unexpected expression evaluation result" +#endif diff --git a/clang/test/Preprocessor/pr19649-unsigned-wchar_t.c b/clang/test/Preprocessor/pr19649-unsigned-wchar_t.c new file mode 100644 index 00000000000..4bbe1b57ce4 --- /dev/null +++ b/clang/test/Preprocessor/pr19649-unsigned-wchar_t.c @@ -0,0 +1,6 @@ +// RUN: %clang_cc1 -triple i386-pc-cygwin -E -x c %s +// RUN: %clang_cc1 -triple powerpc64-unknown-linux-gnu -E -fshort-wchar -x c %s + +#if (L'\0' - 1 < 0) +# error "Unexpected expression evaluation result" +#endif |
