diff mbox series

Fix test failure with old Copy-On-Write std::string

Message ID 20190104154235.GA28886@redhat.com
State New
Headers show
Series Fix test failure with old Copy-On-Write std::string | expand

Commit Message

Jonathan Wakely Jan. 4, 2019, 3:42 p.m. UTC 
* testsuite/27_io/filesystem/filesystem_error/copy.cc: Fix static
	assertion failures with old std::string ABI.

Tested x86_64-linux, committed to trunk.
commit 043782108101ec994884185e058d79ee4e19b57e
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Jan 4 14:14:01 2019 +0000

    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.
diff mbox series

Patch

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<filesystem_error>);
 static_assert(std::is_nothrow_copy_assignable_v<filesystem_error>);
+#endif
 
 void
 test01()