From 046af809f31e24d378a78820619cb0788afd62f9 Mon Sep 17 00:00:00 2001 From: Nina Dinka Ranns Date: Thu, 30 May 2019 19:48:48 +0000 Subject: [PATCH] LWG2788 basic_string spurious use of a default constructible allocator This only change the cxx11 basic_string, because COW strings don't correctly propagate allocators anyway. 2019-05-30 Nina Dinka Ranns LWG2788 basic_string spurious use of a default constructible allocator * include/bits/basic_string.tcc [_GLIBCXX_USE_CXX11_ABI] (basic_string::_M_replace_dispatch): Construct temporary string with the current allocator. * testsuite/21_strings/basic_string/allocator/char/lwg2788.cc: New. * testsuite/21_strings/basic_string/allocator/wchar_t/lwg2788.cc: New. From-SVN: r271789 --- libstdc++-v3/ChangeLog | 9 ++ libstdc++-v3/include/bits/basic_string.tcc | 4 +- .../basic_string/allocator/char/lwg2788.cc | 85 +++++++++++++++++++ .../basic_string/allocator/wchar_t/lwg2788.cc | 85 +++++++++++++++++++ 4 files changed, 182 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/lwg2788.cc create mode 100644 libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/lwg2788.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 15a388c62d3..cd535fe0887 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2019-05-30 Nina Dinka Ranns + + LWG2788 basic_string spurious use of a default constructible allocator + * include/bits/basic_string.tcc [_GLIBCXX_USE_CXX11_ABI] + (basic_string::_M_replace_dispatch): Construct temporary string with + the current allocator. + * testsuite/21_strings/basic_string/allocator/char/lwg2788.cc: New. + * testsuite/21_strings/basic_string/allocator/wchar_t/lwg2788.cc: New. + 2019-05-30 Jonathan Wakely * doc/xml/manual/diagnostics.xml: Update list of headers that define diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index e2315cb1467..ab986a6c827 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -381,7 +381,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _InputIterator __k1, _InputIterator __k2, std::__false_type) { - const basic_string __s(__k1, __k2); + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 2788. unintentionally require a default constructible allocator + const basic_string __s(__k1, __k2, this->get_allocator()); const size_type __n1 = __i2 - __i1; return _M_replace(__i1 - begin(), __n1, __s._M_data(), __s.size()); diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/lwg2788.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/lwg2788.cc new file mode 100644 index 00000000000..36dd414e887 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/char/lwg2788.cc @@ -0,0 +1,85 @@ +// { dg-do run { target c++11 } } +// { dg-require-effective-target cxx11-abi } + +// 2019-05-27 Nina Dinka Ranns +// +// Copyright (C) 2015-2019 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 +// . + +#include +#include + +using C = char; +using traits = std::char_traits; +int constructCount = 0; + +static void resetCounter() +{ + constructCount = 0; +} + +template +struct TestAllocator +{ + typedef Tp value_type; + using size_type = unsigned; + + TestAllocator() noexcept { constructCount++; } + + template + TestAllocator(const TestAllocator&) {} + + Tp *allocate(std::size_t n) + { return std::allocator().allocate(n); } + + void deallocate(Tp *p, std::size_t n) + { std::allocator().deallocate(p, n); } + +}; + +template +bool operator==(const TestAllocator&, const TestAllocator&) +{ return true; } +template +bool operator!=(const TestAllocator&, const TestAllocator&) +{ return false; } + +void test01() +{ + typedef TestAllocator alloc_type; + typedef std::basic_string test_type; + test_type v1{alloc_type()}; + std::string v2{"some_content"}; + + resetCounter(); + v1.assign(v2.begin(),v2.end()); + VERIFY( constructCount == 0); + + v1.append(v2.begin(),v2.end()); + VERIFY( constructCount == 0); + + v1.insert(v1.begin(),v1.begin(),v1.end()); + VERIFY( constructCount == 0); + + v1.replace(v1.begin(),v1.end(),v1.begin(),v1.end()); + VERIFY( constructCount == 0); +} +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/lwg2788.cc b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/lwg2788.cc new file mode 100644 index 00000000000..8e26dd7d4a9 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/allocator/wchar_t/lwg2788.cc @@ -0,0 +1,85 @@ +// { dg-do run { target c++11 } } +// { dg-require-effective-target cxx11-abi } + +// 2019-05-27 Nina Dinka Ranns +// +// Copyright (C) 2015-2019 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 +// . + +#include +#include + +using C = wchar_t; +using traits = std::char_traits; +int constructCount = 0; + +static void resetCounter() +{ + constructCount = 0; +} + +template +struct TestAllocator +{ + typedef Tp value_type; + using size_type = unsigned; + + TestAllocator() noexcept { constructCount++; } + + template + TestAllocator(const TestAllocator&) {} + + Tp *allocate(std::size_t n) + { return std::allocator().allocate(n); } + + void deallocate(Tp *p, std::size_t n) + { std::allocator().deallocate(p, n); } + +}; + +template +bool operator==(const TestAllocator&, const TestAllocator&) +{ return true; } +template +bool operator!=(const TestAllocator&, const TestAllocator&) +{ return false; } + +void test01() +{ + typedef TestAllocator alloc_type; + typedef std::basic_string test_type; + test_type v1{alloc_type()}; + std::wstring v2{L"some_content"}; + + resetCounter(); + v1.assign(v2.begin(),v2.end()); + VERIFY( constructCount == 0); + + v1.append(v2.begin(),v2.end()); + VERIFY( constructCount == 0); + + v1.insert(v1.begin(),v1.begin(),v1.end()); + VERIFY( constructCount == 0); + + v1.replace(v1.begin(),v1.end(),v1.begin(),v1.end()); + VERIFY( constructCount == 0); +} +int main() +{ + test01(); + return 0; +} -- 2.30.2