Revert "Revert "Merge to upstream r304942.""

This reverts commit 38a0d5af7e. Test: make checkbuild Test: ./run_tests.py Test: ./run_tests.py --bitness 64
2018-01-17 14:21:02 -08:00
parent 38a0d5af7e
commit c79549b70e
1102 changed files with 19092 additions and 14798 deletions
--- a/test/libcxx/localization/locales/locale.convenience/conversions/conversions.string/ctor_move.pass.cpp
+++ b/test/libcxx/localization/locales/locale.convenience/conversions/conversions.string/ctor_move.pass.cpp
@@ -7,6 +7,9 @@
 //
 //===----------------------------------------------------------------------===//

+// 'do_bytes' throws a std::range_error unexpectedly
+// XFAIL: LIBCXX-WINDOWS-FIXME
+
 // UNSUPPORTED: c++98, c++03

 // <locale>