From: Paul Eggert <eggert@cs.ucla.edu>
To: git@vger.kernel.org
Cc: Carlo Arenas <carenas@gmail.com>
Subject: improve performance of PCRE2 bug 2642 bug workaround
Date: Tue, 22 Mar 2022 09:38:42 -0700 [thread overview]
Message-ID: <bd751d5c-2f8b-4c52-72ec-f2b7268a30a8@cs.ucla.edu> (raw)
[-- Attachment #1: Type: text/plain, Size: 805 bytes --]
Today, Carlo Arenas pointed out[1] that GNU grep didn't work around
PCRE2 bug 2642, which Git grep has a workaround for. While installing a
GNU grep patch to fix this[2] I noticed that Git's workaround appears to
be too pessimistic: on older PCRE2 libraries Git grep sets
PCRE2_NO_START_OPTIMIZE even when PCRE2_CASELESS is not set.
Attached is a patch to Git that I just now cobbled up and have not even
compiled, much less tested. Please feel free to ignore it, as it would
merely improve performance on older, buggy PCRE2 libraries and that
might not be worth your trouble. I'm sending this email as more of a
thank-you for letting us know indirectly of the PCRE2 bug.
[1]: https://lists.gnu.org/r/grep-devel/2022-03/msg00004.html
[2]: https://lists.gnu.org/r/grep-devel/2022-03/msg00005.html
[-- Attachment #2: git-grep.diff --]
[-- Type: text/x-patch, Size: 559 bytes --]
diff --git a/grep.c b/grep.c
index 82eb7da102..b9553ec9f5 100644
--- a/grep.c
+++ b/grep.c
@@ -297,7 +297,9 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
#ifndef GIT_PCRE2_VERSION_10_36_OR_HIGHER
/* Work around https://bugs.exim.org/show_bug.cgi?id=2642 fixed in 10.36 */
- if (PCRE2_MATCH_INVALID_UTF && options & (PCRE2_UTF | PCRE2_CASELESS))
+ if (PCRE2_MATCH_INVALID_UTF &&
+ ((options & (PCRE2_UTF | PCRE2_CASELESS)) ==
+ (PCRE2_UTF | PCRE2_CASELESS)))
options |= PCRE2_NO_START_OPTIMIZE;
#endif
next reply other threads:[~2022-03-22 16:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-22 16:38 Paul Eggert [this message]
2022-03-22 20:26 ` improve performance of PCRE2 bug 2642 bug workaround René Scharfe
2022-03-22 21:12 ` Paul Eggert
2022-03-23 1:09 ` Carlo Marcelo Arenas Belón
2022-03-23 4:06 ` Paul Eggert
2022-03-23 18:37 ` René Scharfe
2022-03-23 20:24 ` Carlo Arenas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bd751d5c-2f8b-4c52-72ec-f2b7268a30a8@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=carenas@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).