From 9678ffbe29a0b8db3d79126dc733509ee1f58546 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 5 Jan 2018 22:47:54 +0000 Subject: [PATCH] PR libstdc++/83598 don't modify flags passed to std::basic_regex constructors Backport from mainline 2017-12-27 Jonathan Wakely PR libstdc++/83598 * include/bits/regex.h (basic_regex): Don't modify flags passed to constructors. * testsuite/28_regex/basic_regex/ctors/83598.cc: New test. From-SVN: r256297 --- libstdc++-v3/ChangeLog | 8 ++++ .../28_regex/basic_regex/ctors/83598.cc | 37 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 libstdc++-v3/testsuite/28_regex/basic_regex/ctors/83598.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2e3b4565339d..aa81b4b705fa 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2018-01-05 Jonathan Wakely + Backport from mainline + 2017-12-27 Jonathan Wakely + + PR libstdc++/83598 + * include/bits/regex.h (basic_regex): Don't modify flags passed to + constructors. + * testsuite/28_regex/basic_regex/ctors/83598.cc: New test. + Backport from mainline 2017-12-14 Jonathan Wakely diff --git a/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/83598.cc b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/83598.cc new file mode 100644 index 000000000000..b958dfbe42fd --- /dev/null +++ b/libstdc++-v3/testsuite/28_regex/basic_regex/ctors/83598.cc @@ -0,0 +1,37 @@ +// Copyright (C) 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 +// . + +// { dg-do run { target c++11 } } + +#include +#include + +void +test01() +{ + // PR libstdc++83598 + std::regex r1(".", std::regex_constants::syntax_option_type{}); + VERIFY(r1.flags() == std::regex_constants::syntax_option_type{}); + std::regex r2(".", std::regex_constants::icase); + VERIFY(r2.flags() == std::regex_constants::icase); +} + +int +main() +{ + test01(); +} -- 2.47.2