commit 2dc9acc2289801765d726c65996e9e0cddca0d6d
Author: tim <timshen91@gmail.com>
Date:   Fri Oct 4 00:53:08 2013 -0400

    2013-10-04  Tim Shen  <timshen91@gmail.com>
    
    	* include/bits/regex.h
    	(__regex_match_impl<>, __regex_match_testsuite<>,
    	 __regex_search_impl<>, __regex_search_testsuite<>): Declare.
    	* include/bits/regex.tcc
    	(__regex_match_impl<>, __regex_match_testsuite<>,
    	 __regex_search_impl<>, __regex_search_testsuite<>): Implement.
    	These *_testsuite should be used in testcaes, to force test two
    	executors.
    	* include/bits/regex_executor.tcc: Do not resize __cur_results to
    	prevent from out of bound access during backtracking.
    	* testsuite/28_regex/algorithms/regex_match/awk/cstring_01.cc:
    	Use *_testsuite.
    	* testsuite/28_regex/algorithms/regex_match/basic/empty_range.cc: Same.
    	* testsuite/28_regex/algorithms/regex_match/basic/string_01.cc: Same.
    	* testsuite/28_regex/algorithms/regex_match/basic/string_range_00_03.cc:
    	Same.
    	* testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc:
    	Same.
    	* testsuite/28_regex/algorithms/regex_match/basic/string_range_02_03.cc:
    	Same.
    	* testsuite/28_regex/algorithms/regex_match/ecma/char/53622.cc: Same.
    	* testsuite/28_regex/algorithms/regex_match/ecma/char/57173.cc: Same.
    	* testsuite/28_regex/algorithms/regex_match/ecma/char/58576.cc: Same.
    	* testsuite/28_regex/algorithms/regex_match/ecma/char/anymatcher.cc:
    	Same.
    	* testsuite/28_regex/algorithms/regex_match/ecma/char/empty_range.cc:
    	Same.
    	* testsuite/28_regex/algorithms/regex_match/ecma/char/emptygroup.cc:
    	Same.
    	* testsuite/28_regex/algorithms/regex_match/ecma/char/hex.cc: Same.
    	* testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc:
    	Same.
    	* testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc:
    	Same.
    	* testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc: Same.
    	* testsuite/28_regex/algorithms/regex_match/extended/
    	cstring_bracket_01.cc: Same.
    	* testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc:
    	Same.
    	* testsuite/28_regex/algorithms/regex_match/extended/
    	cstring_questionmark.cc: Same.
    	* testsuite/28_regex/algorithms/regex_match/extended/cstring_range.cc:
    	Same.
    	* testsuite/28_regex/algorithms/regex_match/extended/string_any.cc:
    	Same.
    	* testsuite/28_regex/algorithms/regex_match/extended/
    	string_range_00_03.cc: Same.
    	* testsuite/28_regex/algorithms/regex_match/extended/
    	string_range_01_03.cc: Same.
    	* testsuite/28_regex/algorithms/regex_match/extended/
    	string_range_02_03.cc: Same.
    	* testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc:
    	Same.
    	* testsuite/28_regex/algorithms/regex_search/basic/string_01.cc: Same.
    	* testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc: Same.
    	* testsuite/28_regex/algorithms/regex_search/ecma/flags.cc: Same.
    	* testsuite/28_regex/algorithms/regex_search/ecma/greedy.cc: Same.
    	* testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc: Same.
    	* testsuite/28_regex/init-list.cc: Same.
    	* testsuite/28_regex/match_results/format.cc: Same.

diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h
index 4d7e7d7..eb08a27 100644
--- a/libstdc++-v3/include/bits/regex.h
+++ b/libstdc++-v3/include/bits/regex.h
@@ -32,6 +32,25 @@ namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
+namespace __detail
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+  template<typename _Bp, typename _Ap, typename _Cp, typename _Rp, int>
+    bool
+    __regex_match_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
+		       const basic_regex<_Cp, _Rp>&,
+		       regex_constants::match_flag_type);
+
+  template<typename _Bp, typename _Ap, typename _Cp, typename _Rp, int>
+    bool
+    __regex_search_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
+			const basic_regex<_Cp, _Rp>&,
+			regex_constants::match_flag_type);
+
+_GLIBCXX_END_NAMESPACE_VERSION
+}
+
   /**
    * @addtogroup regex
    * @{
@@ -722,19 +741,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 				 const basic_regex<_CharT, _TraitsT>&,
 				 regex_constants::match_flag_type);
 
-      template<typename _Bp, typename _Ap, typename _Cp, typename _Rp>
+      template<typename _Bp, typename _Ap, typename _Cp, typename _Rp, int>
 	friend bool
-	regex_match(_Bp, _Bp,
-		    match_results<_Bp, _Ap>&,
-		    const basic_regex<_Cp, _Rp>&,
-		    regex_constants::match_flag_type);
+	__detail::__regex_match_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
+				     const basic_regex<_Cp, _Rp>&,
+				     regex_constants::match_flag_type);
 
-      template<typename _Bp, typename _Ap, typename _Cp, typename _Rp>
+      template<typename _Bp, typename _Ap, typename _Cp, typename _Rp, int>
 	friend bool
-	regex_search(_Bp, _Bp,
-		     match_results<_Bp, _Ap>&,
-		     const basic_regex<_Cp, _Rp>&,
-		     regex_constants::match_flag_type);
+	__detail::__regex_search_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
+				      const basic_regex<_Cp, _Rp>&,
+				      regex_constants::match_flag_type);
 
       template<typename, typename, typename, typename>
 	friend class __detail::_Executor;
@@ -1852,20 +1869,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	friend class regex_iterator;
 
       template<typename _Bp, typename _Ap,
-	typename _Ch_type, typename _Rx_traits>
+	typename _Ch_type, typename _Rx_traits, int>
 	friend bool
-	regex_match(_Bp, _Bp, match_results<_Bp, _Ap>&,
-		    const basic_regex<_Ch_type,
-		    _Rx_traits>&,
-		    regex_constants::match_flag_type);
+	__detail::__regex_match_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
+				     const basic_regex<_Ch_type, _Rx_traits>&,
+				     regex_constants::match_flag_type);
 
-      template<typename _Bp, typename _Ap,
-	typename _Ch_type, typename _Rx_traits>
+      template<typename _Bp, typename _Ap, typename _Cp, typename _Rp, int>
 	friend bool
-	regex_search(_Bp, _Bp, match_results<_Bp, _Ap>&,
-		     const basic_regex<_Ch_type,
-		     _Rx_traits>&,
-		     regex_constants::match_flag_type);
+	__detail::__regex_search_impl(_Bp, _Bp, match_results<_Bp, _Ap>&,
+				      const basic_regex<_Cp, _Rp>&,
+				      regex_constants::match_flag_type);
 
       _Bi_iter _M_begin;
       bool     _M_in_iterator;
diff --git a/libstdc++-v3/include/bits/regex.tcc b/libstdc++-v3/include/bits/regex.tcc
index 24316d2..addc6a6 100644
--- a/libstdc++-v3/include/bits/regex.tcc
+++ b/libstdc++-v3/include/bits/regex.tcc
@@ -32,6 +32,265 @@ namespace std _GLIBCXX_VISIBILITY(default)
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
+namespace __detail
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+  template<typename _BiIter, typename _Alloc,
+	   typename _CharT, typename _TraitsT,
+	   int __policy = 0>
+    bool
+    __regex_match_impl(_BiIter                              __s,
+		       _BiIter                              __e,
+		       match_results<_BiIter, _Alloc>&      __m,
+		       const basic_regex<_CharT, _TraitsT>& __re,
+		       regex_constants::match_flag_type     __flags)
+    {
+      if (__re._M_automaton == nullptr)
+	return false;
+
+      typename match_results<_BiIter, _Alloc>::_Base_type& __res = __m;
+      auto __size = __re._M_automaton->_M_sub_count();
+      __size += 2;
+      __res.resize(__size);
+      for (decltype(__size) __i = 0; __i < __size; ++__i)
+	__res[__i].matched = false;
+
+      typedef std::unique_ptr<_Executor<_BiIter, _Alloc, _CharT, _TraitsT>>
+	_ExecutorPtr;
+      typedef _DFSExecutor<_BiIter, _Alloc, _CharT, _TraitsT> _DFSExecutorT;
+      typedef _BFSExecutor<_BiIter, _Alloc, _CharT, _TraitsT> _BFSExecutorT;
+
+      _ExecutorPtr __executor;
+      if (__policy == 0) // dispatcher
+	__executor = __get_executor(__s, __e, __res, __re, __flags);
+      else if (__policy == 1) // _DFSExecutor
+	__executor = _ExecutorPtr(new _DFSExecutorT(__s, __e, __res, __re,
+						    __flags));
+      else // _BFSExecutor
+	__executor = _ExecutorPtr(new _BFSExecutorT(__s, __e, __res, __re,
+						    __flags));
+
+      if (__executor->_M_match())
+	{
+	  for (auto __it : __res)
+	    if (!__it.matched)
+	      __it.first = __it.second = __e;
+	  auto& __pre = __res[__res.size()-2];
+	  auto& __suf = __res[__res.size()-1];
+	  __pre.matched = false;
+	  __pre.first = __s;
+	  __pre.second = __s;
+	  __suf.matched = false;
+	  __suf.first = __e;
+	  __suf.second = __e;
+	  return true;
+	}
+      return false;
+    }
+
+  template<typename _Bi_iter, typename _Alloc,
+	   typename _Ch_type, typename _Rx_traits>
+    bool
+    __regex_match_testsuite(_Bi_iter                                 __s,
+			    _Bi_iter                                 __e,
+			    match_results<_Bi_iter, _Alloc>&         __m,
+			    const basic_regex<_Ch_type, _Rx_traits>& __re,
+			    regex_constants::match_flag_type         __flags
+			    = regex_constants::match_default)
+    {
+      auto res1 = __regex_match_impl<_Bi_iter, _Alloc, _Ch_type, _Rx_traits, 0>
+	(__s, __e, __m, __re, __flags);
+      match_results<_Bi_iter, _Alloc> __mm;
+      auto res2 = __regex_match_impl<_Bi_iter, _Alloc, _Ch_type, _Rx_traits, 1>
+	(__s, __e, __mm, __re, __flags);
+      if (res1 == res2 && __m == __mm)
+	return res1;
+      __throw_regex_error(regex_constants::error_brace);
+    }
+
+  template<typename _Bi_iter, typename _Ch_type, typename _Rx_traits>
+    inline bool
+    __regex_match_testsuite(_Bi_iter __first, _Bi_iter __last,
+			    const basic_regex<_Ch_type, _Rx_traits>& __re,
+			    regex_constants::match_flag_type __flags
+			    = regex_constants::match_default)
+    {
+      match_results<_Bi_iter> __what;
+      return __regex_match_testsuite(__first, __last, __what, __re, __flags);
+    }
+
+  template<typename _Ch_type, typename _Alloc, typename _Rx_traits>
+    inline bool
+    __regex_match_testsuite(const _Ch_type* __s,
+			    match_results<const _Ch_type*, _Alloc>& __m,
+			    const basic_regex<_Ch_type, _Rx_traits>& __re,
+			    regex_constants::match_flag_type __f
+			    = regex_constants::match_default)
+    { return __regex_match_testsuite(__s, __s + _Rx_traits::length(__s),
+				     __m, __re, __f); }
+
+  template<typename _Ch_traits, typename _Ch_alloc,
+           typename _Alloc, typename _Ch_type, typename _Rx_traits>
+    inline bool
+    __regex_match_testsuite(const basic_string<_Ch_type, _Ch_traits,
+			      _Ch_alloc>& __s,
+			    match_results<typename basic_string<_Ch_type,
+			      _Ch_traits, _Ch_alloc>::const_iterator,
+			      _Alloc>& __m,
+			    const basic_regex<_Ch_type, _Rx_traits>& __re,
+			    regex_constants::match_flag_type __flags
+			    = regex_constants::match_default)
+    { return __regex_match_testsuite(__s.begin(), __s.end(),
+				     __m, __re, __flags); }
+
+  template<typename _Ch_type, class _Rx_traits>
+    inline bool
+    __regex_match_testsuite(const _Ch_type* __s,
+		const basic_regex<_Ch_type, _Rx_traits>& __re,
+		regex_constants::match_flag_type __f
+		= regex_constants::match_default)
+    { return __regex_match_testsuite(__s, __s + _Rx_traits::length(__s),
+				     __re, __f); }
+
+  template<typename _Ch_traits, typename _Str_allocator,
+           typename _Ch_type, typename _Rx_traits>
+    inline bool
+    __regex_match_testsuite(const basic_string<_Ch_type, _Ch_traits,
+			    _Str_allocator>& __s,
+			    const basic_regex<_Ch_type, _Rx_traits>& __re,
+			    regex_constants::match_flag_type __flags
+			    = regex_constants::match_default)
+    { return __regex_match_testsuite(__s.begin(), __s.end(), __re, __flags); }
+
+  template<typename _BiIter, typename _Alloc,
+	   typename _CharT, typename _TraitsT,
+	   int __policy = 0>
+    bool
+    __regex_search_impl(_BiIter __s, _BiIter __e,
+			match_results<_BiIter, _Alloc>& __m,
+			const basic_regex<_CharT, _TraitsT>& __re,
+			regex_constants::match_flag_type __flags)
+    {
+      if (__re._M_automaton == nullptr)
+	return false;
+
+      typename match_results<_BiIter, _Alloc>::_Base_type& __res = __m;
+      auto __size = __re._M_automaton->_M_sub_count();
+      __size += 2;
+      __res.resize(__size);
+      for (decltype(__size) __i = 0; __i < __size; ++__i)
+	__res[__i].matched = false;
+
+      typedef std::unique_ptr<_Executor<_BiIter, _Alloc, _CharT, _TraitsT>>
+	_ExecutorPtr;
+      typedef _DFSExecutor<_BiIter, _Alloc, _CharT, _TraitsT> _DFSExecutorT;
+      typedef _BFSExecutor<_BiIter, _Alloc, _CharT, _TraitsT> _BFSExecutorT;
+
+      _ExecutorPtr __executor;
+      if (__policy == 0) // dispatcher
+	__executor = __get_executor(__s, __e, __res, __re, __flags);
+      else if (__policy == 1) // _DFSExecutor
+	__executor = _ExecutorPtr(new _DFSExecutorT(__s, __e, __res, __re,
+						    __flags));
+      else // _BFSExecutor
+	__executor = _ExecutorPtr(new _BFSExecutorT(__s, __e, __res, __re,
+						    __flags));
+
+      if (__executor->_M_search())
+	{
+	  for (auto __it : __res)
+	    if (!__it.matched)
+	      __it.first = __it.second = __e;
+	  auto& __pre = __res[__res.size()-2];
+	  auto& __suf = __res[__res.size()-1];
+	  __pre.first = __s;
+	  __pre.second = __res[0].first;
+	  __pre.matched = (__pre.first != __pre.second);
+	  __suf.first = __res[0].second;
+	  __suf.second = __e;
+	  __suf.matched = (__suf.first != __suf.second);
+	  return true;
+	}
+      return false;
+    }
+
+  template<typename _Bi_iter, typename _Alloc,
+	   typename _Ch_type, typename _Rx_traits>
+    bool
+    __regex_search_testsuite(_Bi_iter __s, _Bi_iter __e,
+			     match_results<_Bi_iter, _Alloc>& __m,
+			     const basic_regex<_Ch_type, _Rx_traits>& __re,
+			     regex_constants::match_flag_type __flags
+			     = regex_constants::match_default)
+    {
+      auto res1 = __regex_search_impl<_Bi_iter, _Alloc, _Ch_type, _Rx_traits, 0>
+	(__s, __e, __m, __re, __flags);
+      match_results<_Bi_iter, _Alloc> __mm;
+      auto res2 = __regex_search_impl<_Bi_iter, _Alloc, _Ch_type, _Rx_traits, 1>
+	(__s, __e, __mm, __re, __flags);
+      if (res1 == res2 && __m == __mm)
+	return res1;
+      __throw_regex_error(regex_constants::error_brace);
+    }
+
+  template<typename _Bi_iter, typename _Ch_type, typename _Rx_traits>
+    inline bool
+    __regex_search_testsuite(_Bi_iter __first, _Bi_iter __last,
+			     const basic_regex<_Ch_type, _Rx_traits>& __re,
+			     regex_constants::match_flag_type __flags
+			     = regex_constants::match_default)
+    {
+      match_results<_Bi_iter> __what;
+      return __regex_search_testsuite(__first, __last, __what, __re, __flags);
+    }
+
+  template<typename _Ch_type, class _Alloc, class _Rx_traits>
+    inline bool
+    __regex_search_testsuite(const _Ch_type* __s,
+			     match_results<const _Ch_type*, _Alloc>& __m,
+			     const basic_regex<_Ch_type, _Rx_traits>& __e,
+			     regex_constants::match_flag_type __f
+			     = regex_constants::match_default)
+    { return __regex_search_testsuite(__s, __s + _Rx_traits::length(__s),
+				      __m, __e, __f); }
+
+  template<typename _Ch_type, typename _Rx_traits>
+    inline bool
+    __regex_search_testsuite(const _Ch_type* __s,
+			     const basic_regex<_Ch_type, _Rx_traits>& __e,
+			     regex_constants::match_flag_type __f
+			     = regex_constants::match_default)
+    { return __regex_search_testsuite(__s, __s + _Rx_traits::length(__s),
+				      __e, __f); }
+
+  template<typename _Ch_traits, typename _String_allocator,
+	   typename _Ch_type, typename _Rx_traits>
+    inline bool
+    __regex_search_testsuite(const basic_string<_Ch_type, _Ch_traits,
+		 _String_allocator>& __s,
+		 const basic_regex<_Ch_type, _Rx_traits>& __e,
+		 regex_constants::match_flag_type __flags
+		 = regex_constants::match_default)
+    { return __regex_search_testsuite(__s.begin(), __s.end(), __e, __flags); }
+
+  template<typename _Ch_traits, typename _Ch_alloc,
+	   typename _Alloc, typename _Ch_type,
+	   typename _Rx_traits>
+    inline bool
+    __regex_search_testsuite(const basic_string<_Ch_type, _Ch_traits,
+			       _Ch_alloc>& __s,
+			     match_results<typename basic_string<_Ch_type,
+			     _Ch_traits, _Ch_alloc>::const_iterator, _Alloc>&
+			     __m,
+			     const basic_regex<_Ch_type, _Rx_traits>& __e,
+			     regex_constants::match_flag_type __f
+			     = regex_constants::match_default)
+    { return __regex_search_testsuite(__s.begin(), __s.end(), __m, __e, __f); }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // __detail
+
   template<typename _Ch_type>
   template<typename _Fwd_iter>
     typename regex_traits<_Ch_type>::string_type
@@ -404,34 +663,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 		const basic_regex<_Ch_type, _Rx_traits>& __re,
 		regex_constants::match_flag_type         __flags
 			       = regex_constants::match_default)
-    {
-      if (__re._M_automaton == nullptr)
-	return false;
-
-      typename match_results<_Bi_iter, _Alloc>::_Base_type& __res = __m;
-      auto __size = __re._M_automaton->_M_sub_count();
-      __size += 2;
-      __res.resize(__size);
-      for (decltype(__size) __i = 0; __i < __size; ++__i)
-	__res[__i].matched = false;
-
-      if (__detail::__get_executor(__s, __e, __res, __re, __flags)->_M_match())
-	{
-	  for (auto __it : __res)
-	    if (!__it.matched)
-	      __it.first = __it.second = __e;
-	  auto& __pre = __res[__res.size()-2];
-	  auto& __suf = __res[__res.size()-1];
-	  __pre.matched = false;
-	  __pre.first = __s;
-	  __pre.second = __s;
-	  __suf.matched = false;
-	  __suf.first = __e;
-	  __suf.second = __e;
-	  return true;
-	}
-      return false;
-    }
+    { return __detail::__regex_match_impl<_Bi_iter, _Alloc,
+	_Ch_type, _Rx_traits, 0>(__s, __e, __m, __re, __flags); }
 
   template<typename _Bi_iter, typename _Alloc,
 	   typename _Ch_type, typename _Rx_traits>
@@ -441,35 +674,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 		 const basic_regex<_Ch_type, _Rx_traits>& __re,
 		 regex_constants::match_flag_type __flags
 		 = regex_constants::match_default)
-    {
-      if (__re._M_automaton == nullptr)
-	return false;
-
-      typename match_results<_Bi_iter, _Alloc>::_Base_type& __res = __m;
-      auto __size = __re._M_automaton->_M_sub_count();
-      __size += 2;
-      __res.resize(__size);
-      for (decltype(__size) __i = 0; __i < __size; ++__i)
-	__res[__i].matched = false;
-
-      if (__detail::__get_executor(__first, __last, __res, __re, __flags)
-	  ->_M_search())
-	{
-	  for (auto __it : __res)
-	    if (!__it.matched)
-	      __it.first = __it.second = __last;
-	  auto& __pre = __res[__res.size()-2];
-	  auto& __suf = __res[__res.size()-1];
-	  __pre.first = __first;
-	  __pre.second = __res[0].first;
-	  __pre.matched = (__pre.first != __pre.second);
-	  __suf.first = __res[0].second;
-	  __suf.second = __last;
-	  __suf.matched = (__suf.first != __suf.second);
-	  return true;
-	}
-      return false;
-    }
+    { return __detail::__regex_search_impl<_Bi_iter, _Alloc,
+	_Ch_type, _Rx_traits, 0>(__first, __last, __m, __re, __flags); }
 
   template<typename _Out_iter, typename _Bi_iter,
 	   typename _Rx_traits, typename _Ch_type>
diff --git a/libstdc++-v3/include/bits/regex_executor.tcc b/libstdc++-v3/include/bits/regex_executor.tcc
index 60ba952..8e705bb 100644
--- a/libstdc++-v3/include/bits/regex_executor.tcc
+++ b/libstdc++-v3/include/bits/regex_executor.tcc
@@ -387,13 +387,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     {
       if (_M_re.flags() & regex_constants::nosubs)
 	{
-	  // truncate
-	  __cur_results.resize(3);
+	  if (__cur_results[0].matched)
+	    _M_results[0] = __cur_results[0];
 	  _M_results.resize(3);
 	}
-      for (unsigned int __i = 0; __i < __cur_results.size(); ++__i)
-	if (__cur_results[__i].matched)
-	  _M_results[__i] = __cur_results[__i];
+      else
+	for (unsigned int __i = 0; __i < __cur_results.size(); ++__i)
+	  if (__cur_results[__i].matched)
+	    _M_results[__i] = __cur_results[__i];
     }
 
   template<typename _BiIter, typename _Alloc,
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/awk/cstring_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/awk/cstring_01.cc
index d4edf12..d40ce9c 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/awk/cstring_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/awk/cstring_01.cc
@@ -34,12 +34,18 @@ test01()
   bool test __attribute__((unused)) = true;
 
   regex("\\[", regex_constants::awk);
-  VERIFY(regex_match("\"", regex("[\\\"]", regex_constants::awk)));
-  VERIFY(regex_match("/", regex("/", regex_constants::awk)));
-  VERIFY(regex_match("\a", regex("\\a", regex_constants::awk)));
-  VERIFY(regex_match("\"", regex("\\\"", regex_constants::awk)));
-  VERIFY(regex_match("5", regex("\\65", regex_constants::awk)));
-  VERIFY(regex_match("53", regex("\\0653", regex_constants::awk)));
+  VERIFY(__detail::__regex_match_testsuite
+	 ("\"", regex("[\\\"]", regex_constants::awk)));
+  VERIFY(__detail::__regex_match_testsuite
+	 ("/", regex("/", regex_constants::awk)));
+  VERIFY(__detail::__regex_match_testsuite
+	 ("\a", regex("\\a", regex_constants::awk)));
+  VERIFY(__detail::__regex_match_testsuite
+	 ("\"", regex("\\\"", regex_constants::awk)));
+  VERIFY(__detail::__regex_match_testsuite
+	 ("5", regex("\\65", regex_constants::awk)));
+  VERIFY(__detail::__regex_match_testsuite
+	 ("53", regex("\\0653", regex_constants::awk)));
 }
 
 int
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/empty_range.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/empty_range.cc
index eb22569..3f95eb8 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/empty_range.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/empty_range.cc
@@ -45,8 +45,10 @@ test01()
     }
   FAIL("[]");
   FAIL("[^]");
-  VERIFY(regex_match("]", regex("[]]", regex_constants::basic)));
-  VERIFY(!regex_match("]", regex("[^]]", regex_constants::basic)));
+  VERIFY(__detail::__regex_match_testsuite
+	 ("]", regex("[]]", regex_constants::basic)));
+  VERIFY(!__detail::__regex_match_testsuite
+	 ("]", regex("[^]]", regex_constants::basic)));
 }
 
 int
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_01.cc
index 668309d..548ce0f 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_01.cc
@@ -35,7 +35,7 @@ test01()
 	std::string target("aaba");
 	std::smatch m;
 
-	VERIFY( std::regex_match(target, m, re) );
+	VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
 
 	VERIFY( m.size()  == re.mark_count()+1 );
 	VERIFY( m.empty() == false );
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_00_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_00_03.cc
index 1878386..a6e2241 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_00_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_00_03.cc
@@ -35,7 +35,7 @@ test01()
 	std::string target("aa");
 	std::smatch m;
 
-	VERIFY( std::regex_match(target, m, re) );
+	VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
 
 	VERIFY( m.size()  == re.mark_count()+1 );
 	VERIFY( m.empty() == false );
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc
index 93826a7..1d6b4a0 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_01_03.cc
@@ -35,7 +35,7 @@ test01()
 	std::string target("aa");
 	std::smatch m;
 
-	VERIFY( std::regex_match(target, m, re) );
+	VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
 
 	VERIFY( m.size()  == re.mark_count()+1 );
 	VERIFY( m.empty() == false );
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_02_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_02_03.cc
index 91bc101..f5c3cd1 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_02_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/basic/string_range_02_03.cc
@@ -35,7 +35,7 @@ test01()
 	std::string target("aa");
 	std::smatch m;
 
-	VERIFY( std::regex_match(target, m, re) );
+	VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
 
 	VERIFY( m.size()  == re.mark_count()+1 );
 	VERIFY( m.empty() == false );
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/53622.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/53622.cc
index 5f4b1d1..f7f10d1 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/53622.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/53622.cc
@@ -36,7 +36,7 @@ test01()
     std::string target("zxcv/onetwoabc");
     std::smatch m;
 
-    VERIFY( std::regex_match(target, m, re) );
+    VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
     VERIFY( m.size() == 2 );
     VERIFY( m[0].matched == true );
     VERIFY( std::string(m[0].first, m[0].second) == "zxcv/onetwoabc" );
@@ -49,7 +49,7 @@ test01()
     std::string target("zxcv/onetwoabc");
     std::smatch m;
 
-    VERIFY( std::regex_match(target, m, re) );
+    VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
     VERIFY( m.size() == 3 );
     VERIFY( m[0].matched == true );
     VERIFY( std::string(m[0].first, m[0].second) == "zxcv/onetwoabc" );
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/57173.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/57173.cc
index b9a72c9..97595ff 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/57173.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/57173.cc
@@ -37,7 +37,7 @@ test01()
     std::string target("/asdf/qwerty");
     std::smatch m;
 
-    VERIFY( std::regex_match(target, m, re) );
+    VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
     VERIFY( m.size() == 2 );
     VERIFY( std::string(m[1].first, m[1].second) == "/qwerty");
   }
@@ -46,7 +46,7 @@ test01()
     std::string target("/asdf/qwerty");
     std::smatch m;
 
-    VERIFY( std::regex_match(target, m, re) );
+    VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
     VERIFY( m.size() == 3 );
     VERIFY( std::string(m[1].first, m[1].second) == "/qwerty");
   }
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/58576.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/58576.cc
index 1a1365c..4359308 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/58576.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/58576.cc
@@ -74,7 +74,7 @@ test01()
   };
   try
     {
-      VERIFY(regex_match( domain_name, m, fqdn_regex ));
+      VERIFY(__detail::__regex_match_testsuite( domain_name, m, fqdn_regex ));
       VERIFY(m.size() == sizeof(sol) / sizeof(*sol));
       for (int i = 0; i < (int)m.size(); i++) {
 	  string s(m[i].first, m[i].second);
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/anymatcher.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/anymatcher.cc
index 6e6095b..1416608 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/anymatcher.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/anymatcher.cc
@@ -37,7 +37,7 @@ test01()
   {\
     regex re(res);\
     string st(s);\
-    VERIFY(!regex_match(st, re));\
+    VERIFY(!__detail::__regex_match_testsuite(st, re));\
   }
   TEST(".", "\0");
   TEST(".", "\n");
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/empty_range.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/empty_range.cc
index 3c48d35..39112c2 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/empty_range.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/empty_range.cc
@@ -33,10 +33,10 @@ test01()
 {
   bool test __attribute__((unused)) = true;
 
-  VERIFY(!regex_match("x", regex("[]")));
-  VERIFY(regex_match("x", regex("[^]")));
-  VERIFY(!regex_match("]", regex("[]]")));
-  VERIFY(!regex_match("]", regex("[^]]")));
+  VERIFY(!__detail::__regex_match_testsuite("x", regex("[]")));
+  VERIFY(__detail::__regex_match_testsuite("x", regex("[^]")));
+  VERIFY(!__detail::__regex_match_testsuite("]", regex("[]]")));
+  VERIFY(!__detail::__regex_match_testsuite("]", regex("[^]]")));
 }
 
 int
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/emptygroup.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/emptygroup.cc
index 1dc8f63..3d4a7b4 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/emptygroup.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/emptygroup.cc
@@ -37,7 +37,7 @@ test01()
     regex re("()*\\1");
     cmatch m;
     const char s[] = "";
-    VERIFY( regex_match(s, m, re) );
+    VERIFY( __detail::__regex_match_testsuite(s, m, re) );
     VERIFY( m.size() == 2 );
     VERIFY( m[0].matched );
     VERIFY( m[1].matched );
@@ -46,7 +46,7 @@ test01()
     regex re("()*");
     cmatch m;
     const char s[] = "";
-    VERIFY( regex_match(s, m, re) );
+    VERIFY( __detail::__regex_match_testsuite(s, m, re) );
   }
 }
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/hex.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/hex.cc
index a73b742..8bc7970 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/hex.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/hex.cc
@@ -33,7 +33,7 @@ test01()
 {
   bool test __attribute__((unused)) = true;
 
-  VERIFY(regex_match(":", regex("\\x3a")));
+  VERIFY(__detail::__regex_match_testsuite(":", regex("\\x3a")));
   try
     {
       regex("\\u400x");
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc
index b54f561..134121a 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/char/quoted_char.cc
@@ -33,15 +33,15 @@ test01()
 {
   bool test __attribute__((unused)) = true;
 
-  VERIFY(regex_match("01", regex("\\d*")));
-  VERIFY(regex_match("asdfjkl", regex("\\D*")));
-  VERIFY(!regex_match("asdfjkl0", regex("\\D*")));
-  VERIFY(regex_match("\r\t\v\f ", regex("\\s*")));
-  VERIFY(regex_match("asdfjkl", regex("\\S*")));
-  VERIFY(!regex_match("asdfjkl\r", regex("\\S*")));
-  VERIFY(regex_match("_az", regex("\\w*")));
-  VERIFY(regex_match("!@#$%", regex("\\W*")));
-  VERIFY(!regex_match("_01234", regex("\\W*")));
+  VERIFY(__detail::__regex_match_testsuite("01", regex("\\d*")));
+  VERIFY(__detail::__regex_match_testsuite("asdfjkl", regex("\\D*")));
+  VERIFY(!__detail::__regex_match_testsuite("asdfjkl0", regex("\\D*")));
+  VERIFY(__detail::__regex_match_testsuite("\r\t\v\f ", regex("\\s*")));
+  VERIFY(__detail::__regex_match_testsuite("asdfjkl", regex("\\S*")));
+  VERIFY(!__detail::__regex_match_testsuite("asdfjkl\r", regex("\\S*")));
+  VERIFY(__detail::__regex_match_testsuite("_az", regex("\\w*")));
+  VERIFY(__detail::__regex_match_testsuite("!@#$%", regex("\\W*")));
+  VERIFY(!__detail::__regex_match_testsuite("_01234", regex("\\W*")));
 }
 
 int
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc
index c574908..24ed6ad 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/anymatcher.cc
@@ -37,7 +37,7 @@ test01()
   {\
     wregex re(res);\
     wstring st(s);\
-    VERIFY(!regex_match(st, re));\
+    VERIFY(!__detail::__regex_match_testsuite(st, re));\
   }
   TESTL(L".", L"\u2028");
   TESTL(L".", L"\u2029");
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc
index f9561be..35ead2d 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/hex.cc
@@ -33,7 +33,7 @@ test01()
 {
   bool test __attribute__((unused)) = true;
 
-  VERIFY(regex_match(L"\u1234", wregex(L"\\u1234")));
+  VERIFY(__detail::__regex_match_testsuite(L"\u1234", wregex(L"\\u1234")));
 }
 
 int
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_bracket_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_bracket_01.cc
index 5d83785..97c9730 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_bracket_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_bracket_01.cc
@@ -33,33 +33,33 @@ test01()
 
   {
     std::regex  re("pre/[za-x]", std::regex::extended);
-    VERIFY( std::regex_match("pre/z", re) );
-    VERIFY( std::regex_match("pre/a", re) );
-    VERIFY( !std::regex_match("pre/y", re) );
+    VERIFY( std::__detail::__regex_match_testsuite("pre/z", re) );
+    VERIFY( std::__detail::__regex_match_testsuite("pre/a", re) );
+    VERIFY( !std::__detail::__regex_match_testsuite("pre/y", re) );
   }
   {
     std::regex  re("pre/[[:uPPer:]]", std::regex::extended);
-    VERIFY( std::regex_match("pre/Z", re) );
-    VERIFY( !std::regex_match("pre/_", re) );
-    VERIFY( !std::regex_match("pre/a", re) );
-    VERIFY( !std::regex_match("pre/0", re) );
+    VERIFY( std::__detail::__regex_match_testsuite("pre/Z", re) );
+    VERIFY( !std::__detail::__regex_match_testsuite("pre/_", re) );
+    VERIFY( !std::__detail::__regex_match_testsuite("pre/a", re) );
+    VERIFY( !std::__detail::__regex_match_testsuite("pre/0", re) );
   }
   {
     std::regex  re("pre/[[:lOWer:]]", std::regex::extended | std::regex::icase);
-    VERIFY( std::regex_match("pre/Z", re) );
-    VERIFY( std::regex_match("pre/a", re) );
+    VERIFY( std::__detail::__regex_match_testsuite("pre/Z", re) );
+    VERIFY( std::__detail::__regex_match_testsuite("pre/a", re) );
   }
   {
     std::regex  re("pre/[[:w:][.tilde.]]", std::regex::extended);
-    VERIFY( std::regex_match("pre/~", re) );
-    VERIFY( std::regex_match("pre/_", re) );
-    VERIFY( std::regex_match("pre/a", re) );
-    VERIFY( std::regex_match("pre/0", re) );
+    VERIFY( std::__detail::__regex_match_testsuite("pre/~", re) );
+    VERIFY( std::__detail::__regex_match_testsuite("pre/_", re) );
+    VERIFY( std::__detail::__regex_match_testsuite("pre/a", re) );
+    VERIFY( std::__detail::__regex_match_testsuite("pre/0", re) );
   }
   {
     std::regex  re("pre/[[=a=]]", std::regex::extended);
-    VERIFY( std::regex_match("pre/a", re) );
-    VERIFY( std::regex_match("pre/A", re) );
+    VERIFY( std::__detail::__regex_match_testsuite("pre/a", re) );
+    VERIFY( std::__detail::__regex_match_testsuite("pre/A", re) );
   }
 }
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc
index 375f34b..bb64b98 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_plus.cc
@@ -35,7 +35,7 @@ test01()
   const char target[] = "aa";
   std::cmatch m;
 
-  VERIFY( std::regex_match(target, m, re) );
+  VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
 
   VERIFY( re.mark_count() == 1 );
   VERIFY( m.size()  == re.mark_count()+1 );
@@ -53,9 +53,12 @@ test01()
   VERIFY( m[1].second == target+sizeof(target)-1 );
   VERIFY( m[1].matched == true );
 
-  VERIFY(!std::regex_match("", std::regex("a+", std::regex::extended)));
-  VERIFY(std::regex_match("a", std::regex("a+", std::regex::extended)));
-  VERIFY(std::regex_match("aa", std::regex("a+", std::regex::extended)));
+  VERIFY(!std::__detail::__regex_match_testsuite
+	 ("", std::regex("a+", std::regex::extended)));
+  VERIFY(std::__detail::__regex_match_testsuite
+	 ("a", std::regex("a+", std::regex::extended)));
+  VERIFY(std::__detail::__regex_match_testsuite
+	 ("aa", std::regex("a+", std::regex::extended)));
 }
 
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_questionmark.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_questionmark.cc
index 79b52a8..fc89ee3 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_questionmark.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_questionmark.cc
@@ -35,7 +35,7 @@ test01()
   char target[] = "a";
   std::cmatch m;
 
-  VERIFY( std::regex_match(target, m, re) );
+  VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
 
   VERIFY( re.mark_count() == 1 );
   VERIFY( m.size()  == re.mark_count()+1 );
@@ -53,9 +53,12 @@ test01()
   VERIFY( m[1].second == target+sizeof(target)-1 );
   VERIFY( m[1].matched == true );
 
-  VERIFY(std::regex_match("", std::regex("a?", std::regex::extended)));
-  VERIFY(std::regex_match("a", std::regex("a?", std::regex::extended)));
-  VERIFY(!std::regex_match("aa", std::regex("a?", std::regex::extended)));
+  VERIFY(std::__detail::__regex_match_testsuite
+	 ("", std::regex("a?", std::regex::extended)));
+  VERIFY(std::__detail::__regex_match_testsuite
+	 ("a", std::regex("a?", std::regex::extended)));
+  VERIFY(!std::__detail::__regex_match_testsuite
+	 ("aa", std::regex("a?", std::regex::extended)));
 }
 
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_range.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_range.cc
index 62f825a..ca8a84c 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_range.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/cstring_range.cc
@@ -35,29 +35,29 @@ test01()
 
   regex re;
   re.assign("(ab){3}", std::regex::extended);
-  VERIFY(!regex_match("abab", re));
-  VERIFY(regex_match("ababab", re));
-  VERIFY(!regex_match("abababab", re));
+  VERIFY(!__detail::__regex_match_testsuite("abab", re));
+  VERIFY(__detail::__regex_match_testsuite("ababab", re));
+  VERIFY(!__detail::__regex_match_testsuite("abababab", re));
   re.assign("(ab){3,}", std::regex::extended);
-  VERIFY(!regex_match("abab", re));
-  VERIFY(regex_match("ababab", re));
-  VERIFY(regex_match("abababab", re));
-  VERIFY(regex_match("ababababab", re));
+  VERIFY(!__detail::__regex_match_testsuite("abab", re));
+  VERIFY(__detail::__regex_match_testsuite("ababab", re));
+  VERIFY(__detail::__regex_match_testsuite("abababab", re));
+  VERIFY(__detail::__regex_match_testsuite("ababababab", re));
   re.assign("(ab){0,3}", std::regex::extended);
-  VERIFY(regex_match("", re));
-  VERIFY(regex_match("ab", re));
-  VERIFY(regex_match("abab", re));
-  VERIFY(regex_match("ababab", re));
-  VERIFY(!regex_match("abababab", re));
+  VERIFY(__detail::__regex_match_testsuite("", re));
+  VERIFY(__detail::__regex_match_testsuite("ab", re));
+  VERIFY(__detail::__regex_match_testsuite("abab", re));
+  VERIFY(__detail::__regex_match_testsuite("ababab", re));
+  VERIFY(!__detail::__regex_match_testsuite("abababab", re));
   re.assign("(a|b){0,2}", std::regex::extended);
-  VERIFY(regex_match("", re));
-  VERIFY(regex_match("a", re));
-  VERIFY(regex_match("b", re));
-  VERIFY(regex_match("aa", re));
-  VERIFY(regex_match("ab", re));
-  VERIFY(regex_match("ba", re));
-  VERIFY(regex_match("bb", re));
-  VERIFY(!regex_match("aaa", re));
+  VERIFY(__detail::__regex_match_testsuite("", re));
+  VERIFY(__detail::__regex_match_testsuite("a", re));
+  VERIFY(__detail::__regex_match_testsuite("b", re));
+  VERIFY(__detail::__regex_match_testsuite("aa", re));
+  VERIFY(__detail::__regex_match_testsuite("ab", re));
+  VERIFY(__detail::__regex_match_testsuite("ba", re));
+  VERIFY(__detail::__regex_match_testsuite("bb", re));
+  VERIFY(!__detail::__regex_match_testsuite("aaa", re));
 }
 
 int
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_any.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_any.cc
index 57628f1..0480856 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_any.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_any.cc
@@ -35,7 +35,7 @@ test01()
 	std::string target("aaba");
 	std::smatch m;
 
-	VERIFY( std::regex_match(target, m, re) );
+	VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
 
 	VERIFY( m.size()  == re.mark_count()+1 );
 	VERIFY( m.empty() == false );
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_00_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_00_03.cc
index e10dba8..b273b02 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_00_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_00_03.cc
@@ -35,7 +35,7 @@ test01()
   std::string target("aa");
   std::smatch m;
 
-  VERIFY( std::regex_match(target, m, re) );
+  VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
 
   VERIFY( m.size()  == re.mark_count()+1 );
   VERIFY( m.empty() == false );
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_01_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_01_03.cc
index e715290..6561db5 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_01_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_01_03.cc
@@ -35,7 +35,7 @@ test01()
 	std::string target("aa");
 	std::smatch m;
 
-	VERIFY( std::regex_match(target, m, re) );
+	VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
 
 	VERIFY( m.size()  == re.mark_count()+1 );
 	VERIFY( m.empty() == false );
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_02_03.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_02_03.cc
index 62793b4..1e51e5f 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_02_03.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/string_range_02_03.cc
@@ -35,7 +35,7 @@ test01()
 	std::string target("aa");
 	std::smatch m;
 
-	VERIFY( std::regex_match(target, m, re) );
+	VERIFY( std::__detail::__regex_match_testsuite(target, m, re) );
 
 	VERIFY( m.size()  == re.mark_count()+1 );
 	VERIFY( m.empty() == false );
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc
index 6ab48ca..81562d4 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_match/extended/wstring_locale.cc
@@ -37,7 +37,7 @@ test01()
   re2.imbue(std::locale("de_DE.UTF-8"));
   re2.assign(L"[[:upper:]]*", std::regex::extended);
   std::wsmatch m2;
-  VERIFY(std::regex_match(str2, m2, re2));
+  VERIFY(std::__detail::__regex_match_testsuite(str2, m2, re2));
 }
 
 int
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/basic/string_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/basic/string_01.cc
index ee487f1..6d453be 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/basic/string_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/basic/string_01.cc
@@ -35,7 +35,7 @@ test01()
   std::string target("xxasdfyy");
   std::smatch m;
 
-  VERIFY( std::regex_search(target, m, re) );
+  VERIFY( std::__detail::__regex_search_testsuite(target, m, re) );
 
   VERIFY( m.size()  == re.mark_count()+1 );
   VERIFY( m.empty() == false );
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc
index 3064b3b..d538911 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/assertion.cc
@@ -33,21 +33,22 @@ test01()
 {
   bool test __attribute__((unused)) = true;
 
-  VERIFY(!regex_search("2123456", regex("^1234")));
-  VERIFY(regex_search("123456", regex("^1234")));
-  VERIFY(regex_search("123456", regex("(5|^)1234")));
-  VERIFY(regex_search("5123456", regex("(5|^)1234")));
-  VERIFY(!regex_search("1234562", regex("3456$")));
-  VERIFY(regex_search("123456", regex("3456$")));
-  VERIFY(!regex_search("123456", regex("(?=1234)56")));
-  VERIFY(regex_search("123456", regex("(?=1234)123456")));
-  VERIFY(regex_search("123456", regex("(?!1234)56")));
-  VERIFY(!regex_search("123456", regex("(?!1234)123456")));
+  VERIFY(!__detail::__regex_search_testsuite("2123456", regex("^1234")));
+  VERIFY(__detail::__regex_search_testsuite("123456", regex("^1234")));
+  VERIFY(__detail::__regex_search_testsuite("123456", regex("(5|^)1234")));
+  VERIFY(__detail::__regex_search_testsuite("5123456", regex("(5|^)1234")));
+  VERIFY(!__detail::__regex_search_testsuite("1234562", regex("3456$")));
+  VERIFY(__detail::__regex_search_testsuite("123456", regex("3456$")));
+  VERIFY(!__detail::__regex_search_testsuite("123456", regex("(?=1234)56")));
+  VERIFY(__detail::__regex_search_testsuite("123456", regex("(?=1234)123456")));
+  VERIFY(__detail::__regex_search_testsuite("123456", regex("(?!1234)56")));
+  VERIFY(!__detail::__regex_search_testsuite("123456",
+					     regex("(?!1234)123456")));
 
-  VERIFY(regex_search("a-", regex("a\\b-")));
-  VERIFY(!regex_search("ab", regex("a\\bb")));
-  VERIFY(!regex_search("a-", regex("a\\B-")));
-  VERIFY(regex_search("ab", regex("a\\Bb")));
+  VERIFY(__detail::__regex_search_testsuite("a-", regex("a\\b-")));
+  VERIFY(!__detail::__regex_search_testsuite("ab", regex("a\\bb")));
+  VERIFY(!__detail::__regex_search_testsuite("a-", regex("a\\B-")));
+  VERIFY(__detail::__regex_search_testsuite("ab", regex("a\\Bb")));
 
   string s("This is a regular expression");
   string sol[] =
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/flags.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/flags.cc
index 4be406c..b542c3e 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/flags.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/flags.cc
@@ -35,31 +35,37 @@ test01()
 
   cmatch m;
   regex re("((as)(df))", regex_constants::ECMAScript | regex_constants::nosubs);
-  VERIFY(regex_search("asdf", m, re));
+  VERIFY(__detail::__regex_search_testsuite("asdf", m, re));
   VERIFY(m.size() == 1);
   VERIFY(m[0].matched && string(m[0].first, m[0].second) == "asdf");
 
-  VERIFY( regex_search("a", regex("^a")));
-  VERIFY(!regex_search("a", regex("^a"), regex_constants::match_not_bol));
-  VERIFY( regex_search("a", regex("a$")));
-  VERIFY(!regex_search("a", regex("a$"), regex_constants::match_not_eol));
-  VERIFY( regex_search("a", regex("\\ba")));
-  VERIFY(!regex_search("a", regex("\\ba"), regex_constants::match_not_bow));
-  VERIFY( regex_search("a", regex("a\\b")));
-  VERIFY(!regex_search("a", regex("a\\b"), regex_constants::match_not_eow));
-  VERIFY( regex_search("", regex("")));
-  VERIFY(!regex_search("", regex(""), regex_constants::match_not_null));
-  VERIFY( regex_search("", regex("^$")));
-  VERIFY(!regex_search("", regex("^$"), regex_constants::match_not_null));
-  VERIFY( regex_search("aaa", m, regex("a*?"),
+  VERIFY( __detail::__regex_search_testsuite("a", regex("^a")));
+  VERIFY(!__detail::__regex_search_testsuite("a", regex("^a"),
+					     regex_constants::match_not_bol));
+  VERIFY( __detail::__regex_search_testsuite("a", regex("a$")));
+  VERIFY(!__detail::__regex_search_testsuite("a", regex("a$"),
+					     regex_constants::match_not_eol));
+  VERIFY( __detail::__regex_search_testsuite("a", regex("\\ba")));
+  VERIFY(!__detail::__regex_search_testsuite("a", regex("\\ba"),
+					     regex_constants::match_not_bow));
+  VERIFY( __detail::__regex_search_testsuite("a", regex("a\\b")));
+  VERIFY(!__detail::__regex_search_testsuite("a", regex("a\\b"),
+					     regex_constants::match_not_eow));
+  VERIFY( __detail::__regex_search_testsuite("", regex("")));
+  VERIFY(!__detail::__regex_search_testsuite("", regex(""),
+					     regex_constants::match_not_null));
+  VERIFY( __detail::__regex_search_testsuite("", regex("^$")));
+  VERIFY(!__detail::__regex_search_testsuite("", regex("^$"),
+					     regex_constants::match_not_null));
+  VERIFY( __detail::__regex_search_testsuite("aaa", m, regex("a*?"),
 		       regex_constants::match_not_null));
   VERIFY(m[0].matched && string(m[0].first, m[0].second) == "a");
-  VERIFY( regex_search("asdf", regex("sdf")));
-  VERIFY(!regex_search("asdf", regex("sdf"),
+  VERIFY( __detail::__regex_search_testsuite("asdf", regex("sdf")));
+  VERIFY(!__detail::__regex_search_testsuite("asdf", regex("sdf"),
 		       regex_constants::match_continuous));
-  VERIFY( regex_search(" a"+1, regex("\\ba"),
+  VERIFY( __detail::__regex_search_testsuite(" a"+1, regex("\\ba"),
 		       regex_constants::match_prev_avail));
-  VERIFY( regex_search("ba"+1, regex("\\Ba"),
+  VERIFY( __detail::__regex_search_testsuite("ba"+1, regex("\\Ba"),
 		       regex_constants::match_prev_avail));
 }
 
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/greedy.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/greedy.cc
index ad37ec8..b875565 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/greedy.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/greedy.cc
@@ -35,30 +35,30 @@ test01()
 
   cmatch m;
 #define TEST(i, s) VERIFY(m[i].matched && string(m[i].first, m[i].second) == s)
-  VERIFY(regex_search("aaaa", m, regex("a*")));
+  VERIFY(__detail::__regex_search_testsuite("aaaa", m, regex("a*")));
   TEST(0, "aaaa");
-  VERIFY(regex_search("aaaa", m, regex("a*?")));
+  VERIFY(__detail::__regex_search_testsuite("aaaa", m, regex("a*?")));
   TEST(0, "");
-  VERIFY(regex_search("aaaa", m, regex("a+")));
+  VERIFY(__detail::__regex_search_testsuite("aaaa", m, regex("a+")));
   TEST(0, "aaaa");
-  VERIFY(regex_search("aaaa", m, regex("a+?")));
+  VERIFY(__detail::__regex_search_testsuite("aaaa", m, regex("a+?")));
   TEST(0, "a");
-  VERIFY(regex_search("a", m, regex("a?")));
+  VERIFY(__detail::__regex_search_testsuite("a", m, regex("a?")));
   TEST(0, "a");
-  VERIFY(regex_search("a", m, regex("a??")));
+  VERIFY(__detail::__regex_search_testsuite("a", m, regex("a??")));
   TEST(0, "");
-  VERIFY(regex_search("", m, regex("a??")));
+  VERIFY(__detail::__regex_search_testsuite("", m, regex("a??")));
   TEST(0, "");
-  VERIFY(regex_search("aaaa", m, regex("(a+)(a+)")));
+  VERIFY(__detail::__regex_search_testsuite("aaaa", m, regex("(a+)(a+)")));
   TEST(1, "aaa");
   TEST(2, "a");
-  VERIFY(regex_search("aaaa", m, regex("(a+?)(a+)")));
+  VERIFY(__detail::__regex_search_testsuite("aaaa", m, regex("(a+?)(a+)")));
   TEST(1, "a");
   TEST(2, "aaa");
-  VERIFY(regex_search("aaaa", m, regex("(a+?)(a+)")));
+  VERIFY(__detail::__regex_search_testsuite("aaaa", m, regex("(a+?)(a+)")));
   TEST(1, "a");
   TEST(2, "aaa");
-  VERIFY(regex_search("aaaa", m, regex("(a+?)(a+?)")));
+  VERIFY(__detail::__regex_search_testsuite("aaaa", m, regex("(a+?)(a+?)")));
   TEST(1, "a");
   TEST(2, "a");
 }
diff --git a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc
index ec25875..faec274 100644
--- a/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc
+++ b/libstdc++-v3/testsuite/28_regex/algorithms/regex_search/ecma/string_01.cc
@@ -31,7 +31,7 @@ test01()
 {
   bool test __attribute__((unused)) = true;
 
-  VERIFY(std::regex_search("", std::regex("")));
+  VERIFY(std::__detail::__regex_search_testsuite("", std::regex("")));
 }
 
 int
diff --git a/libstdc++-v3/testsuite/28_regex/init-list.cc b/libstdc++-v3/testsuite/28_regex/init-list.cc
index ee71bb9..309089b 100644
--- a/libstdc++-v3/testsuite/28_regex/init-list.cc
+++ b/libstdc++-v3/testsuite/28_regex/init-list.cc
@@ -30,12 +30,12 @@ int test01(void)
 
   regex r = { 'a', 'b', 'c' };
   cmatch res;
-  VERIFY(regex_match ("abc", res, r));
-  VERIFY(!regex_match ("ab", res, r));
+  VERIFY(__detail::__regex_match_testsuite ("abc", res, r));
+  VERIFY(!__detail::__regex_match_testsuite ("ab", res, r));
 
   r = { 'd', 'e', 'f' };
-  VERIFY(regex_match ("def", res, r));
-  VERIFY(!regex_match ("abc", res, r));
+  VERIFY(__detail::__regex_match_testsuite ("def", res, r));
+  VERIFY(!__detail::__regex_match_testsuite ("abc", res, r));
 
   return test;
 }
diff --git a/libstdc++-v3/testsuite/28_regex/match_results/format.cc b/libstdc++-v3/testsuite/28_regex/match_results/format.cc
index be08016..c55be75 100644
--- a/libstdc++-v3/testsuite/28_regex/match_results/format.cc
+++ b/libstdc++-v3/testsuite/28_regex/match_results/format.cc
@@ -34,7 +34,7 @@ test01()
   bool test __attribute__((unused)) = true;
 
   cmatch m;
-  VERIFY(regex_search("*** this is a string !!!", m,
+  VERIFY(__detail::__regex_search_testsuite("*** this is a string !!!", m,
 		      regex("(\\w+) (\\w+) (\\w+) (\\w+)")));
   VERIFY(m.format("$&|$`|$3|$4|$2|$1|$'$$$")
 	 == "this is a string|*** |a|string|is|this| !!!$$");