diff options
| -rw-r--r-- | clang/lib/AST/ExprConstant.cpp | 14 | ||||
| -rw-r--r-- | clang/test/SemaCXX/constexpr-string.cpp | 13 |
2 files changed, 25 insertions, 2 deletions
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp index 623cb54a6fe..81577248612 100644 --- a/clang/lib/AST/ExprConstant.cpp +++ b/clang/lib/AST/ExprConstant.cpp @@ -8046,14 +8046,24 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const CallExpr *E, BuiltinOp != Builtin::BIwmemcmp && BuiltinOp != Builtin::BI__builtin_memcmp && BuiltinOp != Builtin::BI__builtin_wmemcmp); + bool IsWide = BuiltinOp == Builtin::BIwcscmp || + BuiltinOp == Builtin::BIwcsncmp || + BuiltinOp == Builtin::BIwmemcmp || + BuiltinOp == Builtin::BI__builtin_wcscmp || + BuiltinOp == Builtin::BI__builtin_wcsncmp || + BuiltinOp == Builtin::BI__builtin_wmemcmp; for (; MaxLength; --MaxLength) { APValue Char1, Char2; if (!handleLValueToRValueConversion(Info, E, CharTy, String1, Char1) || !handleLValueToRValueConversion(Info, E, CharTy, String2, Char2) || !Char1.isInt() || !Char2.isInt()) return false; - if (Char1.getInt() != Char2.getInt()) - return Success(Char1.getInt() < Char2.getInt() ? -1 : 1, E); + if (Char1.getInt() != Char2.getInt()) { + if (IsWide) // wmemcmp compares with wchar_t signedness. + return Success(Char1.getInt() < Char2.getInt() ? -1 : 1, E); + // memcmp always compares unsigned chars. + return Success(Char1.getInt().ult(Char2.getInt()) ? -1 : 1, E); + } if (StopAtNull && !Char1.getInt()) return Success(0, E); assert(!(StopAtNull && !Char2.getInt())); diff --git a/clang/test/SemaCXX/constexpr-string.cpp b/clang/test/SemaCXX/constexpr-string.cpp index fba05e508ab..4847afebda6 100644 --- a/clang/test/SemaCXX/constexpr-string.cpp +++ b/clang/test/SemaCXX/constexpr-string.cpp @@ -53,6 +53,8 @@ namespace StrcmpEtc { static_assert(__builtin_strcmp("abab", "abaa") == 1); static_assert(__builtin_strcmp("ababa", "abab") == 1); static_assert(__builtin_strcmp("abab", "ababa") == -1); + static_assert(__builtin_strcmp("a\203", "a") == 1); + static_assert(__builtin_strcmp("a\203", "a\003") == 1); static_assert(__builtin_strcmp("abab\0banana", "abab") == 0); static_assert(__builtin_strcmp("abab", "abab\0banana") == 0); static_assert(__builtin_strcmp("abab\0banana", "abab\0canada") == 0); @@ -78,6 +80,8 @@ namespace StrcmpEtc { static_assert(__builtin_memcmp("abaa", "abba", 3) == -1); static_assert(__builtin_memcmp("abaa", "abba", 2) == 0); + static_assert(__builtin_memcmp("a\203", "a", 2) == 1); + static_assert(__builtin_memcmp("a\203", "a\003", 2) == 1); static_assert(__builtin_memcmp(0, 0, 0) == 0); static_assert(__builtin_memcmp("abab\0banana", "abab\0banana", 100) == 0); // expected-error {{not an integral constant}} expected-note {{dereferenced one-past-the-end}} static_assert(__builtin_memcmp("abab\0banana", "abab\0canada", 100) == -1); // FIXME: Should we reject this? @@ -102,6 +106,9 @@ namespace WcscmpEtc { static_assert(__builtin_wcscmp(L"abab\0banana", L"abab") == 0); static_assert(__builtin_wcscmp(L"abab", L"abab\0banana") == 0); static_assert(__builtin_wcscmp(L"abab\0banana", L"abab\0canada") == 0); +#if __WCHAR_WIDTH__ == 32 + static_assert(__builtin_wcscmp(L"a\x83838383", L"a") == -1); +#endif static_assert(__builtin_wcscmp(0, L"abab") == 0); // expected-error {{not an integral constant}} expected-note {{dereferenced null}} static_assert(__builtin_wcscmp(L"abab", 0) == 0); // expected-error {{not an integral constant}} expected-note {{dereferenced null}} @@ -116,6 +123,9 @@ namespace WcscmpEtc { static_assert(__builtin_wcsncmp(L"abaa", L"abba", 0) == 0); static_assert(__builtin_wcsncmp(0, 0, 0) == 0); static_assert(__builtin_wcsncmp(L"abab\0banana", L"abab\0canada", 100) == 0); +#if __WCHAR_WIDTH__ == 32 + static_assert(__builtin_wcsncmp(L"a\x83838383", L"aa", 2) == -1); +#endif static_assert(__builtin_wcsncmp(kFoobar, kFoobazfoobar, 6) == -1); static_assert(__builtin_wcsncmp(kFoobar, kFoobazfoobar, 7) == -1); // FIXME: Should we reject this? @@ -125,6 +135,9 @@ namespace WcscmpEtc { static_assert(__builtin_wmemcmp(L"abaa", L"abba", 3) == -1); static_assert(__builtin_wmemcmp(L"abaa", L"abba", 2) == 0); static_assert(__builtin_wmemcmp(0, 0, 0) == 0); +#if __WCHAR_WIDTH__ == 32 + static_assert(__builtin_wmemcmp(L"a\x83838383", L"aa", 2) == -1); +#endif static_assert(__builtin_wmemcmp(L"abab\0banana", L"abab\0banana", 100) == 0); // expected-error {{not an integral constant}} expected-note {{dereferenced one-past-the-end}} static_assert(__builtin_wmemcmp(L"abab\0banana", L"abab\0canada", 100) == -1); // FIXME: Should we reject this? static_assert(__builtin_wmemcmp(L"abab\0banana", L"abab\0canada", 7) == -1); |
