[libc++] Fixes basic_string operator& hijacking.
Avoids using operator& in basic_string since an evil char-like type can hijack this operator. Added some more evil operators, this found a place where equality was compared directly and not via the traits. This adds a helper test string. This is now only used in a few tests, but the intention is to use this in more tests for basic_string. Reviewed By: #libc, ldionne Differential Revision: https://reviews.llvm.org/D145257
This commit is contained in:
1 parent
347a65a164
commit
157f34af71
4 files changed
+276
-82
No files matched your search
+65
-67
@@ -15,91 +15,89 @@
|
||||
#include <cassert>
|
||||
|
||||
#include "test_macros.h"
|
||||
#include "nasty_string.h"
|
||||
#include "min_allocator.h"
|
||||
#include "test_allocator.h"
|
||||
|
||||
template <class S>
|
||||
TEST_CONSTEXPR_CXX20 void
|
||||
test(S s, S str, S expected)
|
||||
{
|
||||
s.assign(str);
|
||||
LIBCPP_ASSERT(s.__invariants());
|
||||
assert(s == expected);
|
||||
TEST_CONSTEXPR_CXX20 void test(S dest, S src) {
|
||||
dest.assign(src);
|
||||
LIBCPP_ASSERT(dest.__invariants());
|
||||
assert(dest == src);
|
||||
}
|
||||
|
||||
template <class S>
|
||||
TEST_CONSTEXPR_CXX20 void
|
||||
testAlloc(S s, S str, const typename S::allocator_type& a)
|
||||
testAlloc(S dest, S src, const typename S::allocator_type& a)
|
||||
{
|
||||
s.assign(str);
|
||||
LIBCPP_ASSERT(s.__invariants());
|
||||
assert(s == str);
|
||||
assert(s.get_allocator() == a);
|
||||
dest.assign(src);
|
||||
LIBCPP_ASSERT(dest.__invariants());
|
||||
assert(dest == src);
|
||||
assert(dest.get_allocator() == a);
|
||||
}
|
||||
|
||||
template <class S>
|
||||
TEST_CONSTEXPR_CXX20 void test_assign() {
|
||||
using CharT = typename S::value_type;
|
||||
|
||||
test(S(), S());
|
||||
test(S(), S(CONVERT_TO_CSTRING(CharT, "12345")));
|
||||
test(S(), S(CONVERT_TO_CSTRING(CharT, "1234567890")));
|
||||
test(S(), S(CONVERT_TO_CSTRING(CharT, "12345678901234567890")));
|
||||
|
||||
test(S(CONVERT_TO_CSTRING(CharT, "12345")), S());
|
||||
test(S(CONVERT_TO_CSTRING(CharT, "12345")), S(CONVERT_TO_CSTRING(CharT, "12345")));
|
||||
test(S(CONVERT_TO_CSTRING(CharT, "12345")), S(CONVERT_TO_CSTRING(CharT, "1234567890")));
|
||||
test(S(CONVERT_TO_CSTRING(CharT, "12345")), S(CONVERT_TO_CSTRING(CharT, "12345678901234567890")));
|
||||
|
||||
test(S(CONVERT_TO_CSTRING(CharT, "1234567890")), S());
|
||||
test(S(CONVERT_TO_CSTRING(CharT, "1234567890")), S(CONVERT_TO_CSTRING(CharT, "12345")));
|
||||
test(S(CONVERT_TO_CSTRING(CharT, "1234567890")), S(CONVERT_TO_CSTRING(CharT, "1234567890")));
|
||||
test(S(CONVERT_TO_CSTRING(CharT, "1234567890")), S(CONVERT_TO_CSTRING(CharT, "12345678901234567890")));
|
||||
|
||||
test(S(CONVERT_TO_CSTRING(CharT, "12345678901234567890")), S());
|
||||
test(S(CONVERT_TO_CSTRING(CharT, "12345678901234567890")), S(CONVERT_TO_CSTRING(CharT, "12345")));
|
||||
test(S(CONVERT_TO_CSTRING(CharT, "12345678901234567890")), S(CONVERT_TO_CSTRING(CharT, "1234567890")));
|
||||
test(S(CONVERT_TO_CSTRING(CharT, "12345678901234567890")), S(CONVERT_TO_CSTRING(CharT, "12345678901234567890")));
|
||||
}
|
||||
|
||||
TEST_CONSTEXPR_CXX20 bool test() {
|
||||
{
|
||||
typedef std::string S;
|
||||
test(S(), S(), S());
|
||||
test(S(), S("12345"), S("12345"));
|
||||
test(S(), S("1234567890"), S("1234567890"));
|
||||
test(S(), S("12345678901234567890"), S("12345678901234567890"));
|
||||
test_assign<std::string>();
|
||||
#ifndef TEST_HAS_NO_WIDE_CHARACTERS
|
||||
test_assign<std::wstring>();
|
||||
#endif
|
||||
#if TEST_STD_VER >= 20
|
||||
test_assign<std::u8string>();
|
||||
#endif
|
||||
#if TEST_STD_VER >= 11
|
||||
test_assign<std::u16string>();
|
||||
test_assign<std::u32string>();
|
||||
#endif
|
||||
#ifndef TEST_HAS_NO_NASTY_STRING
|
||||
test_assign<nasty_string>();
|
||||
#endif
|
||||
|
||||
test(S("12345"), S(), S());
|
||||
test(S("12345"), S("12345"), S("12345"));
|
||||
test(S("12345"), S("1234567890"), S("1234567890"));
|
||||
test(S("12345"), S("12345678901234567890"), S("12345678901234567890"));
|
||||
{
|
||||
typedef std::string S;
|
||||
testAlloc(S(), S(), std::allocator<char>());
|
||||
testAlloc(S(), S("12345"), std::allocator<char>());
|
||||
testAlloc(S(), S("1234567890"), std::allocator<char>());
|
||||
testAlloc(S(), S("12345678901234567890"), std::allocator<char>());
|
||||
}
|
||||
|
||||
test(S("1234567890"), S(), S());
|
||||
test(S("1234567890"), S("12345"), S("12345"));
|
||||
test(S("1234567890"), S("1234567890"), S("1234567890"));
|
||||
test(S("1234567890"), S("12345678901234567890"), S("12345678901234567890"));
|
||||
|
||||
test(S("12345678901234567890"), S(), S());
|
||||
test(S("12345678901234567890"), S("12345"), S("12345"));
|
||||
test(S("12345678901234567890"), S("1234567890"), S("1234567890"));
|
||||
test(S("12345678901234567890"), S("12345678901234567890"),
|
||||
S("12345678901234567890"));
|
||||
|
||||
testAlloc(S(), S(), std::allocator<char>());
|
||||
testAlloc(S(), S("12345"), std::allocator<char>());
|
||||
testAlloc(S(), S("1234567890"), std::allocator<char>());
|
||||
testAlloc(S(), S("12345678901234567890"), std::allocator<char>());
|
||||
}
|
||||
|
||||
{ // LWG#5579 make sure assign takes the allocators where appropriate
|
||||
typedef other_allocator<char> A; // has POCCA --> true
|
||||
typedef std::basic_string<char, std::char_traits<char>, A> S;
|
||||
testAlloc(S(A(5)), S(A(3)), A(3));
|
||||
testAlloc(S(A(5)), S("1"), A());
|
||||
testAlloc(S(A(5)), S("1", A(7)), A(7));
|
||||
testAlloc(S(A(5)), S("1234567890123456789012345678901234567890123456789012345678901234567890", A(7)), A(7));
|
||||
}
|
||||
{ // LWG#5579 make sure assign takes the allocators where appropriate
|
||||
typedef other_allocator<char> A; // has POCCA --> true
|
||||
typedef std::basic_string<char, std::char_traits<char>, A> S;
|
||||
testAlloc(S(A(5)), S(A(3)), A(3));
|
||||
testAlloc(S(A(5)), S("1"), A());
|
||||
testAlloc(S(A(5)), S("1", A(7)), A(7));
|
||||
testAlloc(S(A(5)), S("1234567890123456789012345678901234567890123456789012345678901234567890", A(7)), A(7));
|
||||
}
|
||||
|
||||
#if TEST_STD_VER >= 11
|
||||
{
|
||||
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
|
||||
test(S(), S(), S());
|
||||
test(S(), S("12345"), S("12345"));
|
||||
test(S(), S("1234567890"), S("1234567890"));
|
||||
test(S(), S("12345678901234567890"), S("12345678901234567890"));
|
||||
|
||||
test(S("12345"), S(), S());
|
||||
test(S("12345"), S("12345"), S("12345"));
|
||||
test(S("12345"), S("1234567890"), S("1234567890"));
|
||||
test(S("12345"), S("12345678901234567890"), S("12345678901234567890"));
|
||||
|
||||
test(S("1234567890"), S(), S());
|
||||
test(S("1234567890"), S("12345"), S("12345"));
|
||||
test(S("1234567890"), S("1234567890"), S("1234567890"));
|
||||
test(S("1234567890"), S("12345678901234567890"), S("12345678901234567890"));
|
||||
|
||||
test(S("12345678901234567890"), S(), S());
|
||||
test(S("12345678901234567890"), S("12345"), S("12345"));
|
||||
test(S("12345678901234567890"), S("1234567890"), S("1234567890"));
|
||||
test(S("12345678901234567890"), S("12345678901234567890"),
|
||||
S("12345678901234567890"));
|
||||
|
||||
test_assign<S>();
|
||||
testAlloc(S(), S(), min_allocator<char>());
|
||||
testAlloc(S(), S("12345"), min_allocator<char>());
|
||||
testAlloc(S(), S("1234567890"), min_allocator<char>());
|
||||
|
||||
Reference in new issue
Block a user