public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Tobias Burnus <burnus@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/omp/gcc-10] libstdc++: Remove noexcept from match_results comparisons (PR 94627) Date: Tue, 14 Jul 2020 10:54:03 +0000 (GMT) [thread overview] Message-ID: <20200714105403.443303861896@sourceware.org> (raw) https://gcc.gnu.org/g:4c994586cbd40a33f223aaaf90887afe97208543 commit 4c994586cbd40a33f223aaaf90887afe97208543 Author: Jonathan Wakely <jwakely@redhat.com> 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 6db05889e8c..4032fd7559b 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -2099,7 +2099,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 template<typename _Bi_iter, typename _Alloc> 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; @@ -2124,7 +2124,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 template<typename _Bi_iter, class _Alloc> 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); } #endif 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 +// <http://www.gnu.org/licenses/>. + +// { dg-do run { target c++11 } } + +#include <regex> +#include <testsuite_hooks.h> + +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<iterator> 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 ); +}
reply other threads:[~2020-07-14 10:54 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200714105403.443303861896@sourceware.org \ --to=burnus@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).