prefetch: use Regex instead of pcre #12576
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is part of the effort to remove pcre dependency.
moonchen
changed the title
bneradt
requested changes
Oct 17, 2025
bryancall
requested changes
Oct 21, 2025
There was a problem hiding this comment.
The migration looks good overall, but there's a functional regression: the original code used PCRE_NOTEMPTY flag in all three pcre_exec() calls, but the new code doesn't pass RE_NOTEMPTY to Regex::exec().
Issue: PCRE_NOTEMPTY prevents matching empty strings, which is important for patterns like .* that could otherwise match at the beginning of an empty string.
Required changes:
- Line 185 in
match():
return _regex.exec(subject, RE_NOTEMPTY);- Line 203 in
capture():
int matchCount = _regex.exec(subject, matches, RE_NOTEMPTY);- Line 234 in
replace():
int matchCount = _regex.exec(subject, matches, RE_NOTEMPTY);This maintains the original PCRE behavior and prevents subtle matching bugs.
- add missing flag to exec()
|
Added the flag back to |
bryancall
previously approved these changes
Oct 21, 2025
|
[approve ci autest] |
bneradt
reviewed
Nov 3, 2025
Comment on lines
210
to
222
| if (!_re) { | ||
| return false; | ||
| } | ||
|
|
||
| matchCount = pcre_exec(_re, _extra, subject.c_str(), subject.length(), 0, PCRE_NOTEMPTY, nullptr, 0); | ||
| if (matchCount < 0) { | ||
| if (matchCount != PCRE_ERROR_NOMATCH) { | ||
| PrefetchError("matching error %d", matchCount); | ||
| } | ||
| if (_regex.empty()) { | ||
| return false; | ||
| } | ||
|
|
||
| return true; |
There was a problem hiding this comment.
There's a few of these PrefetchError's that are lost in the shuffle. I think we should be able to preserve these using a different Regex interface.
Removed redundant REErrorC enum definition.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is part of the effort to remove pcre dependency.