PR libstdc++/83598 don't modify flags passed to std::basic_regex constructors

Backport from mainline
2017-12-27  Jonathan Wakely  <jwakely@redhat.com>

	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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2e3b4565339deeae1390dae12c3ccb0739806792..aa81b4b705fa95b57601934199334397c4fc936a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,13 @@
 2018-01-05  Jonathan Wakely  <jwakely@redhat.com>
 
+       Backport from mainline
+       2017-12-27  Jonathan Wakely  <jwakely@redhat.com>
+
+       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  <jwakely@redhat.com>
 

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 (file)
index 0000000..b958dfb
--- /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
+// <http://www.gnu.org/licenses/>.
+
+// { dg-do run { target c++11 } }
+
+#include <regex>
+#include <testsuite_hooks.h>
+
+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();
+}