From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 858373851C11; Wed, 1 Jul 2020 22:21:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 858373851C11 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1593642082; bh=N2HMg6GCejphSnKGWIMXke+TIBUwEgrUH36q3I++WMg=; h=From:To:Subject:Date:From; b=BHiwrjKEX3TgzURhCywcuHsDSyDUuLhs895hA0fHonjwU+0ln0BQ9rr4BYpd91PuK B72yNGJsVKLlCYjqzhMTnLkb8mSFwKg5HXmdhX80fnPvFUrnxL9cX269CYpNWi3hDW 7iu8KXBmYuysf1Nzb9WsEsTUllPQI1RxX0C+NEu0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r9-8713] libstdc++: Remove noexcept from match_results comparisons (PR 94627) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: 0c6cec5ce99a7f532d66373e0ba340c94ef688a6 X-Git-Newrev: e4490e7771e4df28427cca5e113afe58a7fff8d5 Message-Id: <20200701222122.858373851C11@sourceware.org> Date: Wed, 1 Jul 2020 22:21:22 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jul 2020 22:21:22 -0000 https://gcc.gnu.org/g:e4490e7771e4df28427cca5e113afe58a7fff8d5 commit r9-8713-ge4490e7771e4df28427cca5e113afe58a7fff8d5 Author: Jonathan Wakely Date: Wed Jul 1 21:01:15 2020 +0100 libstdc++: Remove noexcept from match_results comparisons (PR 94627) These functions can't be noexcept because the iterators stored in the sub_match objects can throw on any operation. libstdc++-v3/ChangeLog: PR libstdc++/94627 * include/bits/regex.h (operator==, operator!=): Remove noexcept equality comparisons for match_results. * testsuite/28_regex/match_results/94627.cc: New test. (cherry picked from commit a1a0dc4548979f8a340a7ea71624a52a20e1e0b3) Diff: --- libstdc++-v3/include/bits/regex.h | 4 +- .../testsuite/28_regex/match_results/94627.cc | 75 ++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index 7576cd7a9c0..2bfed517d16 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -1989,7 +1989,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 template inline bool operator==(const match_results<_Bi_iter, _Alloc>& __m1, - const match_results<_Bi_iter, _Alloc>& __m2) noexcept + const match_results<_Bi_iter, _Alloc>& __m2) { if (__m1.ready() != __m2.ready()) return false; @@ -2013,7 +2013,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 template inline bool operator!=(const match_results<_Bi_iter, _Alloc>& __m1, - const match_results<_Bi_iter, _Alloc>& __m2) noexcept + const match_results<_Bi_iter, _Alloc>& __m2) { return !(__m1 == __m2); } // [7.10.6] match_results swap diff --git a/libstdc++-v3/testsuite/28_regex/match_results/94627.cc b/libstdc++-v3/testsuite/28_regex/match_results/94627.cc new file mode 100644 index 00000000000..dc4883c19a0 --- /dev/null +++ b/libstdc++-v3/testsuite/28_regex/match_results/94627.cc @@ -0,0 +1,75 @@ +// Copyright (C) 2020 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 +// . + +// { dg-do run { target c++11 } } + +#include +#include + +struct iterator +{ + using value_type = char; + using difference_type = std::ptrdiff_t; + using reference = char&; + using pointer = char*; + using iterator_category = std::bidirectional_iterator_tag; + + iterator() : ptr() { } + explicit iterator(pointer p) : ptr(p) { } + + iterator& operator++() { if (bang) throw 1; ++ptr; return *this; } + iterator operator++(int) { auto copy = *this; ++*this; return copy; } + iterator& operator--() { if (bang) throw 1; --ptr; return *this; } + iterator operator--(int) { auto copy = *this; --*this; return copy; } + + reference operator*() const noexcept { return *ptr; } + pointer operator->() const noexcept { return ptr; } + + bool operator==(iterator rhs) const noexcept { return ptr == rhs.ptr; } + bool operator!=(iterator rhs) const noexcept { return ptr != rhs.ptr; } + + static bool bang; + +private: + pointer ptr; +}; + +bool iterator::bang = false; + +int main() +{ + char str[] = "abc"; + std::regex r(str); + std::match_results m; + std::regex_match(iterator(str), iterator(str+3), m, r); + iterator::bang = true; + bool caught = false; + try { + (void) (m == m); + } catch (int) { + caught = true; + } + VERIFY( caught ); + caught = false; + + try { + (void) (m != m); + } catch (int) { + caught = true; + } + VERIFY( caught ); +}