Re: [Patch, PR 61720] Clear regex BFS match queue after every iteration

[Tim Shen]

On Sun, Jul 6, 2014 at 1:56 AM, Tim Shen <tims...@google.com> wrote:
> This bug shouldn't be introduced, if I wrote clearer code last summer.
> Sorry :(. The _Executor is a little bit messy. The _M_match_queue is
> not cleared because it's treated `globally` between iterations (in
> _M_main_dispatch(..., __bfs)).
>
> Add a new file general_testcases.cc; we can gradually move test cases
> to this single file to reduce duplicated compilation in testing?

Here's the patch.


-- 
Regards,
Tim Shen

commit 61e59cd44a7b2c3f93febd055cc64dd758783a71
Author: timshen <tims...@google.com>
Date:   Sun Jul 6 01:40:32 2014 -0700

        PR libstdc++/61720
        * include/bits/regex_executor.tcc (_Executor<>::_M_main_dispatch):
        Clear match queue for next use.
        * testsuite/28_regex/general_testcases.cc: New file for general
        testcases.

diff --git a/libstdc++-v3/include/bits/regex_executor.tcc 
b/libstdc++-v3/include/bits/regex_executor.tcc
index 38b8ff2..3c68668 100644
--- a/libstdc++-v3/include/bits/regex_executor.tcc
+++ b/libstdc++-v3/include/bits/regex_executor.tcc
@@ -137,6 +137,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
        }
       if (__match_mode == _Match_mode::_Exact)
        __ret = _M_has_sol;
+      _M_states._M_match_queue.clear();
       return __ret;
     }
 
diff --git a/libstdc++-v3/testsuite/28_regex/general_testcases.cc 
b/libstdc++-v3/testsuite/28_regex/general_testcases.cc
new file mode 100644
index 0000000..e9edb8f
--- /dev/null
+++ b/libstdc++-v3/testsuite/28_regex/general_testcases.cc
@@ -0,0 +1,46 @@
+// { dg-options "-std=gnu++11" }
+
+//
+// Copyright (C) 2014 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/>.
+
+#include <regex>
+#include <testsuite_hooks.h>
+#include <testsuite_regex.h>
+
+using namespace __gnu_test;
+using namespace std;
+
+// libstdc++/61720
+static void
+PR61720()
+{
+  string test = R"("test\")";
+  VERIFY(!regex_search_debug(test, regex(R"("([^"]|\\")*[^\\]")")));
+  VERIFY(!regex_match_debug(test, regex(R"("([^"]|\\")*[^\\]")")));
+  VERIFY(!regex_search_debug(test, regex(R"("([^"]|\\")*[^\\]")",
+                                        regex_constants::extended)));
+  VERIFY(!regex_match_debug(test, regex(R"("([^"]|\\")*[^\\]")",
+                                       regex_constants::extended)));
+}
+
+int
+main()
+{
+  PR61720();
+  return 0;
+}