From patchwork Tue Nov 18 19:12:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Shen X-Patchwork-Id: 412132 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DE3CA14012B for ; Wed, 19 Nov 2014 06:12:17 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:content-type; q= dns; s=default; b=uFZBhyavIhNfXmk+5vrkRJWm83WpgJT6NfwKK5iMjgI72k 5kQX+jr3ImFgFhSz1hsXzqz9Bq0S3NYOB6FR+F+qlxic+6/vzbwKTUonmBwJCTvB x9mIo5bMqeCy7IIEMElEK1l5RjaVg+wG0c5CPkHemU3CnRfA4CcfEFNxgJWoI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:content-type; s= default; bh=wgCJZMJ42HsUHhNXVTdT34N3ryY=; b=yQYrZNZKLzoovqDU4Qjb LfOqX0zAOCLROZdVthm6gsrcJs7hIi+H7oa3l7pxgTS938/sZYnM6TYIezmIR3Oa D7/Uohz140cdsD4rfsaN8Xpup0GM5uOFgRqN7fffmv7THWYs6TDqNC1Xr3SrKPeb TwBdLEnSaIYYM3SSEaiZ1pY= Received: (qmail 4251 invoked by alias); 18 Nov 2014 19:12:08 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 4241 invoked by uid 89); 18 Nov 2014 19:12:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL, BAYES_00, KAM_HOODIA, RCVD_IN_DNSWL_LOW, SPF_PASS, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: mail-qc0-f180.google.com Received: from mail-qc0-f180.google.com (HELO mail-qc0-f180.google.com) (209.85.216.180) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 18 Nov 2014 19:12:07 +0000 Received: by mail-qc0-f180.google.com with SMTP id i8so7673395qcq.25 for ; Tue, 18 Nov 2014 11:12:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to :content-type; bh=SdQ3yRDBiF04ma0i1B9XFtJ8Ae5KjFCow6Aj9jEInOI=; b=SS+yxSJczqTM929fxWDwQTFoT0tkB8Uv9wyXANLsdP4/WLpOD20MTA1fKNOi80jWTb Xtxs1xRA9fWXm+rVEDwZSEHQ8LnnLUKnvMTHXv/lGNWlOGdJ/XqN+q1B/uXFn8XI0hTi ROSwsgjkHPSlXxkvRcWoVjF2QUDI/1O2iXNMPWPu2B0t9jg3MSQDU8GDAj3nwzZ0+ygA dRWcpen7//oHY33k1U4W2GEN9Y2uyAKTkddZEQ2Y2RjUUpjPuSLMo8iXmaG/edWvAz/P DIhHVTviXNBqe3EzfzuMqmoeRhX6wMKMLAl0HeQhn5wVoArUMg+Gl+gSr0WR6Z7S0Z9Z df3w== X-Gm-Message-State: ALoCoQkucytsGGHNug4rnj0ZkJQw4pt9OcMVd5ws0Q8ne3y1OanfBYpmHXYEomOovXtXROVSgX5O MIME-Version: 1.0 X-Received: by 10.224.68.73 with SMTP id u9mr46037235qai.75.1416337921761; Tue, 18 Nov 2014 11:12:01 -0800 (PST) Received: by 10.96.254.231 with HTTP; Tue, 18 Nov 2014 11:12:01 -0800 (PST) Date: Tue, 18 Nov 2014 11:12:01 -0800 Message-ID: Subject: [Patch, libstdc++/63920] Fix regex_constants::match_not_null behavior From: Tim Shen To: "libstdc++" , gcc-patches Bootstrapped and tested. Thanks! diff --git a/libstdc++-v3/include/bits/regex_executor.h b/libstdc++-v3/include/bits/regex_executor.h index b26992c..2d7796f 100644 --- a/libstdc++-v3/include/bits/regex_executor.h +++ b/libstdc++-v3/include/bits/regex_executor.h @@ -205,7 +205,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION public: _ResultsVec _M_cur_results; _BiIter _M_current; - const _BiIter _M_begin; + _BiIter _M_begin; const _BiIter _M_end; const _RegexT& _M_re; const _NFAT& _M_nfa; diff --git a/libstdc++-v3/include/bits/regex_executor.tcc b/libstdc++-v3/include/bits/regex_executor.tcc index 38d4781..a973667 100644 --- a/libstdc++-v3/include/bits/regex_executor.tcc +++ b/libstdc++-v3/include/bits/regex_executor.tcc @@ -39,17 +39,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>:: _M_search() { + if (_M_search_from_first()) + return true; if (_M_flags & regex_constants::match_continuous) - return _M_search_from_first(); - auto __cur = _M_begin; - do + return false; + _M_flags |= regex_constants::match_prev_avail; + while (_M_begin != _M_end) { - _M_current = __cur; - if (_M_main(_Match_mode::_Prefix)) + ++_M_begin; + if (_M_search_from_first()) return true; } - // Continue when __cur == _M_end - while (__cur++ != _M_end); return false; } 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 45ad0f6..6b038ee 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 @@ -65,6 +65,8 @@ test01() regex_constants::match_prev_avail)); VERIFY( regex_search_debug("ba"+1, regex("\\Ba"), regex_constants::match_prev_avail)); + // PR libstdc++/63920 + VERIFY(!regex_search_debug("a", regex("b*"), regex_constants::match_not_null)); } int