Revert "Update aosp/master libcxx rebase to r263688"

The world is burning.

This reverts commit c004fd909c, reversing
changes made to 1418e4163d.

test/std/strings/basic.string/string.modifiers/string_append/initializer_list.pass.cpp

@@ -7,8 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: c++98, c++03
-
 // <string>
 
 // basic_string& append(initializer_list<charT> il);
@@ -16,20 +14,23 @@
 #include <string>
 #include <cassert>
 
-#include "test_macros.h"
 #include "min_allocator.h"
 
 int main()
 {
+#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
     {
         std::string s("123");
         s.append({'a', 'b', 'c'});
         assert(s == "123abc");
     }
+#if __cplusplus >= 201103L
     {
         typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
         S s("123");
         s.append({'a', 'b', 'c'});
         assert(s == "123abc");
     }
+#endif
+#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
 }

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

@@ -15,7 +15,7 @@
 #include <string>
 #include <cassert>
 
-#include "test_iterators.h"
+#include "../../input_iterator.h"
 #include "min_allocator.h"
 
 template <class S, class It>
@@ -23,26 +23,10 @@ void
 test(S s, It first, It last, S expected)
 {
     s.append(first, last);
-    LIBCPP_ASSERT(s.__invariants());
+    assert(s.__invariants());
     assert(s == expected);
 }
 
-#ifndef TEST_HAS_NO_EXCEPTIONS
-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 (...) {}
-    LIBCPP_ASSERT(s.__invariants());
-    assert(s == aCopy);
-}
-#endif
-
 int main()
 {
     {
@@ -103,7 +87,7 @@ int main()
     test(S("12345678901234567890"), input_iterator<const char*>(s), input_iterator<const char*>(s+52),
          S("12345678901234567890""ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
     }
-#if TEST_STD_VER >= 11
+#if __cplusplus >= 201103L
     {
     typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
     const char* s = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
@@ -163,19 +147,4 @@ int main()
          S("12345678901234567890""ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"));
     }
 #endif
-#ifndef TEST_HAS_NO_EXCEPTIONS
-	{ // 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());
-	}
-#endif
 }

test/std/strings/basic.string/string.modifiers/string_append/pointer.pass.cpp

@@ -15,7 +15,6 @@
 #include <stdexcept>
 #include <cassert>
 
-#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
@@ -23,7 +22,7 @@ void
 test(S s, const typename S::value_type* str, S expected)
 {
     s.append(str);
-    LIBCPP_ASSERT(s.__invariants());
+    assert(s.__invariants());
     assert(s == expected);
 }
 
@@ -44,7 +43,7 @@ int main()
     test(S("12345678901234567890"), "12345678901234567890",
          S("1234567890123456789012345678901234567890"));
     }
-#if TEST_STD_VER >= 11
+#if __cplusplus >= 201103L
     {
     typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
     test(S(), "", S());

test/std/strings/basic.string/string.modifiers/string_append/pointer_size.pass.cpp

@@ -16,7 +16,6 @@
 #include <stdexcept>
 #include <cassert>
 
-#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
@@ -24,7 +23,7 @@ void
 test(S s, const typename S::value_type* str, typename S::size_type n, S expected)
 {
     s.append(str, n);
-    LIBCPP_ASSERT(s.__invariants());
+    assert(s.__invariants());
     assert(s == expected);
 }
 
@@ -49,7 +48,7 @@ int main()
     test(S("12345678901234567890"), "12345678901234567890", 20,
          S("1234567890123456789012345678901234567890"));
     }
-#if TEST_STD_VER >= 11
+#if __cplusplus >= 201103L
     {
     typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
     test(S(), "", 0, S());

test/std/strings/basic.string/string.modifiers/string_append/push_back.pass.cpp

@@ -14,7 +14,6 @@
 #include <string>
 #include <cassert>
 
-#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
@@ -22,7 +21,7 @@ void
 test(S s, typename S::value_type c, S expected)
 {
     s.push_back(c);
-    LIBCPP_ASSERT(s.__invariants());
+    assert(s.__invariants());
     assert(s == expected);
 }
 
@@ -34,7 +33,7 @@ int main()
     test(S("12345"), 'a', S("12345a"));
     test(S("12345678901234567890"), 'a', S("12345678901234567890a"));
     }
-#if TEST_STD_VER >= 11
+#if __cplusplus >= 201103L
     {
     typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
     test(S(), 'a', S(1, 'a'));

test/std/strings/basic.string/string.modifiers/string_append/size_char.pass.cpp

@@ -15,7 +15,6 @@
 #include <string>
 #include <cassert>
 
-#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
@@ -23,7 +22,7 @@ void
 test(S s, typename S::size_type n, typename S::value_type c, S expected)
 {
     s.append(n, c);
-    LIBCPP_ASSERT(s.__invariants());
+    assert(s.__invariants());
     assert(s == expected);
 }
 
@@ -44,7 +43,7 @@ int main()
     test(S("12345678901234567890"), 1, 'a', S("12345678901234567890a"));
     test(S("12345678901234567890"), 10, 'a', S("12345678901234567890aaaaaaaaaa"));
     }
-#if TEST_STD_VER >= 11
+#if __cplusplus >= 201103L
     {
     typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
     test(S(), 0, 'a', S());

test/std/strings/basic.string/string.modifiers/string_append/string.pass.cpp

@@ -15,7 +15,6 @@
 #include <string>
 #include <cassert>
 
-#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
@@ -23,7 +22,7 @@ void
 test(S s, S str, S expected)
 {
     s.append(str);
-    LIBCPP_ASSERT(s.__invariants());
+    assert(s.__invariants());
     assert(s == expected);
 }
 
@@ -52,7 +51,7 @@ int main()
     test(S("12345678901234567890"), S("12345678901234567890"),
          S("1234567890123456789012345678901234567890"));
     }
-#if TEST_STD_VER >= 11
+#if __cplusplus >= 201103L
     {
     typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
     test(S(), S(), S());

test/std/strings/basic.string/string.modifiers/string_append/string_size_size.pass.cpp

@@ -7,7 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-// XFAIL: libcpp-no-exceptions
 // <string>
 
 // basic_string<charT,traits,Allocator>&
@@ -18,7 +17,6 @@
 #include <stdexcept>
 #include <cassert>
 
-#include "test_macros.h"
 #include "min_allocator.h"
 
 template <class S>
@@ -28,7 +26,7 @@ test(S s, S str, typename S::size_type pos, typename S::size_type n, S expected)
     try
     {
         s.append(str, pos, n);
-        LIBCPP_ASSERT(s.__invariants());
+        assert(s.__invariants());
         assert(pos <= str.size());
         assert(s == expected);
     }
@@ -45,7 +43,7 @@ test_npos(S s, S str, typename S::size_type pos, S expected)
     try
     {
         s.append(str, pos);
-        LIBCPP_ASSERT(s.__invariants());
+        assert(s.__invariants());
         assert(pos <= str.size());
         assert(s == expected);
     }
@@ -81,7 +79,7 @@ int main()
     test(S("12345678901234567890"), S("12345678901234567890"), 5, 10,
          S("123456789012345678906789012345"));
     }
-#if TEST_STD_VER >= 11
+#if __cplusplus >= 201103L
     {
     typedef std::basic_string<char, std::char_traits<char>, min_allocator<char>> S;
     test(S(), S(), 0, 0, S());