Skip to content

dfa: make slow-bail progress tracking direction-aware in reverse scans #609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jmestwa-coder wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −5
Open

dfa: make slow-bail progress tracking direction-aware in reverse scans #609

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions re2/dfa.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1436,11 +1436,16 @@ inline bool DFA::InlinedSearchLoop(SearchParams* params) {
// of 10 bytes per state computation, fail so that RE2 can
// fall back to the NFA. However, RE2::Set cannot fall back,
// so we just have to keep on keeping on in that case.
if (dfa_should_bail_when_slow && resetp != NULL &&
static_cast<size_t>(p - resetp) < 10*state_cache_.size() &&
kind_ != Prog::kManyMatch) {
params->failed = true;
return false;
if (dfa_should_bail_when_slow && resetp != NULL) {
ptrdiff_t bytes_since_reset_signed =
run_forward ? p - resetp : resetp - p;
size_t bytes_since_reset =
static_cast<size_t>(bytes_since_reset_signed);
if (bytes_since_reset < 10*state_cache_.size() &&
kind_ != Prog::kManyMatch) {
params->failed = true;
return false;
}
}
resetp = p;

Expand Down