From 66f31224361a429dca68058cbfe928bc8a6601e1 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 4 Jan 2019 15:42:33 +0000 Subject: [PATCH] Fix test failure with old Copy-On-Write std::string * testsuite/27_io/filesystem/filesystem_error/copy.cc: Fix static assertion failures with old std::string ABI. From-SVN: r267577 --- libstdc++-v3/ChangeLog | 3 +++ .../27_io/filesystem/filesystem_error/copy.cc | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 499812cbad6..00550d8ad48 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,8 @@ 2019-01-04 Jonathan Wakely + * testsuite/27_io/filesystem/filesystem_error/copy.cc: Fix static + assertion failures with old std::string ABI. + * include/bits/fs_path.h (path::_List::erase): Replace both overloads with ... (path::pop_back(), path::_M_erase_from(const_iterator)): New member diff --git a/libstdc++-v3/testsuite/27_io/filesystem/filesystem_error/copy.cc b/libstdc++-v3/testsuite/27_io/filesystem/filesystem_error/copy.cc index 529e1e406e2..71eac38e0d3 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/filesystem_error/copy.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/filesystem_error/copy.cc @@ -24,9 +24,19 @@ using std::filesystem::filesystem_error; +// The COW std::string does not have noexcept copies, because copying a +// "leaked" string can throw (and for fully-dynamic strings, copying the +// empty rep can also throw). +// That's OK, because we know that the std::string in the std::runtime_error +// or std::logic_error base class won't be leaked (and usually won't be empty). +// The is_nothrow_xxx type traits don't know that though, so we can only +// check them for the cxx11 ABI, which uses __cow_string, which has noexcept +// copies. +#if _GLIBCXX_USE_CXX11_ABI // PR libstdc++/83306 static_assert(std::is_nothrow_copy_constructible_v); static_assert(std::is_nothrow_copy_assignable_v); +#endif void test01() -- 2.30.2