llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-23 10:07:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix PR#25973 : 'basic_string::assign(InputIt, InputIt) doesn't provide the strong exception safety guarantee'. This turned out to be a pervasive problem in <string>, which required a fair amount of rework. Add in an optimization for when iterators provide noexcept increment/comparison/assignment/dereference (which covers many of the iterators in libc++). Reviewed as http://reviews.llvm.org/D15862

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@257682 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2016-01-13 21:54:34 +00:00
parent b27535c0c3
commit df9db31c27
43 changed files with 771 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
View File

@@ -15,7 +15,7 @@
#include <string>
#include <cassert>
#include "../../input_iterator.h"
#include "test_iterators.h"
#include "min_allocator.h"
template <class S, class It>
@@ -27,6 +27,20 @@ test(S s, It first, It last, S expected)
assert(s == expected);
}
template <class S, class It>
void
test_exceptions(S s, It first, It last)
{
S aCopy = s;
try {
s.append(first, last);
assert(false);
}
catch (...) {}
assert(s.__invariants());
assert(s == aCopy);
}
int main()
{
{
@@ -87,7 +101,7 @@ int main()
test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
S("12345678901234567890""ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
}
#if __cplusplus >= 201103L
#if TEST_STD_VER >= 11
{
typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
const char* s = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
@@ -147,4 +161,17 @@ int main()
S("12345678901234567890""ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
}
#endif
{ // test iterator operations that throw
typedef std::string S;
typedef ThrowingIterator<char> TIter;
typedef input_iterator<TIter> IIter;
const char* s = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
test_exceptions(S(), IIter(TIter(s, s+10, 4, TIter::TAIncrement)), IIter());
test_exceptions(S(), IIter(TIter(s, s+10, 5, TIter::TADereference)), IIter());
test_exceptions(S(), IIter(TIter(s, s+10, 6, TIter::TAComparison)), IIter());
test_exceptions(S(), TIter(s, s+10, 4, TIter::TAIncrement), TIter());
test_exceptions(S(), TIter(s, s+10, 5, TIter::TADereference), TIter());
test_exceptions(S(), TIter(s, s+10, 6, TIter::TAComparison), TIter());
}
}