From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 238D2385B52C; Wed, 22 Mar 2023 17:49:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 238D2385B52C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679507367; bh=ZgzQqdmczLjkFyc4QAbjqKO4tuA7J/lI8Z0pJ99mYn8=; h=From:To:Subject:Date:From; b=PLysRAbaY+fXDZFtOePnmUvJtVBR7IV/9EqSjpZWaxmm7OuKbIVa/sFN5yNrLrNrH +u7eHRW9xEWzm4GsJJtWZ49+MIIZJLWC6/lpVRaU45dA2dLQtnY+WMdoGra2IaFuuc vFpfBu6EksGX2YMlVC+rhjQvuyEvWi3K4xd5rjY0= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-6806] libstdc++: Add allocator-extended constructors to std::match_results (LWG 2195) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: ad0b9cf1a076fb9a802d9ba7fa2223aa3166dca2 X-Git-Newrev: 9ae1108196ed65647846a7c06052317e8fa4852d Message-Id: <20230322174927.238D2385B52C@sourceware.org> Date: Wed, 22 Mar 2023 17:49:27 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9ae1108196ed65647846a7c06052317e8fa4852d commit r13-6806-g9ae1108196ed65647846a7c06052317e8fa4852d Author: Jonathan Wakely Date: Wed Mar 22 11:36:06 2023 +0000 libstdc++: Add allocator-extended constructors to std::match_results (LWG 2195) This was approved in Issaquah last month. libstdc++-v3/ChangeLog: * include/bits/regex.h (match_results): Add allocator-extended copy and move constructors, as per LWG 2195. * testsuite/28_regex/match_results/ctors/char/alloc.cc: New test. Diff: --- libstdc++-v3/include/bits/regex.h | 10 ++++ .../28_regex/match_results/ctors/char/alloc.cc | 56 ++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index 386f4be9f4a..79903fad1e5 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -1826,6 +1826,16 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 */ ~match_results() = default; + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 2195. Missing constructors for match_results + + match_results(const match_results& __m, const _Alloc& __a) + : _Base_type(__m, __a) { } + + match_results(match_results&& __m, const _Alloc& __a) + noexcept(noexcept(_Base_type(std::move(__m), __a))) + : _Base_type(std::move(__m), __a) { } + ///@} // 28.10.2, state: diff --git a/libstdc++-v3/testsuite/28_regex/match_results/ctors/char/alloc.cc b/libstdc++-v3/testsuite/28_regex/match_results/ctors/char/alloc.cc new file mode 100644 index 00000000000..bb5e7a91bd7 --- /dev/null +++ b/libstdc++-v3/testsuite/28_regex/match_results/ctors/char/alloc.cc @@ -0,0 +1,56 @@ +// { dg-do run { target c++11 } } + +#include +#include +#include + +// LWG 2195. Missing constructors for match_results + +void +test01() +{ + using Alloc = std::cmatch::allocator_type; + std::cmatch m1; + std::cmatch m2(m1, m1.get_allocator()); + VERIFY( m2 == m1 ); + + static_assert( ! std::is_nothrow_constructible(), + "Allocator-extended copy ctor is potentially-throwing" ); + + std::cmatch m3(std::move(m1), m2.get_allocator()); + VERIFY( m3 == m2 ); + + // Libstdc++ extension: + static_assert( std::is_nothrow_constructible(), + "Allocator-extended move ctor is non-throwing" ); +} + +void +test02() +{ + using Alloc = __gnu_test::uneq_allocator; + using MR = std::match_results; + + MR m1(Alloc(1)); + MR m2(m1, Alloc(2)); + VERIFY( m2 == m1 ); + + static_assert( ! std::is_nothrow_constructible(), + "Allocator-extended copy ctor is potentially-throwing" ); + + MR m3(std::move(m1), Alloc(3)); + VERIFY( m3 == m2 ); + + static_assert( ! std::is_nothrow_constructible(), + "Allocator-extended move ctor is potentially-throwing" ); +} + +int main() +{ + test01(); + test02(); +}