Fix #81424: PCRE2 10.35 JIT performance regression

We backport the respective upstream fix[1] to our bundled pcre2lib.

[1] <dc5f966635>

Closes GH-7484.
This commit is contained in:
Christoph M. Becker 2021-09-10 12:18:38 +02:00
parent 424c265478
commit a2471383fe
No known key found for this signature in database
GPG Key ID: D66C9593118BCCB6
2 changed files with 4 additions and 1 deletions

3
NEWS
View File

@ -6,6 +6,9 @@ PHP NEWS
. Fixed bug #81433 (DOMElement::setIdAttribute() called twice may remove ID).
(Viktor Volkov)
- PCRE:
. Fixed bug #81424 (PCRE2 10.35 JIT performance regression). (cmb)
23 Dep 2021, PHP 7.4.24
- Core:

View File

@ -11152,7 +11152,7 @@ early_fail_type = (early_fail_ptr & 0x7);
early_fail_ptr >>= 3;
/* During recursion, these optimizations are disabled. */
if (common->early_fail_start_ptr == 0)
if (common->early_fail_start_ptr == 0 && common->fast_forward_bc_ptr == NULL)
{
early_fail_ptr = 0;
early_fail_type = type_skip;