From 4cf5930fdc57650226d53eb4809ee4e565799456 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 20 Sep 2017 18:59:50 +0100 Subject: [PATCH] PR libstdc++/79162 Fix std::string regression due to LWG 2946 PR libstdc++/79162 * include/bits/basic_string.h (basic_string::_If_sv): Remove from the overload set when the argument is derived from basic_string. * testsuite/21_strings/basic_string/cons/char/moveable2_c++17.cc: New test. * testsuite/21_strings/basic_string/cons/wchar_t/moveable2_c++17.cc: New test. From-SVN: r253024 --- libstdc++-v3/ChangeLog | 8 +++ libstdc++-v3/include/bits/basic_string.h | 1 + .../basic_string/cons/char/moveable2_c++17.cc | 53 +++++++++++++++++++ .../cons/wchar_t/moveable2_c++17.cc | 53 +++++++++++++++++++ 4 files changed, 115 insertions(+) create mode 100644 libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2_c++17.cc create mode 100644 libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2_c++17.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9019455cbf8..ceb883eab12 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2017-09-20 Jonathan Wakely + PR libstdc++/79162 + * include/bits/basic_string.h (basic_string::_If_sv): Remove from the + overload set when the argument is derived from basic_string. + * testsuite/21_strings/basic_string/cons/char/moveable2_c++17.cc: New + test. + * testsuite/21_strings/basic_string/cons/wchar_t/moveable2_c++17.cc: + New test. + * testsuite/24_iterators/range_access_cpp17.cc: Fix order of dg-do and dg-options directives. Fix invalid test. diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 0ef139b2c2b..8a382d5640c 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -115,6 +115,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 template using _If_sv = enable_if_t< __and_, + __not_>, __not_>>::value, _Res>; diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2_c++17.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2_c++17.cc new file mode 100644 index 00000000000..88be60d05ab --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/moveable2_c++17.cc @@ -0,0 +1,53 @@ +// { dg-options "-std=gnu++17" } +// { dg-do run { target c++17 } } + +// Copyright (C) 2011-2017 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// NOTE: This makes use of the fact that we know how moveable +// is implemented on string (via swap). If the implementation changed +// this test may begin to fail. + +#include +#include +#include + +class tstring : public std::basic_string +{ +public: + tstring() : std::basic_string() {} + tstring(tstring&& s) : std::basic_string(std::move(s)) {} + tstring& operator=(tstring&& s) = default; +}; + +void test01() +{ + tstring a, b; + a.push_back('1'); + b = std::move(a); + VERIFY( b.size() == 1 && b[0] == '1' && a.size() == 0 ); + + tstring c(std::move(b)); + VERIFY( c.size() == 1 && c[0] == '1' ); + VERIFY( b.size() == 0 ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2_c++17.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2_c++17.cc new file mode 100644 index 00000000000..63684de68a6 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/moveable2_c++17.cc @@ -0,0 +1,53 @@ +// { dg-options "-std=gnu++17" } +// { dg-do run { target c++17 } } + +// Copyright (C) 2011-2017 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// NOTE: This makes use of the fact that we know how moveable +// is implemented on string (via swap). If the implementation changed +// this test may begin to fail. + +#include +#include +#include + +class tstring : public std::basic_string +{ +public: + tstring() : std::basic_string() {} + tstring(tstring&& s) : std::basic_string(std::move(s)) {} + tstring& operator=(tstring&& s) = default; +}; + +void test01() +{ + tstring a, b; + a.push_back(L'1'); + b = std::move(a); + VERIFY( b.size() == 1 && b[0] == L'1' && a.size() == 0 ); + + tstring c(std::move(b)); + VERIFY( c.size() == 1 && c[0] == L'1' ); + VERIFY( b.size() == 0 ); +} + +int main() +{ + test01(); + return 0; +} -- 2.30.2