OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Compare match_results for failed regex_match

Browse Source 
The regex_match_debug testsuite helper doesn't compare the
std::match_results objects after a failed match, but it should do. The
standard says that the effects of a failed match on the match-results
are unspecified, except that [conditions testable by operator==]. So we
can check that the two sets of results compare equal even if the match
failed.

libstdc++-v3/ChangeLog:

	* testsuite/util/testsuite_regex.h (regex_match_debug): Compare
	results even if the match failed.
This commit is contained in:
Jonathan Wakely 2021-12-17 17:58:09 +00:00
parent 260a5334ee
commit 9a2451c101
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libstdc++-v3/testsuite/util/testsuite_regex.h
View File

@ -150,8 +150,7 @@ namespace __gnu_test
auto __res2 = __regex_algo_impl<_Bi_iter, _Alloc, _Ch_type, _Rx_traits,
_RegexExecutorPolicy::_S_alternate, true>
(__s, __e, __mm, __re, __flags);
// __m is unspecified if return value is false.
if (__res1 == __res2 && (!__res1 || __m == __mm))
if (__res1 == __res2 && __m == __mm)
return __res1;
throw std::exception();
}